147 files changed, 207 insertions, 1768 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
index bedcfb671624..26c666dd3514 100644
--- a/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -583,25 +583,7 @@ static struct usb_driver flexcop_usb_driver = {
        .id_table       = flexcop_usb_table,
 };
-/* module stuff */
+module_usb_driver(flexcop_usb_driver);
-static int __init flexcop_usb_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&flexcop_usb_driver))) {
-                err("usb_register failed. (%d)", result);
-                return result;
-        }
-        return 0;
-}
-static void __exit flexcop_usb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&flexcop_usb_driver);
-}
-module_init(flexcop_usb_module_init);
-module_exit(flexcop_usb_module_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_NAME);
diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
index 2f31648bba90..ce4f85849e7b 100644
--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
@@ -1480,7 +1480,7 @@ static const struct file_operations ddb_fops = {
        .open           = ddb_open,
 };
-static char *ddb_devnode(struct device *device, mode_t *mode)
+static char *ddb_devnode(struct device *device, umode_t *mode)
 {
        struct ddb *dev = dev_get_drvdata(device);
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index f73287775953..00a67326c193 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -450,7 +450,7 @@ static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env)
        return 0;
 }
-static char *dvb_devnode(struct device *dev, mode_t *mode)
+static char *dvb_devnode(struct device *dev, umode_t *mode)
 {
        struct dvb_device *dvbdev = dev_get_drvdata(dev);
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
index 2aef3c89e9fa..8d7fef84afd8 100644
--- a/drivers/media/dvb/dvb-usb/a800.c
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -183,26 +183,7 @@ static struct usb_driver a800_driver = {
        .id_table       = a800_table,
 };
-/* module stuff */
+module_usb_driver(a800_driver);
-static int __init a800_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&a800_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit a800_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&a800_driver);
-}
-module_init (a800_module_init);
-module_exit (a800_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("AVerMedia AverTV DVB-T USB 2.0 (A800)");
diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c
index 5d5e32f4e99d..af176b6ce738 100644
--- a/drivers/media/dvb/dvb-usb/af9005.c
+++ b/drivers/media/dvb/dvb-usb/af9005.c
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(debug,
                 "set debugging level (1=info,xfer=2,rc=4,reg=8,i2c=16,fw=32 (or-able))."
                 DVB_USB_DEBUG_STATUS);
 /* enable obnoxious led */
-int dvb_usb_af9005_led = 1;
+bool dvb_usb_af9005_led = 1;
 module_param_named(led, dvb_usb_af9005_led, bool, 0644);
 MODULE_PARM_DESC(led, "enable led (default: 1).");
diff --git a/drivers/media/dvb/dvb-usb/af9005.h b/drivers/media/dvb/dvb-usb/af9005.h
index c71c77bd7f4b..6a2bf3de8456 100644
--- a/drivers/media/dvb/dvb-usb/af9005.h
+++ b/drivers/media/dvb/dvb-usb/af9005.h
@@ -35,7 +35,7 @@ extern int dvb_usb_af9005_debug;
 #define deb_i2c(args...)  dprintk(dvb_usb_af9005_debug,0x10,args)
 #define deb_fw(args...)   dprintk(dvb_usb_af9005_debug,0x20,args)
-extern int dvb_usb_af9005_led;
+extern bool dvb_usb_af9005_led;
 /* firmware */
 #define FW_BULKOUT_SIZE 250
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index e755d7637c22..282a43d648df 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1967,25 +1967,7 @@ static struct usb_driver af9015_usb_driver = {
        .id_table = af9015_usb_table,
 };
-/* module stuff */
+module_usb_driver(af9015_usb_driver);
-static int __init af9015_usb_module_init(void)
-{
-        int ret;
-        ret = usb_register(&af9015_usb_driver);
-        if (ret)
-                err("module init failed:%d", ret);
-        return ret;
-}
-static void __exit af9015_usb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&af9015_usb_driver);
-}
-module_init(af9015_usb_module_init);
-module_exit(af9015_usb_module_exit);
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Driver for Afatech AF9015 DVB-T");
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index fdee856acab0..cf0c318d6989 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -1373,26 +1373,7 @@ static struct usb_driver anysee_driver = {
        .id_table   = anysee_table,
 };
-/* module stuff */
+module_usb_driver(anysee_driver);
-static int __init anysee_module_init(void)
-{
-        int ret;
-        ret = usb_register(&anysee_driver);
-        if (ret)
-                err("%s: usb_register failed. Error number %d", __func__, ret);
-        return ret;
-}
-static void __exit anysee_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&anysee_driver);
-}
-module_init(anysee_module_init);
-module_exit(anysee_module_exit);
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Driver Anysee E30 DVB-C & DVB-T USB2.0");
diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c
index b77994967b9b..16210c060302 100644
--- a/drivers/media/dvb/dvb-usb/au6610.c
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -244,26 +244,7 @@ static struct usb_driver au6610_driver = {
        .id_table   = au6610_table,
 };
-/* module stuff */
+module_usb_driver(au6610_driver);
-static int __init au6610_module_init(void)
-{
-        int ret;
-        ret = usb_register(&au6610_driver);
-        if (ret)
-                err("usb_register failed. Error number %d", ret);
-        return ret;
-}
-static void __exit au6610_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&au6610_driver);
-}
-module_init(au6610_module_init);
-module_exit(au6610_module_exit);
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Driver for Alcor Micro AU6610 DVB-T USB2.0");
diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c
index bf67b4dfd82b..5e45ae605427 100644
--- a/drivers/media/dvb/dvb-usb/az6027.c
+++ b/drivers/media/dvb/dvb-usb/az6027.c
@@ -1174,28 +1174,7 @@ static struct usb_driver az6027_usb_driver = {
        .id_table       = az6027_usb_table,
 };
-/* module stuff */
+module_usb_driver(az6027_usb_driver);
-static int __init az6027_usb_module_init(void)
-{
-        int result;
-        result = usb_register(&az6027_usb_driver);
-        if (result) {
-                err("usb_register failed. (%d)", result);
-                return result;
-        }
-        return 0;
-}
-static void __exit az6027_usb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&az6027_usb_driver);
-}
-module_init(az6027_usb_module_init);
-module_exit(az6027_usb_module_exit);
 MODULE_AUTHOR("Adams Xu <Adams.xu@azwave.com.cn>");
 MODULE_DESCRIPTION("Driver for AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)");
diff --git a/drivers/media/dvb/dvb-usb/ce6230.c b/drivers/media/dvb/dvb-usb/ce6230.c
index 57afb5a9157e..fa637255729c 100644
--- a/drivers/media/dvb/dvb-usb/ce6230.c
+++ b/drivers/media/dvb/dvb-usb/ce6230.c
@@ -317,27 +317,7 @@ static struct usb_driver ce6230_driver = {
        .id_table   = ce6230_table,
 };
-/* module stuff */
+module_usb_driver(ce6230_driver);
-static int __init ce6230_module_init(void)
-{
-        int ret;
-        deb_info("%s:\n", __func__);
-        ret = usb_register(&ce6230_driver);
-        if (ret)
-                err("usb_register failed with error:%d", ret);
-        return ret;
-}
-static void __exit ce6230_module_exit(void)
-{
-        deb_info("%s:\n", __func__);
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&ce6230_driver);
-}
-module_init(ce6230_module_init);
-module_exit(ce6230_module_exit);
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Driver for Intel CE6230 DVB-T USB2.0");
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
index f9d905002ec9..0a98548ecd17 100644
--- a/drivers/media/dvb/dvb-usb/cinergyT2-core.c
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
@@ -247,25 +247,7 @@ static struct usb_driver cinergyt2_driver = {
        .id_table       = cinergyt2_usb_table
 };
-static int __init cinergyt2_usb_init(void)
+module_usb_driver(cinergyt2_driver);
-{
-        int err;
-        err = usb_register(&cinergyt2_driver);
-        if (err) {
-                err("usb_register() failed! (err %i)\n", err);
-                return err;
-        }
-        return 0;
-}
-static void __exit cinergyt2_usb_exit(void)
-{
-        usb_deregister(&cinergyt2_driver);
-}
-module_init(cinergyt2_usb_init);
-module_exit(cinergyt2_usb_exit);
 MODULE_DESCRIPTION("Terratec Cinergy T2 DVB-T driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index e8e5a74fa5c7..3940bb0f9ef6 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -2033,26 +2033,7 @@ static struct usb_driver cxusb_driver = {
        .id_table       = cxusb_table,
 };
