These changes were a direct result of using a semantic patch
More information can be found at http://www.emn.fr/x-info/coccinelle/

[mchehab@redhat.com: fix a merge conflict]
Signed-off-by: NStoyan Gaydarov <sgayda2@uiuc.edu>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>