-/* module stuff */
+module_usb_driver(cxusb_driver);
-static int __init cxusb_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&cxusb_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit cxusb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&cxusb_driver);
-}
-module_init (cxusb_module_init);
-module_exit (cxusb_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index 2d259ca34b05..070e82aa53f5 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -832,27 +832,7 @@ static struct usb_driver dib0700_driver = {
        .id_table   = dib0700_usb_id_table,
 };
-/* module stuff */
+module_usb_driver(dib0700_driver);
-static int __init dib0700_module_init(void)
-{
-        int result;
-        info("loaded with support for %d different device-types", dib0700_device_count);
-        if ((result = usb_register(&dib0700_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit dib0700_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&dib0700_driver);
-}
-module_init (dib0700_module_init);
-module_exit (dib0700_module_exit);
 MODULE_FIRMWARE("dvb-usb-dib0700-1.20.fw");
 MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 7270791f8340..a4ac37e0e98b 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -463,26 +463,7 @@ static struct usb_driver dibusb_driver = {
        .id_table       = dibusb_dib3000mb_table,
 };
-/* module stuff */
+module_usb_driver(dibusb_driver);
-static int __init dibusb_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&dibusb_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit dibusb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&dibusb_driver);
-}
-module_init (dibusb_module_init);
-module_exit (dibusb_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for DiBcom USB DVB-T devices (DiB3000M-B based)");
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 9c165e2569d4..9d1a59d09c52 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -141,26 +141,7 @@ static struct usb_driver dibusb_mc_driver = {
        .id_table       = dibusb_dib3000mc_table,
 };
-/* module stuff */
+module_usb_driver(dibusb_mc_driver);
-static int __init dibusb_mc_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&dibusb_mc_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit dibusb_mc_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&dibusb_mc_driver);
-}
-module_init (dibusb_mc_module_init);
-module_exit (dibusb_mc_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for DiBcom USB2.0 DVB-T (DiB3000M-C/P based) devices");
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 00a446deaa76..ff34419a4c88 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -346,26 +346,7 @@ static struct usb_driver digitv_driver = {
        .id_table       = digitv_table,
 };
-/* module stuff */
+module_usb_driver(digitv_driver);
-static int __init digitv_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&digitv_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit digitv_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&digitv_driver);
-}
-module_init (digitv_module_init);
-module_exit (digitv_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for Nebula Electronics uDigiTV DVB-T USB2.0");
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
index 106dfd55ff9c..66f205c112b2 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -360,26 +360,7 @@ static struct usb_driver dtt200u_usb_driver = {
        .id_table       = dtt200u_usb_table,
 };
-/* module stuff */
+module_usb_driver(dtt200u_usb_driver);
-static int __init dtt200u_usb_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&dtt200u_usb_driver))) {
-                err("usb_register failed. (%d)",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit dtt200u_usb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&dtt200u_usb_driver);
-}
-module_init(dtt200u_usb_module_init);
-module_exit(dtt200u_usb_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for the WideView/Yakumo/Hama/Typhoon/Club3D/Miglia DVB-T USB2.0 devices");
diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/dvb/dvb-usb/dtv5100.c
index 7373132163d2..3d11df41cac0 100644
--- a/drivers/media/dvb/dvb-usb/dtv5100.c
+++ b/drivers/media/dvb/dvb-usb/dtv5100.c
@@ -217,26 +217,7 @@ static struct usb_driver dtv5100_driver = {
        .id_table       = dtv5100_table,
 };
-/* module stuff */
+module_usb_driver(dtv5100_driver);
-static int __init dtv5100_module_init(void)
-{
-        int ret;
-        ret = usb_register(&dtv5100_driver);
-        if (ret)
-                err("usb_register failed. Error number %d", ret);
-        return ret;
-}
-static void __exit dtv5100_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&dtv5100_driver);
-}
-module_init(dtv5100_module_init);
-module_exit(dtv5100_module_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index 9191f0a57a96..451c5a7adfb2 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -1943,22 +1943,7 @@ static struct usb_driver dw2102_driver = {
        .id_table = dw2102_table,
 };
-static int __init dw2102_module_init(void)
+module_usb_driver(dw2102_driver);
-{
-        int ret =  usb_register(&dw2102_driver);
-        if (ret)
-                err("usb_register failed. Error number %d", ret);
-        return ret;
-}
-static void __exit dw2102_module_exit(void)
-{
-        usb_deregister(&dw2102_driver);
-}
-module_init(dw2102_module_init);
-module_exit(dw2102_module_exit);
 MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
 MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"
diff --git a/drivers/media/dvb/dvb-usb/ec168.c b/drivers/media/dvb/dvb-usb/ec168.c
index 78442fe4aa5e..b4989ba8897d 100644
--- a/drivers/media/dvb/dvb-usb/ec168.c
+++ b/drivers/media/dvb/dvb-usb/ec168.c
@@ -428,27 +428,7 @@ static struct usb_driver ec168_driver = {
        .id_table   = ec168_id,
 };
-/* module stuff */
+module_usb_driver(ec168_driver);
-static int __init ec168_module_init(void)
-{
-        int ret;
-        deb_info("%s:\n", __func__);
-        ret = usb_register(&ec168_driver);
-        if (ret)
-                err("module init failed:%d", ret);
-        return ret;
-}
-static void __exit ec168_module_exit(void)
-{
-        deb_info("%s:\n", __func__);
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&ec168_driver);
-}
-module_init(ec168_module_init);
-module_exit(ec168_module_exit);
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("E3C EC168 DVB-T USB2.0 driver");
diff --git a/drivers/media/dvb/dvb-usb/friio.c b/drivers/media/dvb/dvb-usb/friio.c
index b092dc2137cd..474a17e4db0c 100644
--- a/drivers/media/dvb/dvb-usb/friio.c
+++ b/drivers/media/dvb/dvb-usb/friio.c
@@ -514,28 +514,7 @@ static struct usb_driver friio_driver = {
        .id_table       = friio_table,
 };
+module_usb_driver(friio_driver);
-/* module stuff */
-static int __init friio_module_init(void)
-{
-        int ret;
-        ret = usb_register(&friio_driver);
-        if (ret)
-                err("usb_register failed. Error number %d", ret);
-        return ret;
-}
-static void __exit friio_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&friio_driver);
-}
-module_init(friio_module_init);
-module_exit(friio_module_exit);
 MODULE_AUTHOR("Akihiro Tsukada <tskd2@yahoo.co.jp>");
 MODULE_DESCRIPTION("Driver for Friio ISDB-T USB2.0 Receiver");
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index 63681df244c4..c1f5582e1cdf 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -209,26 +209,7 @@ static struct usb_driver gl861_driver = {
        .id_table       = gl861_table,
 };
-/* module stuff */
+module_usb_driver(gl861_driver);
-static int __init gl861_module_init(void)
-{
-        int ret;
-        ret = usb_register(&gl861_driver);
-        if (ret)
-                err("usb_register failed. Error number %d", ret);
-        return ret;
-}
-static void __exit gl861_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&gl861_driver);
-}
-module_init(gl861_module_init);
-module_exit(gl861_module_exit);
 MODULE_AUTHOR("Carl Lundqvist <comabug@gmail.com>");
 MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / GL861");
diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c
index 5f71284703d0..5d0384dd45b5 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -320,26 +320,7 @@ static struct usb_driver gp8psk_usb_driver = {
        .id_table       = gp8psk_usb_table,
 };
-/* module stuff */
+module_usb_driver(gp8psk_usb_driver);
-static int __init gp8psk_usb_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&gp8psk_usb_driver))) {
-                err("usb_register failed. (%d)",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit gp8psk_usb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&gp8psk_usb_driver);
-}
-module_init(gp8psk_usb_module_init);
-module_exit(gp8psk_usb_module_exit);
 MODULE_AUTHOR("Alan Nisota <alannisota@gamil.com>");
 MODULE_DESCRIPTION("Driver for Genpix DVB-S");
diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c
index 654aa7ceddf9..9f01cd7a6e3f 100644
--- a/drivers/media/dvb/dvb-usb/it913x.c
+++ b/drivers/media/dvb/dvb-usb/it913x.c
@@ -819,26 +819,7 @@ static struct usb_driver it913x_driver = {
        .id_table       = it913x_table,
 };
-/* module stuff */
+module_usb_driver(it913x_driver);
-static int __init it913x_module_init(void)
-{
-        int result = usb_register(&it913x_driver);
-        if (result) {
-                err("usb_register failed. Error number %d", result);
-                return result;
-        }
-        return 0;
-}
-static void __exit it913x_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&it913x_driver);
-}
-module_init(it913x_module_init);
-module_exit(it913x_module_exit);
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("it913x USB 2 Driver");
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index 767c87f24786..b3fe05bbffc9 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -1291,26 +1291,7 @@ static struct usb_driver lme2510_driver = {
        .id_table       = lme2510_table,
 };
-/* module stuff */
+module_usb_driver(lme2510_driver);
-static int __init lme2510_module_init(void)
-{
-        int result = usb_register(&lme2510_driver);
-        if (result) {
-                err("usb_register failed. Error number %d", result);
-                return result;
-        }
-        return 0;
-}
-static void __exit lme2510_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&lme2510_driver);
-}
-module_init(lme2510_module_init);
-module_exit(lme2510_module_exit);
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0");
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index a1e1287c949e..288af29a8bb7 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -1086,27 +1086,7 @@ static struct usb_driver m920x_driver = {
        .id_table       = m920x_table,
 };
-/* module stuff */
+module_usb_driver(m920x_driver);
-static int __init m920x_module_init(void)
-{
-        int ret;
-        if ((ret = usb_register(&m920x_driver))) {
-                err("usb_register failed. Error number %d", ret);
-                return ret;
-        }
-        return 0;
-}
-static void __exit m920x_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&m920x_driver);
-}
-module_init (m920x_module_init);
-module_exit (m920x_module_exit);
 MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>");
 MODULE_DESCRIPTION("DVB Driver for ULI M920x");
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.c b/drivers/media/dvb/dvb-usb/mxl111sf.c
index 34e6f8d94dc2..38ef0253d3b5 100644
--- a/drivers/media/dvb/dvb-usb/mxl111sf.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf.c
@@ -1047,24 +1047,7 @@ static struct usb_driver mxl111sf_driver = {
        .id_table       = mxl111sf_table,
 };
-static int __init mxl111sf_module_init(void)
+module_usb_driver(mxl111sf_driver);
-{
-        int result = usb_register(&mxl111sf_driver);
-        if (result) {
-                err("usb_register failed. Error number %d", result);
-                return result;
-        }
-        return 0;
-}
-static void __exit mxl111sf_module_exit(void)
-{
-        usb_deregister(&mxl111sf_driver);
-}
-module_init(mxl111sf_module_init);
-module_exit(mxl111sf_module_exit);
 MODULE_AUTHOR("Michael Krufky <mkrufky@kernellabs.com>");
 MODULE_DESCRIPTION("Driver for MaxLinear MxL111SF");
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 21384da6570e..6c55384e2fca 100644
--- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -225,26 +225,7 @@ static struct usb_driver nova_t_driver = {
        .id_table       = nova_t_table,
 };
-/* module stuff */
+module_usb_driver(nova_t_driver);
-static int __init nova_t_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&nova_t_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit nova_t_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&nova_t_driver);
-}
-module_init (nova_t_module_init);
-module_exit (nova_t_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Hauppauge WinTV-NOVA-T usb2");
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 98fd9a6092b7..c8a95042dfbc 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -574,22 +574,7 @@ static struct usb_driver opera1_driver = {
        .id_table = opera1_table,
 };
-static int __init opera1_module_init(void)
+module_usb_driver(opera1_driver);
-{
-        int result = 0;
-        if ((result = usb_register(&opera1_driver))) {
-                err("usb_register failed. Error number %d", result);
-        }
-        return result;
-}
-static void __exit opera1_module_exit(void)
-{
-        usb_deregister(&opera1_driver);
-}
-module_init(opera1_module_init);
-module_exit(opera1_module_exit);
 MODULE_AUTHOR("Mario Hlawitschka (c) dh1pa@amsat.org");
 MODULE_AUTHOR("Marco Gittler (c) g.marco@freenet.de");
diff --git a/drivers/media/dvb/dvb-usb/pctv452e.c b/drivers/media/dvb/dvb-usb/pctv452e.c
index f9aec5cb6e77..f526eb05cc7a 100644
--- a/drivers/media/dvb/dvb-usb/pctv452e.c
+++ b/drivers/media/dvb/dvb-usb/pctv452e.c
@@ -1055,22 +1055,7 @@ static struct usb_driver pctv452e_usb_driver = {
        .id_table   = pctv452e_usb_table,
 };
-static int __init pctv452e_usb_init(void)
+module_usb_driver(pctv452e_usb_driver);
-{
-        int ret = usb_register(&pctv452e_usb_driver);
-        if (ret)
-                err("%s: usb_register failed! Error %d", __FILE__, ret);
-        return ret;
-}
-static void __exit pctv452e_usb_exit(void)
-{
-        usb_deregister(&pctv452e_usb_driver);
-}
-module_init(pctv452e_usb_init);
-module_exit(pctv452e_usb_exit);
 MODULE_AUTHOR("Dominik Kuhlen <dkuhlen@gmx.net>");
 MODULE_AUTHOR("Andre Weidemann <Andre.Weidemann@web.de>");
diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c
index 0998fe961950..acefaa89cc53 100644
--- a/drivers/media/dvb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/dvb/dvb-usb/technisat-usb2.c
@@ -781,25 +781,7 @@ static struct usb_driver technisat_usb2_driver = {
        .id_table   = technisat_usb2_id_table,
 };
-/* module stuff */
+module_usb_driver(technisat_usb2_driver);
-static int __init technisat_usb2_module_init(void)
-{
-        int result = usb_register(&technisat_usb2_driver);
-        if (result) {
-                err("usb_register failed. Code %d", result);
-                return result;
-        }
-        return 0;
-}
-static void __exit technisat_usb2_module_exit(void)
-{
-        usb_deregister(&technisat_usb2_driver);
-}
-module_init(technisat_usb2_module_init);
-module_exit(technisat_usb2_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <pboettcher@kernellabs.com>");
 MODULE_DESCRIPTION("Driver for Technisat DVB-S/S2 USB 2.0 device");
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c
index bc50356c5fb6..e53a1061cb8e 100644
--- a/drivers/media/dvb/dvb-usb/ttusb2.c
+++ b/drivers/media/dvb/dvb-usb/ttusb2.c
@@ -812,26 +812,7 @@ static struct usb_driver ttusb2_driver = {
        .id_table       = ttusb2_table,
 };
-/* module stuff */
+module_usb_driver(ttusb2_driver);
-static int __init ttusb2_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&ttusb2_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit ttusb2_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&ttusb2_driver);
-}
-module_init (ttusb2_module_init);
-module_exit (ttusb2_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for Pinnacle PCTV 400e DVB-S USB2.0");
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
index 463673a5c2b2..9b042292e788 100644
--- a/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -143,26 +143,7 @@ static struct usb_driver umt_driver = {
        .id_table       = umt_table,
 };
-/* module stuff */
+module_usb_driver(umt_driver);
-static int __init umt_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&umt_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit umt_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&umt_driver);
-}
-module_init (umt_module_init);
-module_exit (umt_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for HanfTek UMT 010 USB2.0 DVB-T device");
diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/dvb/dvb-usb/vp702x.c
index 45e31f224814..07c673a6e764 100644
--- a/drivers/media/dvb/dvb-usb/vp702x.c
+++ b/drivers/media/dvb/dvb-usb/vp702x.c
@@ -436,26 +436,7 @@ static struct usb_driver vp702x_usb_driver = {
        .id_table       = vp702x_usb_table,
 };
-/* module stuff */
+module_usb_driver(vp702x_usb_driver);
-static int __init vp702x_usb_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&vp702x_usb_driver))) {
-                err("usb_register failed. (%d)",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit vp702x_usb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&vp702x_usb_driver);
-}
-module_init(vp702x_usb_module_init);
-module_exit(vp702x_usb_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for Twinhan StarBox DVB-S USB2.0 and clones");
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index 90873af5682e..d750724132ee 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -294,26 +294,7 @@ static struct usb_driver vp7045_usb_driver = {
        .id_table       = vp7045_usb_table,
 };
-/* module stuff */
+module_usb_driver(vp7045_usb_driver);
-static int __init vp7045_usb_module_init(void)
-{
-        int result;
-        if ((result = usb_register(&vp7045_usb_driver))) {
-                err("usb_register failed. (%d)",result);
-                return result;
-        }
-        return 0;
-}
-static void __exit vp7045_usb_module_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&vp7045_usb_driver);
-}
-module_init(vp7045_usb_module_init);
-module_exit(vp7045_usb_module_exit);
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_DESCRIPTION("Driver for Twinhan MagicBox/Alpha and DNTV tinyUSB2 DVB-T USB2.0");
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 51c7121b321a..b1fe5137df09 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -557,26 +557,7 @@ static struct usb_driver smsusb_driver = {
        .resume                 = smsusb_resume,
 };
-static int __init smsusb_module_init(void)
+module_usb_driver(smsusb_driver);
-{
-        int rc = usb_register(&smsusb_driver);
-        if (rc)
-                sms_err("usb_register failed. Error number %d", rc);
-        sms_debug("");
-        return rc;
-}
-static void __exit smsusb_module_exit(void)
-{
-        /* Regular USB Cleanup */
-        usb_deregister(&smsusb_driver);
-        sms_info("end");
-}
-module_init(smsusb_module_init);
-module_exit(smsusb_module_exit);
 MODULE_DESCRIPTION("Driver for the Siano SMS1xxx USB dongle");
 MODULE_AUTHOR("Siano Mobile Silicon, INC. (uris@siano-ms.com)");
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 8aa01149351a..5b682cc4c814 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1808,26 +1808,7 @@ static struct usb_driver ttusb_driver = {
      .id_table         = ttusb_table,
 };
-static int __init ttusb_init(void)
+module_usb_driver(ttusb_driver);
-{
-        int err;
-        if ((err = usb_register(&ttusb_driver)) < 0) {
-                printk("%s: usb_register failed! Error number %d",
-                       __FILE__, err);
-                return err;
-        }
-        return 0;
-}
-static void __exit ttusb_exit(void)
-{
-        usb_deregister(&ttusb_driver);
-}
-module_init(ttusb_init);
-module_exit(ttusb_exit);
 MODULE_AUTHOR("Holger Waechtler <holger@convergence.de>");
 MODULE_DESCRIPTION("TTUSB DVB Driver");
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index f893bffa08a3..504c81230339 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1756,26 +1756,7 @@ static struct usb_driver ttusb_dec_driver = {
        .id_table       = ttusb_dec_table,
 };
-static int __init ttusb_dec_init(void)
+module_usb_driver(ttusb_dec_driver);
-{
-        int result;
-        if ((result = usb_register(&ttusb_dec_driver)) < 0) {
-                printk("%s: initialisation failed: error %d.\n", __func__,
-                       result);
-                return result;
-        }
-        return 0;
-}
-static void __exit ttusb_dec_exit(void)
-{
-        usb_deregister(&ttusb_dec_driver);
-}
-module_init(ttusb_dec_init);
-module_exit(ttusb_dec_exit);
 MODULE_AUTHOR("Alex Woods <linux-dvb@giblets.org>");
 MODULE_DESCRIPTION(DRIVER_NAME);
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 25e58cbf35f0..f36905b63645 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -624,21 +624,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
        return 0;
 }
-static int __init dsbr100_init(void)
+module_usb_driver(usb_dsbr100_driver);
-{
-        int retval = usb_register(&usb_dsbr100_driver);
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-        return retval;
-}
-static void __exit dsbr100_exit(void)
-{
-        usb_deregister(&usb_dsbr100_driver);
-}
-module_init (dsbr100_init);
-module_exit (dsbr100_exit);
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index edadc8449a3d..36ce0611c037 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -47,11 +47,11 @@ MODULE_VERSION("0.0.4");
 #endif
 static int io           = CONFIG_RADIO_GEMTEK_PORT;
-static int probe        = CONFIG_RADIO_GEMTEK_PROBE;
+static bool probe       = CONFIG_RADIO_GEMTEK_PROBE;
-static int hardmute;
+static bool hardmute;
-static int shutdown     = 1;
+static bool shutdown    = 1;
-static int keepmuted    = 1;
+static bool keepmuted   = 1;
-static int initmute     = 1;
+static bool initmute    = 1;
 static int radio_nr     = -1;
 module_param(io, int, 0444);
diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c
index 3fb76e3834c9..87c1ee13b058 100644
--- a/drivers/media/radio/radio-miropcm20.c
+++ b/drivers/media/radio/radio-miropcm20.c
@@ -23,7 +23,7 @@ static int radio_nr = -1;
 module_param(radio_nr, int, 0);
 MODULE_PARM_DESC(radio_nr, "Set radio device number (/dev/radioX).  Default: -1 (autodetect)");
-static int mono;
+static bool mono;
 module_param(mono, bool, 0);
 MODULE_PARM_DESC(mono, "Force tuner into mono mode.");
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 1742bd8110bd..a860a72a58ec 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -659,25 +659,4 @@ err:
        return retval;
 }
-static int __init amradio_init(void)
+module_usb_driver(usb_amradio_driver);
-{
-        int retval = usb_register(&usb_amradio_driver);
-        pr_info(KBUILD_MODNAME
-                ": version " DRIVER_VERSION " " DRIVER_DESC "\n");
-        if (retval)
-                pr_err(KBUILD_MODNAME
-                        ": usb_register failed. Error number %d\n", retval);
-        return retval;
-}
-static void __exit amradio_exit(void)
-{
-        usb_deregister(&usb_amradio_driver);
-}
-module_init(amradio_init);
-module_exit(amradio_exit);
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index a6ad707fae96..b7debb67932a 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -861,33 +861,7 @@ static struct usb_driver si470x_usb_driver = {
        .supports_autosuspend   = 1,
 };
+module_usb_driver(si470x_usb_driver);
-/**************************************************************************
- * Module Interface
- **************************************************************************/
-/*
- * si470x_module_init - module init
- */
-static int __init si470x_module_init(void)
-{
-        printk(KERN_INFO DRIVER_DESC ", Version " DRIVER_VERSION "\n");
-        return usb_register(&si470x_usb_driver);
-}
-/*
- * si470x_module_exit - module exit
- */
-static void __exit si470x_module_exit(void)
-{
-        usb_deregister(&si470x_usb_driver);
-}
-module_init(si470x_module_init);
-module_exit(si470x_module_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 01bb8daf4b09..baf907b3ce76 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -899,38 +899,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)
        kfree(ati_remote);
 }
-/*
+module_usb_driver(ati_remote_driver);
- *      ati_remote_init
- */
-static int __init ati_remote_init(void)
-{
-        int result;
-        result = usb_register(&ati_remote_driver);
-        if (result)
-                printk(KERN_ERR KBUILD_MODNAME
-                       ": usb_register error #%d\n", result);
-        else
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-                       DRIVER_DESC "\n");
-        return result;
-}
-/*
- *      ati_remote_exit
- */
-static void __exit ati_remote_exit(void)
-{
-        usb_deregister(&ati_remote_driver);
-}
-/*
- *      module specification
- */
-module_init(ati_remote_init);
-module_exit(ati_remote_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index cf10ecf5acec..860c112e0fd2 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -324,7 +324,7 @@ static int ene_rx_get_sample_reg(struct ene_device *dev)
                return dev->extra_buf2_address + r_pointer;
        }
-        dbg("attempt to read beyong ring bufer end");
+        dbg("attempt to read beyond ring buffer end");
        return 0;
 }
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h
index fd108d90f750..6f978e85db8c 100644
--- a/drivers/media/rc/ene_ir.h
+++ b/drivers/media/rc/ene_ir.h
@@ -227,7 +227,7 @@ struct ene_device {
        /* TX buffer */
        unsigned *tx_buffer;                    /* input samples buffer*/
-        int tx_pos;                             /* position in that bufer */
+        int tx_pos;                             /* position in that buffer */
        int tx_len;                             /* current len of tx buffer */
        int tx_done;                            /* done transmitting */
                                                /* one more sample pending*/
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 3f175ebe2766..7f26fdf2e54e 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2476,23 +2476,4 @@ static int imon_resume(struct usb_interface *intf)
        return rc;
 }
-static int __init imon_init(void)
+module_usb_driver(imon_driver);
-{
-        int rc;
-        rc = usb_register(&imon_driver);
-        if (rc) {
-                pr_err("usb register failed(%d)\n", rc);
-                rc = -ENODEV;
-        }
-        return rc;
-}
-static void __exit imon_exit(void)
-{
-        usb_deregister(&imon_driver);
-}
-module_init(imon_init);
-module_exit(imon_exit);
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 27997a9ceb0d..ca12d3289bfe 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -38,7 +38,7 @@
 #include <media/lirc.h>
 #include <media/lirc_dev.h>
-static int debug;
+static bool debug;
 #define IRCTL_DEV_NAME  "BaseRemoteCtl"
 #define NOPLUG          -1
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 60d3c1e09712..21105bf9594d 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -156,9 +156,9 @@
 /* module parameters */
 #ifdef CONFIG_USB_DEBUG
-static int debug = 1;
+static bool debug = 1;
 #else
-static int debug;
+static bool debug;
 #endif
 #define mce_dbg(dev, fmt, ...)                                  \
@@ -1448,25 +1448,7 @@ static struct usb_driver mceusb_dev_driver = {
        .id_table =     mceusb_dev_table
 };
-static int __init mceusb_dev_init(void)
+module_usb_driver(mceusb_dev_driver);
-{
-        int ret;
-        ret = usb_register(&mceusb_dev_driver);
-        if (ret < 0)
-                printk(KERN_ERR DRIVER_NAME
-                       ": usb register failed, result = %d\n", ret);
-        return ret;
-}
-static void __exit mceusb_dev_exit(void)
-{
-        usb_deregister(&mceusb_dev_driver);
-}
-module_init(mceusb_dev_init);
-module_exit(mceusb_dev_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 0ea55ea2b71d..f6a930b70c69 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -715,7 +715,7 @@ static void ir_close(struct input_dev *idev)
 }
 /* class for /sys/class/rc */
-static char *ir_devnode(struct device *dev, mode_t *mode)
+static char *ir_devnode(struct device *dev, umode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev));
 }
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 9bff23cb0a5b..ad95c67a4dba 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -1284,25 +1284,7 @@ static struct usb_driver redrat3_dev_driver = {
        .id_table       = redrat3_dev_table
 };
-static int __init redrat3_dev_init(void)
+module_usb_driver(redrat3_dev_driver);
-{
-        int ret;
-        ret = usb_register(&redrat3_dev_driver);
-        if (ret < 0)
-                pr_err(DRIVER_NAME
-                       ": usb register failed, result = %d\n", ret);
-        return ret;
-}
-static void __exit redrat3_dev_exit(void)
-{
-        usb_deregister(&redrat3_dev_driver);
-}
-module_init(redrat3_dev_init);
-module_exit(redrat3_dev_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index e435d94c0776..d6f4bfe09391 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -43,9 +43,9 @@
 #define DRIVER_DESC     "Streamzap Remote Control driver"
 #ifdef CONFIG_USB_DEBUG
-static int debug = 1;
+static bool debug = 1;
 #else
-static int debug;
+static bool debug;
 #endif
 #define USB_STREAMZAP_VENDOR_ID         0x0e9c
@@ -523,33 +523,7 @@ static int streamzap_resume(struct usb_interface *intf)
        return 0;
 }
-/**
+module_usb_driver(streamzap_driver);
- *      streamzap_init
- */
-static int __init streamzap_init(void)
-{
-        int ret;
-        /* register this driver with the USB subsystem */
-        ret = usb_register(&streamzap_driver);
-        if (ret < 0)
-                printk(KERN_ERR DRIVER_NAME ": usb register failed, "
-                       "result = %d\n", ret);
-        return ret;
-}
-/**
- *      streamzap_exit
- */
-static void __exit streamzap_exit(void)
-{
-        usb_deregister(&streamzap_driver);
-}
-module_init(streamzap_init);
-module_exit(streamzap_exit);
 MODULE_AUTHOR("Jarod Wilson <jarod@wilsonet.com>");
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 13f54b51194a..b09c5fae489b 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -226,11 +226,11 @@ module_param(protocol, uint, 0444);
 MODULE_PARM_DESC(protocol, "IR protocol to use for the power-on command "
                 "(0 = RC5, 1 = NEC, 2 = RC6A, default)");
-static int invert; /* default = 0 */
+static bool invert; /* default = 0 */
 module_param(invert, bool, 0444);
 MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver");
-static int txandrx; /* default = 0 */
+static bool txandrx; /* default = 0 */
 module_param(txandrx, bool, 0444);
 MODULE_PARM_DESC(invert, "Allow simultaneous TX and RX");
@@ -1176,6 +1176,6 @@ wbcir_exit(void)
 module_init(wbcir_init);
 module_exit(wbcir_exit);
-MODULE_AUTHOR("David H�rdeman <david@hardeman.nu>");
+MODULE_AUTHOR("David Härdeman <david@hardeman.nu>");
 MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index cd8ff0473184..fda32f52554a 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -72,7 +72,7 @@ struct qcam {
 static int parport[MAX_CAMS] = { [1 ... MAX_CAMS-1] = -1 };
 static int probe = 2;
-static int force_rgb;
+static bool force_rgb;
 static int video_nr = -1;
 /* FIXME: parport=auto would never have worked, surely? --RR */
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 5909f2557ab4..1d64af9adf71 100644
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -31,7 +31,7 @@ MODULE_DESCRIPTION("i2c device driver for cs5345 Audio ADC");
 MODULE_AUTHOR("Hans Verkuil");
 MODULE_LICENSE("GPL");
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index d93e5ab45fd3..51c5b9ad67d8 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -35,7 +35,7 @@ MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
 MODULE_AUTHOR("Martin Vaughan");
 MODULE_LICENSE("GPL");
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index c6ff32a6137c..349bd9c2aff5 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -75,7 +75,7 @@ static int radio[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
                                     -1, -1, -1, -1, -1, -1, -1, -1 };
 static unsigned cardtype_c = 1;
 static unsigned tuner_c = 1;
-static unsigned radio_c = 1;
+static bool radio_c = 1;
 static char pal[] = "--";
 static char secam[] = "--";
 static char ntsc[] = "-";
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 7d8edb457065..875a7ce94736 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -1379,26 +1379,4 @@ static struct usb_driver cx231xx_usb_driver = {
        .id_table = cx231xx_id_table,
 };
-static int __init cx231xx_module_init(void)
+module_usb_driver(cx231xx_usb_driver);
-{
-        int result;
-        printk(KERN_INFO DRIVER_NAME " v4l2 driver loaded.\n");
-        /* register this driver with the USB subsystem */
-        result = usb_register(&cx231xx_usb_driver);
-        if (result)
-                cx231xx_err(DRIVER_NAME
-                            " usb_register failed. Error number %d.\n", result);
-        return result;
-}
-static void __exit cx231xx_module_exit(void)
-{
-        /* deregister this driver with the USB subsystem */
-        usb_deregister(&cx231xx_usb_driver);
-}
-module_init(cx231xx_module_init);
-module_exit(cx231xx_module_exit);
diff --git a/drivers/media/video/cx25821/cx25821-alsa.c b/drivers/media/video/cx25821/cx25821-alsa.c
index 6142ae2aee40..03cfac476b03 100644
--- a/drivers/media/video/cx25821/cx25821-alsa.c
+++ b/drivers/media/video/cx25821/cx25821-alsa.c
@@ -102,7 +102,7 @@ struct cx25821_audio_dev {
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = { 1, [1 ... (SNDRV_CARDS - 1)] = 1 };
+static bool enable[SNDRV_CARDS] = { 1, [1 ... (SNDRV_CARDS - 1)] = 1 };
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled.");
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 68d1240f493c..04bf6627d362 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -96,7 +96,7 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static const char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable cx88x soundcard. default enabled.");
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index 10550bd93b06..25036cb11bea 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -20,6 +20,7 @@
 #include <linux/videodev2.h>
 #include <mach/hardware.h>
 #include <mach/dm646x.h>
+#include <media/davinci/vpif_types.h>
 /* Maximum channel allowed */
 #define VPIF_NUM_CHANNELS               (4)
diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
index 064550f5ce4a..a693d4ebda55 100644
--- a/drivers/media/video/davinci/vpif_capture.h
+++ b/drivers/media/video/davinci/vpif_capture.h
@@ -27,7 +27,7 @@
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf-dma-contig.h>
-#include <mach/dm646x.h>
+#include <media/davinci/vpif_types.h>
 #include "vpif.h"
diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
index 5d1936dafed2..56879d1a0684 100644
--- a/drivers/media/video/davinci/vpif_display.h
+++ b/drivers/media/video/davinci/vpif_display.h
@@ -22,6 +22,7 @@
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf-dma-contig.h>
+#include <media/davinci/vpif_types.h>
 #include "vpif.h"
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 9deb5698ec21..4561cd89938d 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -3405,26 +3405,4 @@ static struct usb_driver em28xx_usb_driver = {
        .id_table = em28xx_id_table,
 };
-static int __init em28xx_module_init(void)
+module_usb_driver(em28xx_usb_driver);
-{
-        int result;
-        /* register this driver with the USB subsystem */
-        result = usb_register(&em28xx_usb_driver);
-        if (result)
-                em28xx_err(DRIVER_NAME
-                           " usb_register failed. Error number %d.\n", result);
-        printk(KERN_INFO DRIVER_NAME " driver loaded\n");
-        return result;
-}
-static void __exit em28xx_module_exit(void)
-{
-        /* deregister this driver with the USB subsystem */
-        usb_deregister(&em28xx_usb_driver);
-}
-module_init(em28xx_module_init);
-module_exit(em28xx_module_exit);
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index d3777c86e1de..5539f09440ac 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -76,8 +76,8 @@ MODULE_PARM_DESC(video_nr,
                 "\none and for every other camera."
                 "\n");
-static short force_munmap[] = {[0 ... ET61X251_MAX_DEVICES-1] =
+static bool force_munmap[] = {[0 ... ET61X251_MAX_DEVICES-1] =
-                               ET61X251_FORCE_MUNMAP};
+                              ET61X251_FORCE_MUNMAP};
 module_param_array(force_munmap, bool, NULL, 0444);
 MODULE_PARM_DESC(force_munmap,
                 "\n<0|1[,...]> Force the application to unmap previously"
@@ -2680,27 +2680,4 @@ static struct usb_driver et61x251_usb_driver = {
        .disconnect = et61x251_usb_disconnect,
 };
-/*****************************************************************************/
+module_usb_driver(et61x251_usb_driver);
-static int __init et61x251_module_init(void)
-{
-        int err = 0;
-        KDBG(2, ET61X251_MODULE_NAME " v" ET61X251_MODULE_VERSION);
-        KDBG(3, ET61X251_MODULE_AUTHOR);
-        if ((err = usb_register(&et61x251_usb_driver)))
-                KDBG(1, "usb_register() failed");
-        return err;
-}
-static void __exit et61x251_module_exit(void)
-{
-        usb_deregister(&et61x251_usb_driver);
-}
-module_init(et61x251_module_init);
-module_exit(et61x251_module_exit);
diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c
index 390291ceba26..9769f17915c0 100644
--- a/drivers/media/video/gspca/benq.c
+++ b/drivers/media/video/gspca/benq.c
@@ -291,15 +291,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 4c56dbef6d92..ea17b5d94ea4 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -1067,15 +1067,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index f9b86b2484b0..8f33bbd091ad 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -2132,15 +2132,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 0357d6d461d1..81a4adbd9f7c 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -895,16 +895,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index ea48200fd3a0..0107513cd728 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -290,16 +290,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
index d74da8e0fef9..c84e26006fc3 100644
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -523,22 +523,7 @@ static struct usb_driver sd_driver = {
 /*====================== Init and Exit module functions ====================*/
-static int __init sd_mod_init(void)
+module_usb_driver(sd_driver);
-{
-        PDEBUG(D_PROBE, "driver startup - version %s", DRIVER_VERSION);
-        if (usb_register(&sd_driver) < 0)
-                return -1;
-        return 0;
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
 /*==========================================================================*/
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c
index 8e3dabe30077..5ab3f7e12760 100644
--- a/drivers/media/video/gspca/jeilinj.c
+++ b/drivers/media/video/gspca/jeilinj.c
@@ -582,16 +582,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/kinect.c b/drivers/media/video/gspca/kinect.c
index 4fe51fda80f3..e8e8f2fe9166 100644
--- a/drivers/media/video/gspca/kinect.c
+++ b/drivers/media/video/gspca/kinect.c
@@ -413,16 +413,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index 494b05ed8f1a..f0c0d74dfe92 100644
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -631,15 +631,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index 67533e5582a6..0c4493675438 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -27,8 +27,8 @@
 /* Kernel module parameters */
 int force_sensor;
-static int dump_bridge;
+static bool dump_bridge;
-int dump_sensor;
+bool dump_sensor;
 static const struct usb_device_id m5602_table[] = {
        {USB_DEVICE(0x0402, 0x5602)},
@@ -404,19 +404,7 @@ static struct usb_driver sd_driver = {
        .disconnect = m5602_disconnect
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init mod_m5602_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit mod_m5602_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(mod_m5602_init);
-module_exit(mod_m5602_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
index b1f0c492036a..8c672b5c8c6a 100644
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
@@ -106,7 +106,7 @@
 /* Kernel module parameters */
 extern int force_sensor;
-extern int dump_sensor;
+extern bool dump_sensor;
 int mt9m111_probe(struct sd *sd);
 int mt9m111_init(struct sd *sd);
diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.h b/drivers/media/video/gspca/m5602/m5602_ov7660.h
index 2efd607987ec..2b6a13b508f7 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov7660.h
+++ b/drivers/media/video/gspca/m5602/m5602_ov7660.h
@@ -86,7 +86,7 @@
 /* Kernel module parameters */
 extern int force_sensor;
-extern int dump_sensor;
+extern bool dump_sensor;
 int ov7660_probe(struct sd *sd);
 int ov7660_init(struct sd *sd);
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h
index da9a129b739d..f7aa5bf68983 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.h
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -135,7 +135,7 @@
 /* Kernel module parameters */
 extern int force_sensor;
-extern int dump_sensor;
+extern bool dump_sensor;
 int ov9650_probe(struct sd *sd);
 int ov9650_init(struct sd *sd);
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h
index 338359596398..81a2bcb88fe3 100644
--- a/drivers/media/video/gspca/m5602/m5602_po1030.h
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.h
@@ -147,7 +147,7 @@
 /* Kernel module parameters */
 extern int force_sensor;
-extern int dump_sensor;
+extern bool dump_sensor;
 int po1030_probe(struct sd *sd);
 int po1030_init(struct sd *sd);
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index 8cc7a3f6da72..8e0035e731c7 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -65,7 +65,7 @@
 /* Kernel module parameters */
 extern int force_sensor;
-extern int dump_sensor;
+extern bool dump_sensor;
 int s5k4aa_probe(struct sd *sd);
 int s5k4aa_init(struct sd *sd);
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
index 80a63a236e24..79952247b534 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -41,7 +41,7 @@
 /* Kernel module parameters */
 extern int force_sensor;
-extern int dump_sensor;
+extern bool dump_sensor;
 int s5k83a_probe(struct sd *sd);
 int s5k83a_init(struct sd *sd);
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index edd32793bb17..b0231465afae 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -516,15 +516,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index 473e813b680e..d73e5bd3dbf7 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -1259,15 +1259,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/nw80x.c b/drivers/media/video/gspca/nw80x.c
index 09f7db8ceffd..7167cac7359c 100644
--- a/drivers/media/video/gspca/nw80x.c
+++ b/drivers/media/video/gspca/nw80x.c
@@ -2118,18 +2118,7 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
 module_param(webcam, int, 0644);
 MODULE_PARM_DESC(webcam,
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 1075668db296..739e8a2a2d30 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -5055,18 +5055,7 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
 module_param(frame_rate, int, 0644);
 MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)");
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 76907eced4a1..04753391de3e 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -1533,16 +1533,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index b50c7a3fabfb..fbfa02affa13 100644
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -1571,16 +1571,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 1d95ec8fa952..3844c49f269c 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -569,15 +569,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index edbc04c5ef58..9db2b34d172c 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -1221,15 +1221,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 7509d05dc065..1ac111176ffa 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -868,15 +868,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/se401.c b/drivers/media/video/gspca/se401.c
index 6d9835342e0a..bb70092c2229 100644
--- a/drivers/media/video/gspca/se401.c
+++ b/drivers/media/video/gspca/se401.c
@@ -774,15 +774,4 @@ static struct usb_driver sd_driver = {
        .post_reset = sd_post_reset,
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/video/gspca/sn9c2028.c
index 48aae3926a33..478533cb1152 100644
--- a/drivers/media/video/gspca/sn9c2028.c
+++ b/drivers/media/video/gspca/sn9c2028.c
@@ -737,16 +737,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index b5fca9166745..9e198b45c3c8 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -2592,15 +2592,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 31f7aba3a883..6a1148d7fe92 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -1530,15 +1530,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index c55d6674c1c6..0c9e6ddabd2c 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -3110,15 +3110,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/video/gspca/spca1528.c
index 695673106e76..070b9c33b517 100644
--- a/drivers/media/video/gspca/spca1528.c
+++ b/drivers/media/video/gspca/spca1528.c
@@ -590,15 +590,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index bb82c94ece14..103984708c77 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -1092,15 +1092,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 7aaac72aee91..9c16821addd4 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -2188,15 +2188,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index 16722dc60394..1320f35e39f2 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -815,15 +815,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 89fec4c500af..54eed87672d2 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -714,21 +714,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        int ret;
-        ret = usb_register(&sd_driver);
-        if (ret < 0)
-                return ret;
-        PDEBUG(D_PROBE, "registered");
-        return 0;
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-        PDEBUG(D_PROBE, "deregistered");
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index a44fe3d25965..df4e16996461 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1544,15 +1544,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 8a6e258abf30..4a5f209ce719 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -1106,15 +1106,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c
index df805f798282..2fe3c29bd6b7 100644
--- a/drivers/media/video/gspca/sq905.c
+++ b/drivers/media/video/gspca/sq905.c
@@ -432,16 +432,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/sq905c.c b/drivers/media/video/gspca/sq905c.c
index c2c056056e08..ae783634712f 100644
--- a/drivers/media/video/gspca/sq905c.c
+++ b/drivers/media/video/gspca/sq905c.c
@@ -339,16 +339,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c
index e4255b4905e7..1a8ba9b3550a 100644
--- a/drivers/media/video/gspca/sq930x.c
+++ b/drivers/media/video/gspca/sq930x.c
@@ -1197,15 +1197,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 42a7a28a6c8b..4ae7cc8f463a 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -519,15 +519,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/stv0680.c b/drivers/media/video/gspca/stv0680.c
index 4dcc7e37f9fd..461ed645f309 100644
--- a/drivers/media/video/gspca/stv0680.c
+++ b/drivers/media/video/gspca/stv0680.c
@@ -355,15 +355,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c
index a1c812abe864..91d99b4cc57b 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/video/gspca/stv06xx/stv06xx.c
@@ -36,8 +36,8 @@ MODULE_AUTHOR("Erik Andrén");
 MODULE_DESCRIPTION("STV06XX USB Camera Driver");
 MODULE_LICENSE("GPL");
-static int dump_bridge;
+static bool dump_bridge;
-static int dump_sensor;
+static bool dump_sensor;
 int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data)
 {
@@ -612,18 +612,7 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
 module_param(dump_bridge, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(dump_bridge, "Dumps all usb bridge registers at startup");
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index c8909772435a..c80f0c0c75b6 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -1211,15 +1211,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index c22d4e810f8d..9b9f85a8e60e 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -1463,15 +1463,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/topro.c b/drivers/media/video/gspca/topro.c
index acb209a67100..444d3c5b9079 100644
--- a/drivers/media/video/gspca/topro.c
+++ b/drivers/media/video/gspca/topro.c
@@ -4971,18 +4971,7 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
 module_param(force_sensor, int, 0644);
 MODULE_PARM_DESC(force_sensor,
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 933ef2ca658c..c8922c5ffbf5 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -418,16 +418,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index 7ee2c8271dcc..208f6b2d512a 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -4230,15 +4230,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/vicam.c b/drivers/media/video/gspca/vicam.c
index 8423ee1c305c..911152e169d6 100644
--- a/drivers/media/video/gspca/vicam.c
+++ b/drivers/media/video/gspca/vicam.c
@@ -369,16 +369,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c
index 3b0e19448cbe..ecada178bceb 100644
--- a/drivers/media/video/gspca/xirlink_cit.c
+++ b/drivers/media/video/gspca/xirlink_cit.c
@@ -3323,15 +3323,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
-/* -- module insert / remove -- */
+module_usb_driver(sd_driver);
-static int __init sd_mod_init(void)
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index f22e02f8d758..b9e15bb0328b 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7033,18 +7033,7 @@ static struct usb_driver sd_driver = {
 #endif
 };
-static int __init sd_mod_init(void)
+module_usb_driver(sd_driver);
-{
-        return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-        usb_deregister(&sd_driver);
-}
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
 module_param(force_sensor, int, 0644);
 MODULE_PARM_DESC(force_sensor,
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index 687282d87491..6510110f53d0 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -49,7 +49,7 @@ module_param(default_audio_input, uint, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(default_audio_input, "default audio input: 0=RCA back / "
                 "1=RCA front / 2=S/PDIF");
-static int boost_audio;
+static bool boost_audio;
 module_param(boost_audio, bool, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(boost_audio, "boost the audio signal");
@@ -464,26 +464,7 @@ static struct usb_driver hdpvr_usb_driver = {
        .id_table =     hdpvr_table,
 };
-static int __init hdpvr_init(void)
+module_usb_driver(hdpvr_usb_driver);
-{
-        int result;
-        /* register this driver with the USB subsystem */
-        result = usb_register(&hdpvr_usb_driver);
-        if (result)
-                err("usb_register failed. Error number %d", result);
-        return result;
-}
-static void __exit hdpvr_exit(void)
-{
-        /* deregister this driver with the USB subsystem */
-        usb_deregister(&hdpvr_usb_driver);
-}
-module_init(hdpvr_init);
-module_exit(hdpvr_exit);
 MODULE_LICENSE("GPL");
 MODULE_VERSION("0.2.1");
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 461ae449cb43..3949b7dc2368 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -99,7 +99,7 @@ static int i2c_clock_period[IVTV_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
 static unsigned int cardtype_c = 1;
 static unsigned int tuner_c = 1;
-static unsigned int radio_c = 1;
+static bool radio_c = 1;
 static unsigned int i2c_clock_period_c = 1;
 static char pal[] = "---";
 static char secam[] = "--";
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index 6b7c9c823330..d0fbfcf7133d 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -58,7 +58,7 @@
 /* card parameters */
 static int ivtvfb_card_id = -1;
 static int ivtvfb_debug = 0;
-static int osd_laced;
+static bool osd_laced;
 static int osd_depth;
 static int osd_upper;
 static int osd_left;
diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c
index c1f12f96aca6..37d20e73908a 100644
--- a/drivers/media/video/marvell-ccic/mcam-core.c
+++ b/drivers/media/video/marvell-ccic/mcam-core.c
@@ -51,7 +51,7 @@ static int delivered;
 * sense.
 */
-static int alloc_bufs_at_read;
+static bool alloc_bufs_at_read;
 module_param(alloc_bufs_at_read, bool, 0444);
 MODULE_PARM_DESC(alloc_bufs_at_read,
                "Non-zero value causes DMA buffers to be allocated when the "
@@ -73,11 +73,11 @@ MODULE_PARM_DESC(dma_buf_size,
                "parameters require larger buffers, an attempt to reallocate "
                "will be made.");
 #else /* MCAM_MODE_VMALLOC */
-static const int alloc_bufs_at_read = 0;
+static const bool alloc_bufs_at_read = 0;
 static const int n_dma_bufs = 3;  /* Used by S/G_PARM */
 #endif /* MCAM_MODE_VMALLOC */
-static int flip;
+static bool flip;
 module_param(flip, bool, 0444);
 MODULE_PARM_DESC(flip,
                "If set, the sensor will be instructed to flip the image "
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index d0f538857285..d7cd0f633f63 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -69,12 +69,12 @@ MODULE_LICENSE("GPL");
 /* module parameters */
 static int opmode   = OPMODE_AUTO;
 int msp_debug;           /* msp_debug output */
-int msp_once;            /* no continuous stereo monitoring */
+bool msp_once;           /* no continuous stereo monitoring */
-int msp_amsound;         /* hard-wire AM sound at 6.5 Hz (france),
+bool msp_amsound;        /* hard-wire AM sound at 6.5 Hz (france),
                            the autoscan seems work well only with FM... */
 int msp_standard = 1;    /* Override auto detect of audio msp_standard,
                            if needed. */
-int msp_dolby;
+bool msp_dolby;
 int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual
                                        (msp34xxg only) 0x00a0-0x03c0 */
diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h
index 831e8db4368c..fbe5e0715f93 100644
--- a/drivers/media/video/msp3400-driver.h
+++ b/drivers/media/video/msp3400-driver.h
@@ -44,10 +44,10 @@
 /* module parameters */
 extern int msp_debug;
-extern int msp_once;
+extern bool msp_once;
-extern int msp_amsound;
+extern bool msp_amsound;
 extern int msp_standard;
-extern int msp_dolby;
+extern bool msp_dolby;
 extern int msp_stereo_thresh;
 struct msp_state {
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index 0cb461dd396a..74522773e934 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -287,7 +287,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
                sg_dma_len(sg)          = new_size;
                txd = ichan->dma_chan.device->device_prep_slave_sg(
-                        &ichan->dma_chan, sg, 1, DMA_FROM_DEVICE,
+                        &ichan->dma_chan, sg, 1, DMA_DEV_TO_MEM,
                        DMA_PREP_INTERRUPT);
                if (!txd)
                        goto error;
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 1e7c0d6205e6..1fb7d5bd5ec2 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -70,9 +70,9 @@ static u32 video1_numbuffers = 3;
 static u32 video2_numbuffers = 3;
 static u32 video1_bufsize = OMAP_VOUT_MAX_BUF_SIZE;
 static u32 video2_bufsize = OMAP_VOUT_MAX_BUF_SIZE;
-static u32 vid1_static_vrfb_alloc;
+static bool vid1_static_vrfb_alloc;
-static u32 vid2_static_vrfb_alloc;
+static bool vid2_static_vrfb_alloc;
-static int debug;
+static bool debug;
 /* Module parameters */
 module_param(video1_numbuffers, uint, S_IRUGO);
@@ -424,7 +424,7 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
                "%s enable=%d addr=%x width=%d\n height=%d color_mode=%d\n"
                "rotation=%d mirror=%d posx=%d posy=%d out_width = %d \n"
                "out_height=%d rotation_type=%d screen_width=%d\n",
-                __func__, info.enabled, info.paddr, info.width, info.height,
+                __func__, ovl->is_enabled(ovl), info.paddr, info.width, info.height,
                info.color_mode, info.rotation, info.mirror, info.pos_x,
                info.pos_y, info.out_width, info.out_height, info.rotation_type,
                info.screen_width);
@@ -948,12 +948,8 @@ static int omap_vout_release(struct file *file)
        /* Disable all the overlay managers connected with this interface */
        for (i = 0; i < ovid->num_overlays; i++) {
                struct omap_overlay *ovl = ovid->overlays[i];
-                if (ovl->manager && ovl->manager->device) {
+                if (ovl->manager && ovl->manager->device)
-                        struct omap_overlay_info info;
+                        ovl->disable(ovl);
-                        ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 0;
-                        ovl->set_overlay_info(ovl, &info);
-                }
        }
        /* Turn off the pipeline */
        ret = omapvid_apply_changes(vout);
@@ -1674,7 +1670,6 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
                if (ovl->manager && ovl->manager->device) {
                        struct omap_overlay_info info;
                        ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 1;
                        info.paddr = addr;
                        if (ovl->set_overlay_info(ovl, &info)) {
                                ret = -EINVAL;
@@ -1693,6 +1688,16 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
        if (ret)
                v4l2_err(&vout->vid_dev->v4l2_dev, "failed to change mode\n");
+        for (j = 0; j < ovid->num_overlays; j++) {
+                struct omap_overlay *ovl = ovid->overlays[j];
+                if (ovl->manager && ovl->manager->device) {
+                        ret = ovl->enable(ovl);
+                        if (ret)
+                                goto streamon_err1;
+                }
+        }
        ret = 0;
 streamon_err1:
@@ -1722,16 +1727,8 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
        for (j = 0; j < ovid->num_overlays; j++) {
                struct omap_overlay *ovl = ovid->overlays[j];
-                if (ovl->manager && ovl->manager->device) {
+                if (ovl->manager && ovl->manager->device)
-                        struct omap_overlay_info info;
+                        ovl->disable(ovl);
-                        ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 0;
-                        ret = ovl->set_overlay_info(ovl, &info);
-                        if (ret)
-                                v4l2_err(&vout->vid_dev->v4l2_dev,
-                                "failed to update overlay info in streamoff\n");
-                }
        }
        /* Turn of the pipeline */
diff --git a/drivers/media/video/omap/omap_vout_vrfb.c b/drivers/media/video/omap/omap_vout_vrfb.c
index ebebcac49225..4be26abf6cea 100644
--- a/drivers/media/video/omap/omap_vout_vrfb.c
+++ b/drivers/media/video/omap/omap_vout_vrfb.c
@@ -84,7 +84,7 @@ void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout)
 }
 int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num,
-                        u32 static_vrfb_allocation)
+                              bool static_vrfb_allocation)
 {
        int ret = 0, i, j;
        struct omap_vout_device *vout;
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index faf1650e8747..12d5f923e1d0 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -80,13 +80,6 @@
 #include "isph3a.h"
 #include "isphist.h"
-/*
- * this is provided as an interim solution until omap3isp doesn't need
- * any omap-specific iommu API
- */
-#define to_iommu(dev)                                                   \
-        (struct omap_iommu *)platform_get_drvdata(to_platform_device(dev))
 static unsigned int autoidle;
 module_param(autoidle, int, 0444);
 MODULE_PARM_DESC(autoidle, "Enable OMAP3ISP AUTOIDLE support");
@@ -1119,8 +1112,7 @@ isp_restore_context(struct isp_device *isp, struct isp_reg *reg_list)
 static void isp_save_ctx(struct isp_device *isp)
 {
        isp_save_context(isp, isp_reg_list);
-        if (isp->iommu)
+        omap_iommu_save_ctx(isp->dev);
-                omap_iommu_save_ctx(isp->iommu);
 }
 /*
@@ -1133,8 +1125,7 @@ static void isp_save_ctx(struct isp_device *isp)
 static void isp_restore_ctx(struct isp_device *isp)
 {
        isp_restore_context(isp, isp_reg_list);
-        if (isp->iommu)
+        omap_iommu_restore_ctx(isp->dev);
-                omap_iommu_restore_ctx(isp->iommu);
        omap3isp_ccdc_restore_context(isp);
        omap3isp_preview_restore_context(isp);
 }
@@ -1988,7 +1979,7 @@ static int isp_remove(struct platform_device *pdev)
        isp_cleanup_modules(isp);
        omap3isp_get(isp);
-        iommu_detach_device(isp->domain, isp->iommu_dev);
+        iommu_detach_device(isp->domain, &pdev->dev);
        iommu_domain_free(isp->domain);
        omap3isp_put(isp);
@@ -2136,17 +2127,6 @@ static int isp_probe(struct platform_device *pdev)
                }
        }
-        /* IOMMU */
-        isp->iommu_dev = omap_find_iommu_device("isp");
-        if (!isp->iommu_dev) {
-                dev_err(isp->dev, "omap_find_iommu_device failed\n");
-                ret = -ENODEV;
-                goto error_isp;
-        }
-        /* to be removed once iommu migration is complete */
-        isp->iommu = to_iommu(isp->iommu_dev);
        isp->domain = iommu_domain_alloc(pdev->dev.bus);
        if (!isp->domain) {
                dev_err(isp->dev, "can't alloc iommu domain\n");
@@ -2154,7 +2134,7 @@ static int isp_probe(struct platform_device *pdev)
                goto error_isp;
        }
-        ret = iommu_attach_device(isp->domain, isp->iommu_dev);
+        ret = iommu_attach_device(isp->domain, &pdev->dev);
        if (ret) {
                dev_err(&pdev->dev, "can't attach iommu device: %d\n", ret);
                goto free_domain;
@@ -2193,7 +2173,7 @@ error_modules:
 error_irq:
        free_irq(isp->irq_num, isp);
 detach_dev:
-        iommu_detach_device(isp->domain, isp->iommu_dev);
+        iommu_detach_device(isp->domain, &pdev->dev);
 free_domain:
        iommu_domain_free(isp->domain);
 error_isp:
diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/video/omap3isp/isp.h
index 705946ef4d60..d96603eb0d17 100644
--- a/drivers/media/video/omap3isp/isp.h
+++ b/drivers/media/video/omap3isp/isp.h
@@ -212,9 +212,7 @@ struct isp_device {
        unsigned int sbl_resources;
        unsigned int subclk_resources;
-        struct omap_iommu *iommu;
        struct iommu_domain *domain;
-        struct device *iommu_dev;
        struct isp_platform_callback platform_cb;
 };
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index ec62d11d678b..eaabc27f0fa2 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -366,7 +366,7 @@ static void ccdc_lsc_free_request(struct isp_ccdc_device *ccdc,
                dma_unmap_sg(isp->dev, req->iovm->sgt->sgl,
                             req->iovm->sgt->nents, DMA_TO_DEVICE);
        if (req->table)
-                omap_iommu_vfree(isp->domain, isp->iommu, req->table);
+                omap_iommu_vfree(isp->domain, isp->dev, req->table);
        kfree(req);
 }
@@ -438,7 +438,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
                req->enable = 1;
-                req->table = omap_iommu_vmalloc(isp->domain, isp->iommu, 0,
+                req->table = omap_iommu_vmalloc(isp->domain, isp->dev, 0,
                                        req->config.size, IOMMU_FLAG);
                if (IS_ERR_VALUE(req->table)) {
                        req->table = 0;
@@ -446,7 +446,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
                        goto done;
                }
-                req->iovm = omap_find_iovm_area(isp->iommu, req->table);
+                req->iovm = omap_find_iovm_area(isp->dev, req->table);
                if (req->iovm == NULL) {
                        ret = -ENOMEM;
                        goto done;
@@ -462,7 +462,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
                dma_sync_sg_for_cpu(isp->dev, req->iovm->sgt->sgl,
                                    req->iovm->sgt->nents, DMA_TO_DEVICE);
-                table = omap_da_to_va(isp->iommu, req->table);
+                table = omap_da_to_va(isp->dev, req->table);
                if (copy_from_user(table, config->lsc, req->config.size)) {
                        ret = -EFAULT;
                        goto done;
@@ -734,15 +734,15 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
                         * already done by omap_iommu_vmalloc().
                         */
                        size = ccdc->fpc.fpnum * 4;
-                        table_new = omap_iommu_vmalloc(isp->domain, isp->iommu,
+                        table_new = omap_iommu_vmalloc(isp->domain, isp->dev,
                                                        0, size, IOMMU_FLAG);
                        if (IS_ERR_VALUE(table_new))
                                return -ENOMEM;
-                        if (copy_from_user(omap_da_to_va(isp->iommu, table_new),
+                        if (copy_from_user(omap_da_to_va(isp->dev, table_new),
                                           (__force void __user *)
                                           ccdc->fpc.fpcaddr, size)) {
-                                omap_iommu_vfree(isp->domain, isp->iommu,
+                                omap_iommu_vfree(isp->domain, isp->dev,
                                                                table_new);
                                return -EFAULT;
                        }
@@ -753,7 +753,7 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
                ccdc_configure_fpc(ccdc);
                if (table_old != 0)
-                        omap_iommu_vfree(isp->domain, isp->iommu, table_old);
+                        omap_iommu_vfree(isp->domain, isp->dev, table_old);
        }
        return ccdc_lsc_config(ccdc, ccdc_struct);
@@ -2309,7 +2309,7 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
        ccdc_lsc_free_queue(ccdc, &ccdc->lsc.free_queue);
        if (ccdc->fpc.fpcaddr != 0)
-                omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
+                omap_iommu_vfree(isp->domain, isp->dev, ccdc->fpc.fpcaddr);
        mutex_destroy(&ccdc->ioctl_lock);
 }
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c
index bc0b2c7349b9..11871ecc6d25 100644
--- a/drivers/media/video/omap3isp/ispstat.c
+++ b/drivers/media/video/omap3isp/ispstat.c
@@ -366,7 +366,7 @@ static void isp_stat_bufs_free(struct ispstat *stat)
                                dma_unmap_sg(isp->dev, buf->iovm->sgt->sgl,
                                             buf->iovm->sgt->nents,
                                             DMA_FROM_DEVICE);
-                        omap_iommu_vfree(isp->domain, isp->iommu,
+                        omap_iommu_vfree(isp->domain, isp->dev,
                                                        buf->iommu_addr);
                } else {
                        if (!buf->virt_addr)
@@ -400,7 +400,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                struct iovm_struct *iovm;
                WARN_ON(buf->dma_addr);
-                buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->iommu, 0,
+                buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->dev, 0,
                                                        size, IOMMU_FLAG);
                if (IS_ERR((void *)buf->iommu_addr)) {
                        dev_err(stat->isp->dev,
@@ -410,7 +410,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                        return -ENOMEM;
                }
-                iovm = omap_find_iovm_area(isp->iommu, buf->iommu_addr);
+                iovm = omap_find_iovm_area(isp->dev, buf->iommu_addr);
                if (!iovm ||
                    !dma_map_sg(isp->dev, iovm->sgt->sgl, iovm->sgt->nents,
                                DMA_FROM_DEVICE)) {
@@ -419,7 +419,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                }
                buf->iovm = iovm;
-                buf->virt_addr = omap_da_to_va(stat->isp->iommu,
+                buf->virt_addr = omap_da_to_va(stat->isp->dev,
                                          (u32)buf->iommu_addr);
                buf->empty = 1;
                dev_dbg(stat->isp->dev, "%s: buffer[%d] allocated."
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index 615dae58942b..b02070057724 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -453,7 +453,7 @@ ispmmu_vmap(struct isp_device *isp, const struct scatterlist *sglist, int sglen)
        sgt->nents = sglen;
        sgt->orig_nents = sglen;
-        da = omap_iommu_vmap(isp->domain, isp->iommu, 0, sgt, IOMMU_FLAG);
+        da = omap_iommu_vmap(isp->domain, isp->dev, 0, sgt, IOMMU_FLAG);
        if (IS_ERR_VALUE(da))
                kfree(sgt);
@@ -469,7 +469,7 @@ static void ispmmu_vunmap(struct isp_device *isp, dma_addr_t da)
 {
        struct sg_table *sgt;
-        sgt = omap_iommu_vunmap(isp->domain, isp->iommu, (u32)da);
+        sgt = omap_iommu_vunmap(isp->domain, isp->dev, (u32)da);
        kfree(sgt);
 }
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index 8aa058531280..6a564964853a 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -25,7 +25,7 @@ MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>");
 MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors");
 MODULE_LICENSE("GPL");
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 803c9c82e496..c1bef6187661 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -2682,25 +2682,7 @@ static struct usb_driver s2255_driver = {
        .id_table = s2255_table,
 };
-static int __init usb_s2255_init(void)
+module_usb_driver(s2255_driver);
-{
-        int result;
-        /* register this driver with the USB subsystem */
-        result = usb_register(&s2255_driver);
-        if (result)
-                pr_err(KBUILD_MODNAME
-                       ": usb_register failed. Error number %d\n", result);
-        dprintk(2, "%s\n", __func__);
-        return result;
-}
-static void __exit usb_s2255_exit(void)
-{
-        usb_deregister(&s2255_driver);
-}
-module_init(usb_s2255_init);
-module_exit(usb_s2255_exit);
 MODULE_DESCRIPTION("Sensoray 2255 Video for Linux driver");
 MODULE_AUTHOR("Dean Anderson (Sensoray Company Inc.)");
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 5cfdbc78b918..0ef5484696b6 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -57,7 +57,7 @@ MODULE_AUTHOR(  "Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, "
                "Hans Verkuil, Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 16cb07c5c27b..c2882fa5be85 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -75,8 +75,8 @@ MODULE_PARM_DESC(video_nr,
                 "\none and for every other camera."
                 "\n");
-static short force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] =
+static bool force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] =
-                               SN9C102_FORCE_MUNMAP};
+                              SN9C102_FORCE_MUNMAP};
 module_param_array(force_munmap, bool, NULL, 0444);
 MODULE_PARM_DESC(force_munmap,
                 " <0|1[,...]>"
@@ -3420,27 +3420,4 @@ static struct usb_driver sn9c102_usb_driver = {
        .disconnect = sn9c102_usb_disconnect,
 };
-/*****************************************************************************/
+module_usb_driver(sn9c102_usb_driver);
-static int __init sn9c102_module_init(void)
-{
-        int err = 0;
-        KDBG(2, SN9C102_MODULE_NAME " v" SN9C102_MODULE_VERSION);
-        KDBG(3, SN9C102_MODULE_AUTHOR);
-        if ((err = usb_register(&sn9c102_usb_driver)))
-                KDBG(1, "usb_register() failed");
-        return err;
-}
-static void __exit sn9c102_module_exit(void)
-{
-        usb_deregister(&sn9c102_usb_driver);
-}
-module_init(sn9c102_module_init);
-module_exit(sn9c102_module_exit);
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index dba2317ba5b9..d427f8436c70 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -38,11 +38,11 @@
 #include "stk-webcam.h"
-static int hflip = 1;
+static bool hflip = 1;
 module_param(hflip, bool, 0444);
 MODULE_PARM_DESC(hflip, "Horizontal image flip (mirror). Defaults to 1");
-static int vflip = 1;
+static bool vflip = 1;
 module_param(vflip, bool, 0444);
 MODULE_PARM_DESC(vflip, "Vertical image flip. Defaults to 1");
@@ -1377,25 +1377,4 @@ static struct usb_driver stk_camera_driver = {
 #endif
 };
+module_usb_driver(stk_camera_driver);
-static int __init stk_camera_init(void)
-{
-        int result;
-        result = usb_register(&stk_camera_driver);
-        if (result)
-                STK_ERROR("usb_register failed ! Error number %d\n", result);
-        return result;
-}
-static void __exit stk_camera_exit(void)
-{
-        usb_deregister(&stk_camera_driver);
-}
-module_init(stk_camera_init);
-module_exit(stk_camera_exit);
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
index 0a2d75f04066..4ed1c7c28ae7 100644
--- a/drivers/media/video/timblogiw.c
+++ b/drivers/media/video/timblogiw.c
@@ -565,7 +565,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
        spin_unlock_irq(&fh->queue_lock);
        desc = fh->chan->device->device_prep_slave_sg(fh->chan,
-                buf->sg, sg_elems, DMA_FROM_DEVICE,
+                buf->sg, sg_elems, DMA_DEV_TO_MEM,
                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
        if (!desc) {
                spin_lock_irq(&fh->queue_lock);
diff --git a/drivers/media/video/tm6000/tm6000-alsa.c b/drivers/media/video/tm6000/tm6000-alsa.c
index ddffd67c0d82..bd07ec707956 100644
--- a/drivers/media/video/tm6000/tm6000-alsa.c
+++ b/drivers/media/video/tm6000/tm6000-alsa.c
@@ -42,7 +42,7 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable tm6000x soundcard. default enabled.");
diff --git a/drivers/media/video/tm6000/tm6000-cards.c b/drivers/media/video/tm6000/tm6000-cards.c
index 3678918821b0..034659b13174 100644
--- a/drivers/media/video/tm6000/tm6000-cards.c
+++ b/drivers/media/video/tm6000/tm6000-cards.c
@@ -1406,31 +1406,7 @@ static struct usb_driver tm6000_usb_driver = {
                .id_table = tm6000_id_table,
 };
-static int __init tm6000_module_init(void)
+module_usb_driver(tm6000_usb_driver);
-{
-        int result;
-        printk(KERN_INFO "tm6000" " v4l2 driver version %d.%d.%d loaded\n",
-               (TM6000_VERSION  >> 16) & 0xff,
-               (TM6000_VERSION  >> 8) & 0xff, TM6000_VERSION  & 0xff);
-        /* register this driver with the USB subsystem */
-        result = usb_register(&tm6000_usb_driver);
-        if (result)
-                printk(KERN_ERR "tm6000"
-                           " usb_register failed. Error number %d.\n", result);
-        return result;
-}
-static void __exit tm6000_module_exit(void)
-{
-        /* deregister at USB subsystem */
-        usb_deregister(&tm6000_usb_driver);
-}
-module_init(tm6000_module_init);
-module_exit(tm6000_module_exit);
 MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c
index 926f03931156..dd26cacd0556 100644
--- a/drivers/media/video/tvp514x.c
+++ b/drivers/media/video/tvp514x.c
@@ -52,7 +52,7 @@
 #define LOCK_RETRY_DELAY                (200)
 /* Debug functions */
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c
index 7875e80cb2ff..236c559d5f51 100644
--- a/drivers/media/video/tvp7002.c
+++ b/drivers/media/video/tvp7002.c
@@ -63,7 +63,7 @@ MODULE_LICENSE("GPL");
 #define TVP7002_CL_MASK         0x0f
 /* Debug functions */
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debug level (0-2)");
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 9bbe61700fd5..65d065aa6091 100644
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -34,7 +34,7 @@ MODULE_DESCRIPTION("uPD64083 driver");
 MODULE_AUTHOR("T. Adachi, Takeru KOMORIYA, Hans Verkuil");
 MODULE_LICENSE("GPL");
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
index 7e2c34ed0564..20f7237b8242 100644
--- a/drivers/media/video/via-camera.c
+++ b/drivers/media/video/via-camera.c
@@ -34,13 +34,13 @@ MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>");
 MODULE_DESCRIPTION("VIA framebuffer-based camera controller driver");
 MODULE_LICENSE("GPL");
-static int flip_image;
+static bool flip_image;
 module_param(flip_image, bool, 0444);
 MODULE_PARM_DESC(flip_image,
                "If set, the sensor will be instructed to flip the image "
                "vertically.");
-static int override_serial;
+static bool override_serial;
 module_param(override_serial, bool, 0444);
 MODULE_PARM_DESC(override_serial,
                "The camera driver will normally refuse to load if "
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index e8a27844bf39..e86173bd1327 100644
--- a/drivers/media/video/zoran/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -57,7 +57,7 @@
                   ZR36057_ISR_GIRQ1 | \
                   ZR36057_ISR_JPEGRepIRQ )
-static int lml33dpath;          /* default = 0
+static bool lml33dpath;         /* default = 0
                                 * 1 will use digital path in capture
                                 * mode instead of analog. It can be
                                 * used for picture adjustments using
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index f7d236a2402a..4c09ab781ec3 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1550,7 +1550,7 @@ static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag)
                if (zoran_formats[i].flags & flag && num++ == fmt->index) {
                        strncpy(fmt->description, zoran_formats[i].name,
                                sizeof(fmt->description) - 1);
-                        /* fmt struct pre-zeroed, so adding '\0' not neeed */
+                        /* fmt struct pre-zeroed, so adding '\0' not needed */
                        fmt->pixelformat = zoran_formats[i].fourcc;
                        if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED)
                                fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;
diff --git a/drivers/media/video/zoran/zr36060.c b/drivers/media/video/zoran/zr36060.c
index 5e4f57cbf314..f08546fe2234 100644
--- a/drivers/media/video/zoran/zr36060.c
+++ b/drivers/media/video/zoran/zr36060.c
@@ -50,7 +50,7 @@
 /* amount of chips attached via this driver */
 static int zr36060_codecs;
-static int low_bitrate;
+static bool low_bitrate;
 module_param(low_bitrate, bool, 0);
 MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate");
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index e78cf94f491e..cd2e39fc4bf0 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -1695,28 +1695,7 @@ static struct usb_driver zr364xx_driver = {
        .id_table = device_table
 };
+module_usb_driver(zr364xx_driver);
-static int __init zr364xx_init(void)
-{
-        int retval;
-        retval = usb_register(&zr364xx_driver);
-        if (retval)
-                printk(KERN_ERR KBUILD_MODNAME ": usb_register failed!\n");
-        else
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
-        return retval;
-}
-static void __exit zr364xx_exit(void)
-{
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " module unloaded\n");
-        usb_deregister(&zr364xx_driver);
-}
-module_init(zr364xx_init);
-module_exit(zr364xx_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);