96 files changed, 176 insertions, 346 deletions

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 05e1aa090add..d0c2463b573f 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1428,7 +1428,6 @@ static struct platform_driver at91_can_driver = {
         .remove = at91_can_remove,
         .driver = {
                 .name = KBUILD_MODNAME,
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(at91_can_dt_ids),
         },
         .id_table = at91_can_id_table,
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 543ecceb33e9..417d50998e31 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -680,7 +680,6 @@ static struct platform_driver bfin_can_driver = {
         .resume = bfin_can_resume,
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index a4535d2142a7..f363972cd77d 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -471,7 +471,6 @@ static int c_can_resume(struct platform_device *pdev)
 static struct platform_driver c_can_plat_driver = {
         .driver = {
                 .name = KBUILD_MODNAME,
-                .owner = THIS_MODULE,
                 .of_match_table = c_can_of_table,
         },
         .probe = c_can_plat_probe,
diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c
index 87a47c0cfd49..e0d15711e9ac 100644
--- a/drivers/net/can/cc770/cc770_isa.c
+++ b/drivers/net/can/cc770/cc770_isa.c
@@ -318,7 +318,6 @@ static struct platform_driver cc770_isa_driver = {
         .remove = cc770_isa_remove,
         .driver = {
                 .name = KBUILD_MODNAME,
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c
index ad76734b3ecc..b1e8851d3cc4 100644
--- a/drivers/net/can/cc770/cc770_platform.c
+++ b/drivers/net/can/cc770/cc770_platform.c
@@ -264,7 +264,6 @@ MODULE_DEVICE_TABLE(of, cc770_platform_table);
 static struct platform_driver cc770_platform_driver = {
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = cc770_platform_table,
         },
         .probe = cc770_platform_probe,
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index dde05486bc99..b1d583ba9674 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1302,7 +1302,6 @@ static SIMPLE_DEV_PM_OPS(flexcan_pm_ops, flexcan_suspend, flexcan_resume);
 static struct platform_driver flexcan_driver = {
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
                 .pm = &flexcan_pm_ops,
                 .of_match_table = flexcan_of_match,
         },
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 3fd9fd942c6e..fed1bbd0b0d2 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1738,7 +1738,6 @@ MODULE_DEVICE_TABLE(of, grcan_match);
 static struct platform_driver grcan_driver = {
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = grcan_match,
         },
         .probe = grcan_probe,
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 2382c04dc780..1b118394907f 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1910,7 +1910,6 @@ static int ican3_remove(struct platform_device *pdev)
 static struct platform_driver ican3_driver = {
         .driver         = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
         },
         .probe          = ican3_probe,
         .remove         = ican3_remove,
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 44725296f72a..ad024e60ba8c 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -441,7 +441,6 @@ MODULE_DEVICE_TABLE(of, mpc5xxx_can_table);
 static struct platform_driver mpc5xxx_can_driver = {
         .driver = {
                 .name = "mpc5xxx_can",
-                .owner = THIS_MODULE,
                 .of_match_table = mpc5xxx_can_table,
         },
         .probe = mpc5xxx_can_probe,
diff --git a/drivers/net/can/rcar_can.c b/drivers/net/can/rcar_can.c
index 9718248e55f1..91cd48ca0efc 100644
--- a/drivers/net/can/rcar_can.c
+++ b/drivers/net/can/rcar_can.c
@@ -907,7 +907,6 @@ MODULE_DEVICE_TABLE(of, rcar_can_of_table);
 static struct platform_driver rcar_can_driver = {
         .driver = {
                 .name = RCAR_CAN_DRV_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(rcar_can_of_table),
                 .pm = &rcar_can_pm_ops,
         },
diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c
index 014695d7e6a3..e97e6d35b300 100644
--- a/drivers/net/can/sja1000/sja1000_isa.c
+++ b/drivers/net/can/sja1000/sja1000_isa.c
@@ -259,7 +259,6 @@ static struct platform_driver sja1000_isa_driver = {
         .remove = sja1000_isa_remove,
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index 95a844a7ee7b..93115250eaf5 100644
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -253,7 +253,6 @@ static struct platform_driver sp_driver = {
         .remove = sp_remove,
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = sp_of_table,
         },
 };
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index bacd236ce306..2bf98d862302 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -856,7 +856,6 @@ platform_resource_failed:
 static struct platform_driver softing_driver = {
         .driver = {
                 .name = "softing",
-                .owner = THIS_MODULE,
         },
         .probe = softing_pdev_probe,
         .remove = softing_pdev_remove,
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 258b9c4856ec..9a07eafe554b 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -1039,7 +1039,6 @@ static int ti_hecc_resume(struct platform_device *pdev)
 static struct platform_driver ti_hecc_driver = {
         .driver = {
                 .name    = DRV_NAME,
-                .owner   = THIS_MODULE,
         },
         .probe = ti_hecc_probe,
         .remove = ti_hecc_remove,
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 8a998e3884ce..6c6764312285 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -1196,7 +1196,6 @@ static struct platform_driver xcan_driver = {
         .probe = xcan_probe,
         .remove = xcan_remove,
         .driver = {
-                .owner = THIS_MODULE,
                 .name = DRIVER_NAME,
                 .pm = &xcan_dev_pm_ops,
                 .of_match_table = xcan_of_match,
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 1d162ccb4733..0443654f0339 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -1000,7 +1000,6 @@ static int ax_resume(struct platform_device *pdev)
 static struct platform_driver axdrv = {
         .driver = {
                 .name           = "ax88796",
-                .owner          = THIS_MODULE,
         },
         .probe          = ax_probe,
         .remove         = ax_remove,
diff --git a/drivers/net/ethernet/8390/mcf8390.c b/drivers/net/ethernet/8390/mcf8390.c
index 38fcdcf7c4c7..e1c055574a11 100644
--- a/drivers/net/ethernet/8390/mcf8390.c
+++ b/drivers/net/ethernet/8390/mcf8390.c
@@ -467,7 +467,6 @@ static int mcf8390_remove(struct platform_device *pdev)
 static struct platform_driver mcf8390_drv = {
         .driver = {
                 .name   = "mcf8390",
-                .owner  = THIS_MODULE,
         },
         .probe          = mcf8390_probe,
         .remove         = mcf8390_remove,
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index de566fb6e0f7..c063b410a163 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -920,7 +920,6 @@ static struct platform_driver ne_driver = {
         .resume         = ne_drv_resume,
         .driver         = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index 8ed4d3408ef6..ec20611e9de2 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1901,7 +1901,6 @@ static struct platform_driver bfin_mii_bus_driver = {
         .remove = bfin_mii_bus_remove,
         .driver = {
                 .name = "bfin_mii_bus",
-                .owner  = THIS_MODULE,
         },
 };
 
@@ -1912,7 +1911,6 @@ static struct platform_driver bfin_mac_driver = {
         .suspend = bfin_mac_suspend,
         .driver = {
                 .name = KBUILD_MODNAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 3005155e412b..2b8bfeeee9cf 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1603,7 +1603,6 @@ MODULE_DEVICE_TABLE(of, greth_of_match);
 static struct platform_driver greth_of_driver = {
         .driver = {
                 .name = "grlib-greth",
-                .owner = THIS_MODULE,
                 .of_match_table = greth_of_match,
         },
         .probe = greth_of_probe,
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index 4efc4355d345..3498760dc22a 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -1587,7 +1587,6 @@ static struct platform_driver altera_tse_driver = {
         .resume         = NULL,
         .driver         = {
                 .name   = ALTERA_TSE_RESOURCE_NAME,
-                .owner  = THIS_MODULE,
                 .of_match_table = altera_tse_ids,
         },
 };
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 6c323f4f457b..cb367cc59e0b 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -1461,7 +1461,6 @@ static struct platform_driver au1000_eth_driver = {
         .remove = au1000_remove,
         .driver = {
                 .name   = "au1000-eth",
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 5e4273b7aa27..7847638bdd22 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -1524,7 +1524,6 @@ MODULE_DEVICE_TABLE(of, sunlance_sbus_match);
 static struct platform_driver sunlance_sbus_driver = {
         .driver = {
                 .name = "sunlance",
-                .owner = THIS_MODULE,
                 .of_match_table = sunlance_sbus_match,
         },
         .probe          = sunlance_sbus_probe,
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index 58a200df4c35..6e66127e6abf 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -768,7 +768,6 @@ static struct platform_driver mac_mace_driver = {
         .remove = mac_mace_device_remove,
         .driver = {
                 .name   = mac_mace_string,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index a91a8c263391..5b308a4a4d0e 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1994,7 +1994,6 @@ static struct platform_driver bcm_sysport_driver = {
         .remove = bcm_sysport_remove,
         .driver =  {
                 .name = "brcm-systemport",
-                .owner = THIS_MODULE,
                 .of_match_table = bcm_sysport_of_match,
                 .pm = &bcm_sysport_pm_ops,
         },
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 7078bd386fb7..ff83c46bc389 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2889,7 +2889,6 @@ static struct platform_driver bcmgenet_driver = {
         .remove = bcmgenet_remove,
         .driver = {
                 .name   = "bcmgenet",
-                .owner  = THIS_MODULE,
                 .of_match_table = bcmgenet_match,
                 .pm     = &bcmgenet_pm_ops,
         },
diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index b61c14ed9b8d..ac27e24264a5 100644
--- a/drivers/net/ethernet/broadcom/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -2664,7 +2664,6 @@ static struct platform_driver sbmac_driver = {
         .remove = __exit_p(sbmac_remove),
         .driver = {
                 .name = sbmac_string,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 4a24b9a6ad75..55eb7f2af2b4 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -469,7 +469,6 @@ static struct platform_driver at91ether_driver = {
         .resume         = at91ether_resume,
         .driver         = {
                 .name   = "at91_ether",
-                .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(at91ether_dt_ids),
         },
 };
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 0987d2a77f9f..06dea3dd463c 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2459,7 +2459,6 @@ static struct platform_driver macb_driver = {
         .remove         = __exit_p(macb_remove),
         .driver         = {
                 .name           = "macb",
-                .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(macb_dt_ids),
                 .pm     = &macb_pm_ops,
         },
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index 9823a0ea7937..b2427928eb11 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -1897,7 +1897,6 @@ static int cs89x0_platform_remove(struct platform_device *pdev)
 static struct platform_driver cs89x0_driver = {
         .driver = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
         },
         .remove = cs89x0_platform_remove,
 };
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index 2be2a99c5ea3..3a12c096ea1c 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -881,7 +881,6 @@ static struct platform_driver ep93xx_eth_driver = {
         .remove         = ep93xx_eth_remove,
         .driver         = {
                 .name   = "ep93xx-eth",
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index f3ba840cbf7b..ef0bb58750e6 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1749,7 +1749,6 @@ MODULE_DEVICE_TABLE(of, dm9000_of_matches);
 static struct platform_driver dm9000_driver = {
         .driver = {
                 .name    = "dm9000",
-                .owner   = THIS_MODULE,
                 .pm      = &dm9000_drv_pm_ops,
                 .of_match_table = of_match_ptr(dm9000_of_matches),
         },
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 0bc6c102f3ac..f88cfaa359e7 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -1312,7 +1312,6 @@ static struct platform_driver ethoc_driver = {
         .resume  = ethoc_resume,
         .driver  = {
                 .name = "ethoc",
-                .owner = THIS_MODULE,
                 .of_match_table = ethoc_match,
         },
 };
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index c77fa4a69844..6d0c5d5eea6d 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1335,7 +1335,6 @@ static struct platform_driver ftgmac100_driver = {
         .remove         = __exit_p(ftgmac100_remove),
         .driver         = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index 4ff1adc6bfca..dce5f7b7f772 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -1177,7 +1177,6 @@ static struct platform_driver ftmac100_driver = {
         .remove         = __exit_p(ftmac100_remove),
         .driver         = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 8c5b15ee5ed7..ebf76c496e7a 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3386,7 +3386,6 @@ static SIMPLE_DEV_PM_OPS(fec_pm_ops, fec_suspend, fec_resume);
 static struct platform_driver fec_driver = {
         .driver = {
                 .name   = DRIVER_NAME,
-                .owner  = THIS_MODULE,
                 .pm     = &fec_pm_ops,
                 .of_match_table = fec_dt_ids,
         },
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index ff55fbb20a75..f495796248db 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -1069,7 +1069,6 @@ MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
 static struct platform_driver mpc52xx_fec_driver = {
         .driver = {
                 .name = DRIVER_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = mpc52xx_fec_match,
         },
         .probe          = mpc52xx_fec_probe,
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index c92c3b7876ca..9e2bcb807923 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1087,7 +1087,6 @@ MODULE_DEVICE_TABLE(of, fs_enet_match);
 
 static struct platform_driver fs_enet_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "fs_enet",
                 .of_match_table = fs_enet_match,
         },
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index 3d3fde66c2cc..1d5617d2d8bd 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -224,7 +224,6 @@ MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match);
 static struct platform_driver fs_enet_bb_mdio_driver = {
         .driver = {
                 .name = "fsl-bb-mdio",
-                .owner = THIS_MODULE,
                 .of_match_table = fs_enet_mdio_bb_match,
         },
         .probe = fs_enet_mdio_probe,
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index ebf5d6429a8d..1648e3582500 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -225,7 +225,6 @@ MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match);
 static struct platform_driver fs_enet_fec_mdio_driver = {
         .driver = {
                 .name = "fsl-fec-mdio",
-                .owner = THIS_MODULE,
                 .of_match_table = fs_enet_mdio_fec_match,
         },
         .probe = fs_enet_mdio_probe,
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index 964c6bf37710..d1a91e344e6b 100644
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -488,7 +488,6 @@ static int fsl_pq_mdio_remove(struct platform_device *pdev)
 static struct platform_driver fsl_pq_mdio_driver = {
         .driver = {
                 .name = "fsl-pq_mdio",
-                .owner = THIS_MODULE,
                 .of_match_table = fsl_pq_mdio_match,
         },
         .probe = fsl_pq_mdio_probe,
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 7402ab12e46b..5645342f5b28 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -3561,7 +3561,6 @@ MODULE_DEVICE_TABLE(of, gfar_match);
 static struct platform_driver gfar_driver = {
         .driver = {
                 .name = "fsl-gianfar",
-                .owner = THIS_MODULE,
                 .pm = GFAR_PM_OPS,
                 .of_match_table = gfar_match,
         },
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index bb568006f37d..16826341a4c9 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -563,7 +563,6 @@ static struct platform_driver gianfar_ptp_driver = {
         .driver = {
                 .name           = "gianfar_ptp",
                 .of_match_table = match_table,
-                .owner          = THIS_MODULE,
         },
         .probe       = gianfar_ptp_probe,
         .remove      = gianfar_ptp_remove,
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 3cf0478b3728..357e8b576905 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3943,7 +3943,6 @@ MODULE_DEVICE_TABLE(of, ucc_geth_match);
 static struct platform_driver ucc_geth_driver = {
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = ucc_geth_match,
         },
         .probe          = ucc_geth_probe,
diff --git a/drivers/net/ethernet/i825xx/sni_82596.c b/drivers/net/ethernet/i825xx/sni_82596.c
index 372fa8d1fda1..2af7f77345fb 100644
--- a/drivers/net/ethernet/i825xx/sni_82596.c
+++ b/drivers/net/ethernet/i825xx/sni_82596.c
@@ -165,7 +165,6 @@ static struct platform_driver sni_82596_driver = {
         .remove = sni_82596_driver_remove,
         .driver = {
                 .name   = sni_82596_string,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 3f3fba9e4650..9388a83818f2 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -3002,7 +3002,6 @@ MODULE_DEVICE_TABLE(of, emac_match);
 static struct platform_driver emac_driver = {
         .driver = {
                 .name = "emac",
-                .owner = THIS_MODULE,
                 .of_match_table = emac_match,
         },
         .probe = emac_probe,
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 63eb959a28aa..dddaab11a4c7 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -776,7 +776,6 @@ static struct of_device_id mal_platform_match[] =
 static struct platform_driver mal_of_driver = {
         .driver = {
                 .name = "mcmal",
-                .owner = THIS_MODULE,
                 .of_match_table = mal_platform_match,
         },
         .probe = mal_probe,
diff --git a/drivers/net/ethernet/ibm/emac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c
index a01182cce965..457088fc5b06 100644
--- a/drivers/net/ethernet/ibm/emac/rgmii.c
+++ b/drivers/net/ethernet/ibm/emac/rgmii.c
@@ -319,7 +319,6 @@ static struct of_device_id rgmii_match[] =
 static struct platform_driver rgmii_driver = {
         .driver = {
                 .name = "emac-rgmii",
-                .owner = THIS_MODULE,
                 .of_match_table = rgmii_match,
         },
         .probe = rgmii_probe,
diff --git a/drivers/net/ethernet/ibm/emac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
index 9f24769ed826..cb18e7f917c6 100644
--- a/drivers/net/ethernet/ibm/emac/tah.c
+++ b/drivers/net/ethernet/ibm/emac/tah.c
@@ -163,7 +163,6 @@ static struct of_device_id tah_match[] =
 static struct platform_driver tah_driver = {
         .driver = {
                 .name = "emac-tah",
-                .owner = THIS_MODULE,
                 .of_match_table = tah_match,
         },
         .probe = tah_probe,
diff --git a/drivers/net/ethernet/ibm/emac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c
index 9ca67a38c062..36409ccb75ea 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.c
+++ b/drivers/net/ethernet/ibm/emac/zmii.c
@@ -310,7 +310,6 @@ static struct of_device_id zmii_match[] =
 static struct platform_driver zmii_driver = {
         .driver = {
                 .name = "emac-zmii",
-                .owner = THIS_MODULE,
                 .of_match_table = zmii_match,
         },
         .probe = zmii_probe,
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 2dad4d5047ba..581928c068f2 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -789,7 +789,6 @@ static struct platform_driver ltq_mii_driver = {
         .remove = ltq_etop_remove,
         .driver = {
                 .name = "ltq_etop",
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index d44560d1d268..a62fc38f045e 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2839,7 +2839,6 @@ static struct platform_driver mv643xx_eth_shared_driver = {
         .remove         = mv643xx_eth_shared_remove,
         .driver = {
                 .name   = MV643XX_ETH_SHARED_NAME,
-                .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(mv643xx_eth_shared_ids),
         },
 };
@@ -3188,7 +3187,6 @@ static struct platform_driver mv643xx_eth_driver = {
         .shutdown       = mv643xx_eth_shutdown,
         .driver = {
                 .name   = MV643XX_ETH_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c
index 6c7c78baedca..a8522d8af95d 100644
--- a/drivers/net/ethernet/micrel/ks8695net.c
+++ b/drivers/net/ethernet/micrel/ks8695net.c
@@ -1612,7 +1612,6 @@ ks8695_drv_remove(struct platform_device *pdev)
 static struct platform_driver ks8695_driver = {
         .driver = {
                 .name   = MODULENAME,
-                .owner  = THIS_MODULE,
         },
         .probe          = ks8695_probe,
         .remove         = ks8695_drv_remove,
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 0c33b92a5a81..f78909a00f15 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -1255,7 +1255,6 @@ static int ks8842_remove(struct platform_device *pdev)
 static struct platform_driver ks8842_platform_driver = {
         .driver = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
         },
         .probe          = ks8842_probe,
         .remove         = ks8842_remove,
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 0eb47649191b..2fc5cd56c0a8 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1679,7 +1679,6 @@ static int ks8851_remove(struct platform_device *pdev)
 static struct platform_driver ks8851_platform_driver = {
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(ks8851_ml_dt_ids),
         },
         .probe = ks8851_probe,
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c
index bde1b70f473b..6c72e74fef3e 100644
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -559,7 +559,6 @@ static struct platform_driver moxart_mac_driver = {
         .remove = moxart_remove,
         .driver = {
                 .name           = "moxart-ethernet",
-                .owner          = THIS_MODULE,
                 .of_match_table = moxart_mac_match,
         },
 };
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index a5512a97cc4d..acf3f11e38cc 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -287,7 +287,6 @@ static struct platform_driver jazz_sonic_driver = {
         .remove = jazz_sonic_device_remove,
         .driver = {
                 .name   = jazz_sonic_string,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 66c2d50d5b8d..d98f5b8a1c66 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -630,7 +630,6 @@ static struct platform_driver mac_sonic_driver = {
         .remove = mac_sonic_device_remove,
         .driver = {
                 .name   = mac_sonic_string,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index 8176c8a1cc6a..9fbc30264237 100644
--- a/drivers/net/ethernet/netx-eth.c
+++ b/drivers/net/ethernet/netx-eth.c
@@ -457,7 +457,6 @@ static struct platform_driver netx_eth_driver = {
         .resume         = netx_eth_drv_resume,
         .driver         = {
                 .name   = CARDNAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c
index 379b7fbded78..afa445842f3e 100644
--- a/drivers/net/ethernet/nuvoton/w90p910_ether.c
+++ b/drivers/net/ethernet/nuvoton/w90p910_ether.c
@@ -1081,7 +1081,6 @@ static struct platform_driver w90p910_ether_driver = {
         .remove         = w90p910_ether_remove,
         .driver         = {
                 .name   = "nuc900-emc",
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index a42293092ea4..d36599f47af5 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -1568,7 +1568,6 @@ MODULE_DEVICE_TABLE(of, octeon_mgmt_match);
 static struct platform_driver octeon_mgmt_driver = {
         .driver = {
                 .name           = "octeon_mgmt",
-                .owner          = THIS_MODULE,
                 .of_match_table = octeon_mgmt_match,
         },
         .probe          = octeon_mgmt_probe,
diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c
index 1f4449ad8900..f537cbea20e5 100644
--- a/drivers/net/ethernet/s6gmac.c
+++ b/drivers/net/ethernet/s6gmac.c
@@ -1048,7 +1048,6 @@ static struct platform_driver s6gmac_driver = {
         .remove = s6gmac_remove,
         .driver = {
                 .name = "s6gmac",
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
index 7fd6e275d1c2..866560ea9e18 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
@@ -233,7 +233,6 @@ static struct platform_driver sxgbe_platform_driver = {
         .remove = sxgbe_platform_remove,
         .driver = {
                 .name           = SXGBE_RESOURCE_NAME,
-                .owner          = THIS_MODULE,
                 .pm             = &sxgbe_platform_pm_ops,
                 .of_match_table = of_match_ptr(sxgbe_dt_ids),
         },
diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index 69e4fd21adb4..ca7336605748 100644
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -826,7 +826,6 @@ static struct platform_driver sgiseeq_driver = {
         .remove = __exit_p(sgiseeq_remove),
         .driver = {
                 .name   = "sgiseeq",
-                .owner  = THIS_MODULE,
         }
 };
 
diff --git a/drivers/net/ethernet/sgi/meth.c b/drivers/net/ethernet/sgi/meth.c
index 5564a5fa3385..5eac523b4b0c 100644
--- a/drivers/net/ethernet/sgi/meth.c
+++ b/drivers/net/ethernet/sgi/meth.c
@@ -870,7 +870,6 @@ static struct platform_driver meth_driver = {
         .remove = __exit_p(meth_remove),
         .driver = {
                 .name   = "meth",
-                .owner  = THIS_MODULE,
         }
 };
 
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index e88df9c7f1c0..bd64eb982e52 100644
--- a/drivers/net/ethernet/smsc/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
@@ -2173,7 +2173,6 @@ static struct platform_driver smc911x_driver = {
         .resume  = smc911x_drv_resume,
         .driver  = {
                 .name    = CARDNAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 6cc3cf6f17c8..88a55f95fe09 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2472,7 +2472,6 @@ static struct platform_driver smc_driver = {
         .remove         = smc_drv_remove,
         .driver         = {
                 .name   = CARDNAME,
-                .owner  = THIS_MODULE,
                 .pm     = &smc_drv_pm_ops,
                 .of_match_table = of_match_ptr(smc91x_match),
         },
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index f9c87624a0af..2965c6ae7d6e 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2659,7 +2659,6 @@ static struct platform_driver smsc911x_driver = {
         .remove = smsc911x_drv_remove,
         .driver = {
                 .name   = SMSC_CHIPNAME,
-                .owner  = THIS_MODULE,
                 .pm     = SMSC911X_PM_OPS,
                 .of_match_table = of_match_ptr(smsc911x_dt_ids),
         },
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 4aaa3240453a..0c6416213837 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -10180,7 +10180,6 @@ MODULE_DEVICE_TABLE(of, niu_match);
 static struct platform_driver niu_of_driver = {
         .driver = {
                 .name = "niu",
-                .owner = THIS_MODULE,
                 .of_match_table = niu_match,
         },
         .probe          = niu_of_probe,
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 206c1063815a..aa4f9d2d8fa9 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -1273,7 +1273,6 @@ MODULE_DEVICE_TABLE(of, bigmac_sbus_match);
 static struct platform_driver bigmac_sbus_driver = {
         .driver = {
                 .name = "sunbmac",
-                .owner = THIS_MODULE,
                 .of_match_table = bigmac_sbus_match,
         },
         .probe          = bigmac_sbus_probe,
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 9c014803b03b..7a8ca2c7b7df 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -3323,7 +3323,6 @@ MODULE_DEVICE_TABLE(of, hme_sbus_match);
 static struct platform_driver hme_sbus_driver = {
         .driver = {
                 .name = "hme",
-                .owner = THIS_MODULE,
                 .of_match_table = hme_sbus_match,
         },
         .probe          = hme_sbus_probe,
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 5695ae2411de..9b825780b3be 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -963,7 +963,6 @@ MODULE_DEVICE_TABLE(of, qec_sbus_match);
 static struct platform_driver qec_sbus_driver = {
         .driver = {
                 .name = "qec",
-                .owner = THIS_MODULE,
                 .of_match_table = qec_sbus_match,
         },
         .probe          = qec_sbus_probe,
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 47eeb3abf7f7..520cf50a3d5a 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -161,7 +161,6 @@ static struct platform_driver tsi_eth_driver = {
         .remove = tsi108_ether_remove,
         .driver = {
                 .name = "tsi-ethernet",
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 68c5260cc322..a191afc23b56 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2508,7 +2508,6 @@ static struct platform_driver rhine_driver_platform = {
         .remove         = rhine_remove_one_platform,
         .driver = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
                 .of_match_table = rhine_of_tbl,
                 .pm             = RHINE_PM_OPS,
         }
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index a43e8492b1ce..282f83a63b67 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -3281,7 +3281,6 @@ static struct platform_driver velocity_platform_driver = {
         .remove         = velocity_platform_remove,
         .driver = {
                 .name = "via-velocity",
-                .owner = THIS_MODULE,
                 .of_match_table = velocity_of_ids,
                 .pm = &velocity_pm_ops,
         },
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 70a930ac4fa9..a495931a66a1 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -788,7 +788,6 @@ static SIMPLE_DEV_PM_OPS(w5100_pm_ops, w5100_suspend, w5100_resume);
 static struct platform_driver w5100_driver = {
         .driver         = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
                 .pm     = &w5100_pm_ops,
         },
         .probe          = w5100_probe,
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 7974b7d90fcc..09322d9db578 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -700,7 +700,6 @@ static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume);
 static struct platform_driver w5300_driver = {
         .driver         = {
                 .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
                 .pm     = &w5300_pm_ops,
         },
         .probe          = w5300_probe,
diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index 96947d724189..dc2bfb600b4b 100644
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -261,7 +261,6 @@ static struct platform_driver ieee802154fake_driver = {
         .remove = fakelb_remove,
         .driver = {
                         .name = "ieee802154fakelb",
-                        .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 588680a72fa1..58f98f4de773 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -61,7 +61,6 @@ static struct platform_driver ali_ircc_driver = {
         .resume         = ali_ircc_resume,
         .driver         = {
                 .name   = ALI_IRCC_DRIVER_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index aab2cf72d025..e151205281e2 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -989,7 +989,6 @@ static int au1k_irda_remove(struct platform_device *pdev)
 static struct platform_driver au1k_irda_driver = {
         .driver = {
                 .name   = "au1000-irda",
-                .owner  = THIS_MODULE,
         },
         .probe          = au1k_irda_probe,
         .remove         = au1k_irda_remove,
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 3eeaaf800494..100454662e4b 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -966,7 +966,6 @@ static int pxa_irda_remove(struct platform_device *_dev)
 static struct platform_driver pxa_ir_driver = {
         .driver         = {
                 .name   = "pxa2xx-ir",
-                .owner  = THIS_MODULE,
         },
         .probe          = pxa_irda_probe,
         .remove         = pxa_irda_remove,
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 42fde9ed23e1..7b17fa2114e1 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -1114,7 +1114,6 @@ static struct platform_driver sa1100ir_driver = {
         .resume         = sa1100_irda_resume,
         .driver         = {
                 .name   = "sa11x0-ir",
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/phy/mdio-bcm-unimac.c b/drivers/net/phy/mdio-bcm-unimac.c
index 5b643e588e8f..6deac6d32f57 100644
--- a/drivers/net/phy/mdio-bcm-unimac.c
+++ b/drivers/net/phy/mdio-bcm-unimac.c
@@ -199,7 +199,6 @@ static struct of_device_id unimac_mdio_ids[] = {
 static struct platform_driver unimac_mdio_driver = {
         .driver = {
                 .name = "unimac-mdio",
-                .owner = THIS_MODULE,
                 .of_match_table = unimac_mdio_ids,
         },
         .probe  = unimac_mdio_probe,
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 5f1a2250018f..0a0578a592b8 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -259,7 +259,6 @@ static struct platform_driver mdio_gpio_driver = {
         .remove = mdio_gpio_remove,
         .driver         = {
                 .name   = "mdio-gpio",
-                .owner  = THIS_MODULE,
                 .of_match_table = mdio_gpio_of_match,
         },
 };
diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
index 1eaf81efde24..320eb15315c8 100644
--- a/drivers/net/phy/mdio-mux-gpio.c
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -114,7 +114,6 @@ MODULE_DEVICE_TABLE(of, mdio_mux_gpio_match);
 static struct platform_driver mdio_mux_gpio_driver = {
         .driver = {
                 .name           = "mdio-mux-gpio",
-                .owner          = THIS_MODULE,
                 .of_match_table = mdio_mux_gpio_match,
         },
         .probe          = mdio_mux_gpio_probe,
diff --git a/drivers/net/phy/mdio-mux-mmioreg.c b/drivers/net/phy/mdio-mux-mmioreg.c
index 1656785ff339..0aa985c74014 100644
--- a/drivers/net/phy/mdio-mux-mmioreg.c
+++ b/drivers/net/phy/mdio-mux-mmioreg.c
@@ -156,7 +156,6 @@ MODULE_DEVICE_TABLE(of, mdio_mux_mmioreg_match);
 static struct platform_driver mdio_mux_mmioreg_driver = {
         .driver = {
                 .name           = "mdio-mux-mmioreg",
-                .owner          = THIS_MODULE,
                 .of_match_table = mdio_mux_mmioreg_match,
         },
         .probe          = mdio_mux_mmioreg_probe,
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
index a51ed92fbada..c81052486edc 100644
--- a/drivers/net/phy/mdio-octeon.c
+++ b/drivers/net/phy/mdio-octeon.c
@@ -263,7 +263,6 @@ MODULE_DEVICE_TABLE(of, octeon_mdiobus_match);
 static struct platform_driver octeon_mdiobus_driver = {
         .driver = {
                 .name           = "mdio-octeon",
-                .owner          = THIS_MODULE,
                 .of_match_table = octeon_mdiobus_match,
         },
         .probe          = octeon_mdiobus_probe,
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 4173838f4684..e000c4c27881 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -175,7 +175,6 @@ static struct platform_driver ath_ahb_driver = {
         .remove     = ath_ahb_remove,
         .driver         = {
                 .name   = "ath9k",
-                .owner  = THIS_MODULE,
         },
         .id_table    = ath9k_platform_id_table,
 };
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 696e3d5309c6..871e969409bf 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -401,22 +401,14 @@ static const struct file_operations fops_antenna_diversity = {
         .llseek = default_llseek,
 };
 
-static ssize_t read_file_dma(struct file *file, char __user *user_buf,
-                             size_t count, loff_t *ppos)
+static int read_file_dma(struct seq_file *file, void *data)
 {
-        struct ath_softc *sc = file->private_data;
+        struct ath_softc *sc = file->private;
         struct ath_hw *ah = sc->sc_ah;
-        char *buf;
-        int retval;
-        unsigned int len = 0;
         u32 val[ATH9K_NUM_DMA_DEBUG_REGS];
         int i, qcuOffset = 0, dcuOffset = 0;
         u32 *qcuBase = &val[0], *dcuBase = &val[4];
 
-        buf = kmalloc(DMA_BUF_LEN, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
         ath9k_ps_wakeup(sc);
 
         REG_WRITE_D(ah, AR_MACMISC,
@@ -424,21 +416,18 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
                    (AR_MACMISC_MISC_OBS_BUS_1 <<
                     AR_MACMISC_MISC_OBS_BUS_MSB_S)));
 
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                         "Raw DMA Debug values:\n");
+        seq_puts(file, "Raw DMA Debug values:\n");
 
         for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++) {
                 if (i % 4 == 0)
-                        len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n");
+                        seq_puts(file, "\n");
 
                 val[i] = REG_READ_D(ah, AR_DMADBG_0 + (i * sizeof(u32)));
-                len += scnprintf(buf + len, DMA_BUF_LEN - len, "%d: %08x ",
-                                 i, val[i]);
+                seq_printf(file, "%d: %08x ", i, val[i]);
         }
 
-        len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n\n");
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                         "Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
+        seq_puts(file, "\n\n");
+        seq_puts(file, "Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
 
         for (i = 0; i < ATH9K_NUM_QUEUES; i++, qcuOffset += 4, dcuOffset += 5) {
                 if (i == 8) {
@@ -451,55 +440,47 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
                         dcuBase++;
                 }
 
-                len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                         "%2d          %2x      %1x     %2x           %2x\n",
-                         i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset,
-                         (*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3),
-                         (val[2] & (0x7 << (i * 3))) >> (i * 3),
-                         (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);
+                seq_printf(file, "%2d          %2x      %1x     %2x           %2x\n",
+                           i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset,
+                           (*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3),
+                           (val[2] & (0x7 << (i * 3))) >> (i * 3),
+                           (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);
         }
 
-        len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n");
-
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                "qcu_stitch state:   %2x    qcu_fetch state:        %2x\n",
-                (val[3] & 0x003c0000) >> 18, (val[3] & 0x03c00000) >> 22);
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                "qcu_complete state: %2x    dcu_complete state:     %2x\n",
-                (val[3] & 0x1c000000) >> 26, (val[6] & 0x3));
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                "dcu_arb state:      %2x    dcu_fp state:           %2x\n",
-                (val[5] & 0x06000000) >> 25, (val[5] & 0x38000000) >> 27);
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                "chan_idle_dur:     %3d    chan_idle_dur_valid:     %1d\n",
-                (val[6] & 0x000003fc) >> 2, (val[6] & 0x00000400) >> 10);
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                "txfifo_valid_0:      %1d    txfifo_valid_1:          %1d\n",
-                (val[6] & 0x00000800) >> 11, (val[6] & 0x00001000) >> 12);
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                "txfifo_dcu_num_0:   %2d    txfifo_dcu_num_1:       %2d\n",
-                (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17);
-
-        len += scnprintf(buf + len, DMA_BUF_LEN - len, "pcu observe: 0x%x\n",
-                         REG_READ_D(ah, AR_OBS_BUS_1));
-        len += scnprintf(buf + len, DMA_BUF_LEN - len,
-                         "AR_CR: 0x%x\n", REG_READ_D(ah, AR_CR));
+        seq_puts(file, "\n");
+
+        seq_printf(file, "qcu_stitch state:   %2x    qcu_fetch state:        %2x\n",
+                   (val[3] & 0x003c0000) >> 18, (val[3] & 0x03c00000) >> 22);
+        seq_printf(file, "qcu_complete state: %2x    dcu_complete state:     %2x\n",
+                   (val[3] & 0x1c000000) >> 26, (val[6] & 0x3));
+        seq_printf(file, "dcu_arb state:      %2x    dcu_fp state:           %2x\n",
+                   (val[5] & 0x06000000) >> 25, (val[5] & 0x38000000) >> 27);
+        seq_printf(file, "chan_idle_dur:     %3d    chan_idle_dur_valid:     %1d\n",
+                   (val[6] & 0x000003fc) >> 2, (val[6] & 0x00000400) >> 10);
+        seq_printf(file, "txfifo_valid_0:      %1d    txfifo_valid_1:          %1d\n",
+                   (val[6] & 0x00000800) >> 11, (val[6] & 0x00001000) >> 12);
+        seq_printf(file, "txfifo_dcu_num_0:   %2d    txfifo_dcu_num_1:       %2d\n",
+                   (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17);
+
+        seq_printf(file, "pcu observe: 0x%x\n", REG_READ_D(ah, AR_OBS_BUS_1));
+        seq_printf(file, "AR_CR: 0x%x\n", REG_READ_D(ah, AR_CR));
 
         ath9k_ps_restore(sc);
 
-        if (len > DMA_BUF_LEN)
-                len = DMA_BUF_LEN;
+        return 0;
+}
 
-        retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        kfree(buf);
-        return retval;
+static int open_file_dma(struct inode *inode, struct file *f)
+{
+        return single_open(f, read_file_dma, inode->i_private);
 }
 
 static const struct file_operations fops_dma = {
-        .read = read_file_dma,
-        .open = simple_open,
+        .open = open_file_dma,
+        .read = seq_read,
         .owner = THIS_MODULE,
-        .llseek = default_llseek,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
 
@@ -556,22 +537,14 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
                 sc->debug.stats.istats.gen_timer++;
 }
 
-static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
-                                   size_t count, loff_t *ppos)
+static int read_file_interrupt(struct seq_file *file, void *data)
 {
-        struct ath_softc *sc = file->private_data;
-        unsigned int len = 0;
-        int rv;
-        int mxlen = 4000;
-        char *buf = kmalloc(mxlen, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
+        struct ath_softc *sc = file->private;
 
 #define PR_IS(a, s)                                             \
         do {                                                    \
-                len += scnprintf(buf + len, mxlen - len,        \
-                                 "%21s: %10u\n", a,             \
-                                 sc->debug.stats.istats.s);     \
+                seq_printf(file, "%21s: %10u\n", a,             \
+                           sc->debug.stats.istats.s);           \
         } while (0)
 
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
@@ -602,8 +575,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
         PR_IS("GENTIMER", gen_timer);
         PR_IS("TOTAL", total);
 
-        len += scnprintf(buf + len, mxlen - len,
-                         "SYNC_CAUSE stats:\n");
+        seq_puts(file, "SYNC_CAUSE stats:\n");
 
         PR_IS("Sync-All", sync_cause_all);
         PR_IS("RTC-IRQ", sync_rtc_irq);
@@ -625,35 +597,27 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
         PR_IS("MAC-Asleep", mac_asleep);
         PR_IS("MAC-Sleep-Access", mac_sleep_access);
 
-        if (len > mxlen)
-                len = mxlen;
+        return 0;
+}
 
-        rv = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        kfree(buf);
-        return rv;
+static int open_file_interrupt(struct inode *inode, struct file *f)
+{
+        return single_open(f, read_file_interrupt, inode->i_private);
 }
 
 static const struct file_operations fops_interrupt = {
-        .read = read_file_interrupt,
-        .open = simple_open,
+        .read = seq_read,
+        .open = open_file_interrupt,
         .owner = THIS_MODULE,
-        .llseek = default_llseek,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
-static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
-                              size_t count, loff_t *ppos)
+static int read_file_xmit(struct seq_file *file, void *data)
 {
-        struct ath_softc *sc = file->private_data;
-        char *buf;
-        unsigned int len = 0, size = 2048;
-        ssize_t retval = 0;
-
-        buf = kzalloc(size, GFP_KERNEL);
-        if (buf == NULL)
-                return -ENOMEM;
+        struct ath_softc *sc = file->private;
 
-        len += sprintf(buf, "%30s %10s%10s%10s\n\n",
-                       "BE", "BK", "VI", "VO");
+        seq_printf(file, "%30s %10s%10s%10s\n\n", "BE", "BK", "VI", "VO");
 
         PR("MPDUs Queued:    ", queued);
         PR("MPDUs Completed: ", completed);
@@ -678,153 +642,115 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
         PR("HW-tx-proc-desc: ", txprocdesc);
         PR("TX-Failed:       ", txfailed);
 
-        if (len > size)
-                len = size;
-
-        retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        kfree(buf);
-
-        return retval;
+        return 0;
 }
 
-static ssize_t print_queue(struct ath_softc *sc, struct ath_txq *txq,
-                           char *buf, ssize_t size)
+static void print_queue(struct ath_softc *sc, struct ath_txq *txq,
+                        struct seq_file *file)
 {
-        ssize_t len = 0;
-
         ath_txq_lock(sc, txq);
 
-        len += scnprintf(buf + len, size - len, "%s: %d ",
-                         "qnum", txq->axq_qnum);
-        len += scnprintf(buf + len, size - len, "%s: %2d ",
-                         "qdepth", txq->axq_depth);
-        len += scnprintf(buf + len, size - len, "%s: %2d ",
-                         "ampdu-depth", txq->axq_ampdu_depth);
-        len += scnprintf(buf + len, size - len, "%s: %3d ",
-                         "pending", txq->pending_frames);
-        len += scnprintf(buf + len, size - len, "%s: %d\n",
-                         "stopped", txq->stopped);
+        seq_printf(file, "%s: %d ", "qnum", txq->axq_qnum);
+        seq_printf(file, "%s: %2d ", "qdepth", txq->axq_depth);
+        seq_printf(file, "%s: %2d ", "ampdu-depth", txq->axq_ampdu_depth);
+        seq_printf(file, "%s: %3d ", "pending", txq->pending_frames);
+        seq_printf(file, "%s: %d\n", "stopped", txq->stopped);
 
         ath_txq_unlock(sc, txq);
-        return len;
 }
 
-static ssize_t read_file_queues(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos)
+static int read_file_queues(struct seq_file *file, void *data)
 {
-        struct ath_softc *sc = file->private_data;
+        struct ath_softc *sc = file->private;
         struct ath_txq *txq;
-        char *buf;
-        unsigned int len = 0;
-        const unsigned int size = 1024;
-        ssize_t retval = 0;
         int i;
         static const char *qname[4] = {
                 "VO", "VI", "BE", "BK"
         };
 
-        buf = kzalloc(size, GFP_KERNEL);
-        if (buf == NULL)
-                return -ENOMEM;
-
         for (i = 0; i < IEEE80211_NUM_ACS; i++) {
                 txq = sc->tx.txq_map[i];
-                len += scnprintf(buf + len, size - len, "(%s):  ", qname[i]);
-                len += print_queue(sc, txq, buf + len, size - len);
+                seq_printf(file, "(%s):  ", qname[i]);
+                print_queue(sc, txq, file);
         }
 
-        len += scnprintf(buf + len, size - len, "(CAB): ");
-        len += print_queue(sc, sc->beacon.cabq, buf + len, size - len);
-
-        if (len > size)
-                len = size;
-
-        retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        kfree(buf);
+        seq_puts(file, "(CAB): ");
+        print_queue(sc, sc->beacon.cabq, file);
 
-        return retval;
+        return 0;
 }
 
-static ssize_t read_file_misc(struct file *file, char __user *user_buf,
-                              size_t count, loff_t *ppos)
+static int read_file_misc(struct seq_file *file, void *data)
 {
-        struct ath_softc *sc = file->private_data;
+        struct ath_softc *sc = file->private;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath9k_vif_iter_data iter_data;
         struct ath_chanctx *ctx;
-        char buf[512];
-        unsigned int len = 0;
-        ssize_t retval = 0;
         unsigned int reg;
         u32 rxfilter, i;
 
-        len += scnprintf(buf + len, sizeof(buf) - len,
-                         "BSSID: %pM\n", common->curbssid);
-        len += scnprintf(buf + len, sizeof(buf) - len,
-                         "BSSID-MASK: %pM\n", common->bssidmask);
-        len += scnprintf(buf + len, sizeof(buf) - len,
-                         "OPMODE: %s\n",
-                         ath_opmode_to_string(sc->sc_ah->opmode));
+        seq_printf(file, "BSSID: %pM\n", common->curbssid);
+        seq_printf(file, "BSSID-MASK: %pM\n", common->bssidmask);
+        seq_printf(file, "OPMODE: %s\n",
+                   ath_opmode_to_string(sc->sc_ah->opmode));
 
         ath9k_ps_wakeup(sc);
         rxfilter = ath9k_hw_getrxfilter(sc->sc_ah);
         ath9k_ps_restore(sc);
 
-        len += scnprintf(buf + len, sizeof(buf) - len,
-                         "RXFILTER: 0x%x", rxfilter);
+        seq_printf(file, "RXFILTER: 0x%x", rxfilter);
 
         if (rxfilter & ATH9K_RX_FILTER_UCAST)
-                len += scnprintf(buf + len, sizeof(buf) - len, " UCAST");
+                seq_puts(file, " UCAST");
         if (rxfilter & ATH9K_RX_FILTER_MCAST)
-                len += scnprintf(buf + len, sizeof(buf) - len, " MCAST");
+                seq_puts(file, " MCAST");
         if (rxfilter & ATH9K_RX_FILTER_BCAST)
-                len += scnprintf(buf + len, sizeof(buf) - len, " BCAST");
+                seq_puts(file, " BCAST");
         if (rxfilter & ATH9K_RX_FILTER_CONTROL)
-                len += scnprintf(buf + len, sizeof(buf) - len, " CONTROL");
+                seq_puts(file, " CONTROL");
         if (rxfilter & ATH9K_RX_FILTER_BEACON)
-                len += scnprintf(buf + len, sizeof(buf) - len, " BEACON");
+                seq_puts(file, " BEACON");
         if (rxfilter & ATH9K_RX_FILTER_PROM)
-                len += scnprintf(buf + len, sizeof(buf) - len, " PROM");
+                seq_puts(file, " PROM");
         if (rxfilter & ATH9K_RX_FILTER_PROBEREQ)
-                len += scnprintf(buf + len, sizeof(buf) - len, " PROBEREQ");
+                seq_puts(file, " PROBEREQ");
         if (rxfilter & ATH9K_RX_FILTER_PHYERR)
-                len += scnprintf(buf + len, sizeof(buf) - len, " PHYERR");
+                seq_puts(file, " PHYERR");
         if (rxfilter & ATH9K_RX_FILTER_MYBEACON)
-                len += scnprintf(buf + len, sizeof(buf) - len, " MYBEACON");
+                seq_puts(file, " MYBEACON");
         if (rxfilter & ATH9K_RX_FILTER_COMP_BAR)
-                len += scnprintf(buf + len, sizeof(buf) - len, " COMP_BAR");
+                seq_puts(file, " COMP_BAR");
         if (rxfilter & ATH9K_RX_FILTER_PSPOLL)
-                len += scnprintf(buf + len, sizeof(buf) - len, " PSPOLL");
+                seq_puts(file, " PSPOLL");
         if (rxfilter & ATH9K_RX_FILTER_PHYRADAR)
-                len += scnprintf(buf + len, sizeof(buf) - len, " PHYRADAR");
+                seq_puts(file, " PHYRADAR");
         if (rxfilter & ATH9K_RX_FILTER_MCAST_BCAST_ALL)
-                len += scnprintf(buf + len, sizeof(buf) - len, " MCAST_BCAST_ALL");
+                seq_puts(file, " MCAST_BCAST_ALL");
         if (rxfilter & ATH9K_RX_FILTER_CONTROL_WRAPPER)
-                len += scnprintf(buf + len, sizeof(buf) - len, " CONTROL_WRAPPER");
+                seq_puts(file, " CONTROL_WRAPPER");
 
-        len += scnprintf(buf + len, sizeof(buf) - len, "\n");
+        seq_puts(file, "\n");
 
         reg = sc->sc_ah->imask;
 
-        len += scnprintf(buf + len, sizeof(buf) - len,
-                         "INTERRUPT-MASK: 0x%x", reg);
+        seq_printf(file, "INTERRUPT-MASK: 0x%x", reg);
 
         if (reg & ATH9K_INT_SWBA)
-                len += scnprintf(buf + len, sizeof(buf) - len, " SWBA");
+                seq_puts(file, " SWBA");
         if (reg & ATH9K_INT_BMISS)
-                len += scnprintf(buf + len, sizeof(buf) - len, " BMISS");
+                seq_puts(file, " BMISS");
         if (reg & ATH9K_INT_CST)
-                len += scnprintf(buf + len, sizeof(buf) - len, " CST");
+                seq_puts(file, " CST");
         if (reg & ATH9K_INT_RX)
-                len += scnprintf(buf + len, sizeof(buf) - len, " RX");
+                seq_puts(file, " RX");
         if (reg & ATH9K_INT_RXHP)
-                len += scnprintf(buf + len, sizeof(buf) - len, " RXHP");
+                seq_puts(file, " RXHP");
         if (reg & ATH9K_INT_RXLP)
-                len += scnprintf(buf + len, sizeof(buf) - len, " RXLP");
+                seq_puts(file, " RXLP");
         if (reg & ATH9K_INT_BB_WATCHDOG)
-                len += scnprintf(buf + len, sizeof(buf) - len, " BB_WATCHDOG");
+                seq_puts(file, " BB_WATCHDOG");
 
-        len += scnprintf(buf + len, sizeof(buf) - len, "\n");
+        seq_puts(file, "\n");
 
         i = 0;
         ath_for_each_chanctx(sc, ctx) {
@@ -832,27 +758,22 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
                         continue;
                 ath9k_calculate_iter_data(sc, ctx, &iter_data);
 
-                len += scnprintf(buf + len, sizeof(buf) - len,
-                        "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i",
-                        i++, (int)(ctx->assigned), iter_data.naps,
-                        iter_data.nstations,
-                        iter_data.nmeshes, iter_data.nwds);
-                len += scnprintf(buf + len, sizeof(buf) - len,
-                        " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",
-                        iter_data.nadhocs, sc->cur_chan->nvifs, sc->nbcnvifs);
+                seq_printf(file,
+                           "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i",
+                           i++, (int)(ctx->assigned), iter_data.naps,
+                           iter_data.nstations,
+                           iter_data.nmeshes, iter_data.nwds);
+                seq_printf(file, " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",
+                           iter_data.nadhocs, sc->cur_chan->nvifs,
+                           sc->nbcnvifs);
         }
 
-        if (len > sizeof(buf))
-                len = sizeof(buf);
-
-        retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        return retval;
+        return 0;
 }
 
-static ssize_t read_file_reset(struct file *file, char __user *user_buf,
-                               size_t count, loff_t *ppos)
+static int read_file_reset(struct seq_file *file, void *data)
 {
-        struct ath_softc *sc = file->private_data;
+        struct ath_softc *sc = file->private;
         static const char * const reset_cause[__RESET_TYPE_MAX] = {
                 [RESET_TYPE_BB_HANG] = "Baseband Hang",
                 [RESET_TYPE_BB_WATCHDOG] = "Baseband Watchdog",
@@ -866,23 +787,17 @@ static ssize_t read_file_reset(struct file *file, char __user *user_buf,
                 [RESET_TYPE_MCI] = "MCI Reset",
                 [RESET_TYPE_CALIBRATION] = "Calibration error",
         };
-        char buf[512];
-        unsigned int len = 0;
         int i;
 
         for (i = 0; i < ARRAY_SIZE(reset_cause); i++) {
                 if (!reset_cause[i])
                     continue;
 
-                len += scnprintf(buf + len, sizeof(buf) - len,
-                                 "%17s: %2d\n", reset_cause[i],
-                                 sc->debug.stats.reset[i]);
+                seq_printf(file, "%17s: %2d\n", reset_cause[i],
+                           sc->debug.stats.reset[i]);
         }
 
-        if (len > sizeof(buf))
-                len = sizeof(buf);
-
-        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        return 0;
 }
 
 void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
@@ -922,32 +837,56 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
                 TX_STAT_INC(qnum, delim_underrun);
 }
 
+static int open_file_xmit(struct inode *inode, struct file *f)
+{
+        return single_open(f, read_file_xmit, inode->i_private);
+}
+
 static const struct file_operations fops_xmit = {
-        .read = read_file_xmit,
-        .open = simple_open,
+        .read = seq_read,
+        .open = open_file_xmit,
         .owner = THIS_MODULE,
-        .llseek = default_llseek,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
+static int open_file_queues(struct inode *inode, struct file *f)
+{
+        return single_open(f, read_file_queues, inode->i_private);
+}
+
 static const struct file_operations fops_queues = {
-        .read = read_file_queues,
-        .open = simple_open,
+        .read = seq_read,
+        .open = open_file_queues,
         .owner = THIS_MODULE,
-        .llseek = default_llseek,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
+static int open_file_misc(struct inode *inode, struct file *f)
+{
+        return single_open(f, read_file_misc, inode->i_private);
+}
+
 static const struct file_operations fops_misc = {
-        .read = read_file_misc,
-        .open = simple_open,
+        .read = seq_read,
+        .open = open_file_misc,
         .owner = THIS_MODULE,
-        .llseek = default_llseek,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
+static int open_file_reset(struct inode *inode, struct file *f)
+{
+        return single_open(f, read_file_reset, inode->i_private);
+}
+
 static const struct file_operations fops_reset = {
-        .read = read_file_reset,
-        .open = simple_open,
+        .read = seq_read,
+        .open = open_file_reset,
         .owner = THIS_MODULE,
-        .llseek = default_llseek,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
 void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
@@ -956,7 +895,7 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 }
 
 static ssize_t read_file_regidx(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos)
+                                size_t count, loff_t *ppos)
 {
         struct ath_softc *sc = file->private_data;
         char buf[32];
@@ -967,7 +906,7 @@ static ssize_t read_file_regidx(struct file *file, char __user *user_buf,
 }
 
 static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,
-                             size_t count, loff_t *ppos)
+                                 size_t count, loff_t *ppos)
 {
         struct ath_softc *sc = file->private_data;
         unsigned long regidx;
@@ -995,7 +934,7 @@ static const struct file_operations fops_regidx = {
 };
 
 static ssize_t read_file_regval(struct file *file, char __user *user_buf,
-                             size_t count, loff_t *ppos)
+                                size_t count, loff_t *ppos)
 {
         struct ath_softc *sc = file->private_data;
         struct ath_hw *ah = sc->sc_ah;
@@ -1011,7 +950,7 @@ static ssize_t read_file_regval(struct file *file, char __user *user_buf,
 }
 
 static ssize_t write_file_regval(struct file *file, const char __user *user_buf,
-                             size_t count, loff_t *ppos)
+                                 size_t count, loff_t *ppos)
 {
         struct ath_softc *sc = file->private_data;
         struct ath_hw *ah = sc->sc_ah;
@@ -1077,57 +1016,45 @@ static const struct file_operations fops_regdump = {
         .llseek = default_llseek,/* read accesses f_pos */
 };
 
-static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf,
-                                    size_t count, loff_t *ppos)
+static int read_file_dump_nfcal(struct seq_file *file, void *data)
 {
-        struct ath_softc *sc = file->private_data;
+        struct ath_softc *sc = file->private;
         struct ath_hw *ah = sc->sc_ah;
         struct ath9k_nfcal_hist *h = sc->cur_chan->caldata.nfCalHist;
         struct ath_common *common = ath9k_hw_common(ah);
         struct ieee80211_conf *conf = &common->hw->conf;
-        u32 len = 0, size = 1500;
         u32 i, j;
-        ssize_t retval = 0;
-        char *buf;
         u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
         u8 nread;
 
-        buf = kzalloc(size, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        len += scnprintf(buf + len, size - len,
-                         "Channel Noise Floor : %d\n", ah->noise);
-        len += scnprintf(buf + len, size - len,
-                         "Chain | privNF | # Readings | NF Readings\n");
+        seq_printf(file, "Channel Noise Floor : %d\n", ah->noise);
+        seq_puts(file, "Chain | privNF | # Readings | NF Readings\n");
         for (i = 0; i < NUM_NF_READINGS; i++) {
                 if (!(chainmask & (1 << i)) ||
                     ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
                         continue;
 
                 nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount;
-                len += scnprintf(buf + len, size - len, " %d\t %d\t %d\t\t",
-                                 i, h[i].privNF, nread);
+                seq_printf(file, " %d\t %d\t %d\t\t", i, h[i].privNF, nread);
                 for (j = 0; j < nread; j++)
-                        len += scnprintf(buf + len, size - len,
-                                         " %d", h[i].nfCalBuffer[j]);
-                len += scnprintf(buf + len, size - len, "\n");
+                        seq_printf(file, " %d", h[i].nfCalBuffer[j]);
+                seq_puts(file, "\n");
         }
 
-        if (len > size)
-                len = size;
-
-        retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        kfree(buf);
+        return 0;
+}
 
-        return retval;
+static int open_file_dump_nfcal(struct inode *inode, struct file *f)
+{
+        return single_open(f, read_file_dump_nfcal, inode->i_private);
 }
 
 static const struct file_operations fops_dump_nfcal = {
-        .read = read_file_dump_nfcal,
-        .open = simple_open,
+        .read = seq_read,
+        .open = open_file_dump_nfcal,
         .owner = THIS_MODULE,
-        .llseek = default_llseek,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index bd75b1f716db..a8e9319958e6 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -196,12 +196,11 @@ struct ath_tx_stats {
 #define TXSTATS sc->debug.stats.txstats
 #define PR(str, elem)                                                   \
         do {                                                            \
-                len += scnprintf(buf + len, size - len,                 \
-                                 "%s%13u%11u%10u%10u\n", str,           \
-                                 TXSTATS[PR_QNUM(IEEE80211_AC_BE)].elem,\
-                                 TXSTATS[PR_QNUM(IEEE80211_AC_BK)].elem,\
-                                 TXSTATS[PR_QNUM(IEEE80211_AC_VI)].elem,\
-                                 TXSTATS[PR_QNUM(IEEE80211_AC_VO)].elem); \
+                seq_printf(file, "%s%13u%11u%10u%10u\n", str,           \
+                           TXSTATS[PR_QNUM(IEEE80211_AC_BE)].elem,\
+                           TXSTATS[PR_QNUM(IEEE80211_AC_BK)].elem,\
+                           TXSTATS[PR_QNUM(IEEE80211_AC_VI)].elem,\
+                           TXSTATS[PR_QNUM(IEEE80211_AC_VO)].elem); \
         } while(0)
 
 struct ath_rx_rate_stats {
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 267c35d1f699..7dd8873f757e 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1078,7 +1078,6 @@ static struct platform_driver wcn36xx_driver = {
         .remove     = wcn36xx_remove,
         .driver         = {
                 .name   = "wcn36xx",
-                .owner  = THIS_MODULE,
         },
         .id_table    = wcn36xx_platform_id_table,
 };
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index f754ffcd0308..3c06e9365949 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -1221,7 +1221,6 @@ static struct platform_driver brcmf_sdio_pd = {
         .remove         = brcmf_sdio_pd_remove,
         .driver         = {
                 .name   = BRCMFMAC_SDIO_PDATA_NAME,
-                .owner  = THIS_MODULE,
         }
 };
 
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index a71b9d5e353d..ef58a8862d91 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -395,7 +395,6 @@ static int hwsim_radio_idx;
 static struct platform_driver mac80211_hwsim_driver = {
         .driver = {
                 .name = "mac80211_hwsim",
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/drivers/net/wireless/rt2x00/rt2800soc.c b/drivers/net/wireless/rt2x00/rt2800soc.c
index f6d1bf5be006..aaa7aa4cad9d 100644
--- a/drivers/net/wireless/rt2x00/rt2800soc.c
+++ b/drivers/net/wireless/rt2x00/rt2800soc.c
@@ -244,7 +244,6 @@ static int rt2800soc_probe(struct platform_device *pdev)
 static struct platform_driver rt2800soc_driver = {
         .driver         = {
                 .name           = "rt2800_wmac",
-                .owner          = THIS_MODULE,
                 .mod_name       = KBUILD_MODNAME,
         },
         .probe          = rt2800soc_probe,
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index 0bccf123831e..d6d0d6d9c7a8 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -1900,7 +1900,6 @@ static struct platform_driver wl12xx_driver = {
         .id_table       = wl12xx_id_table,
         .driver = {
                 .name   = "wl12xx_driver",
-                .owner  = THIS_MODULE,
         }
 };
 
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 7af1936719eb..8e562610bf16 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -1968,7 +1968,6 @@ static struct platform_driver wl18xx_driver = {
         .id_table       = wl18xx_id_table,
         .driver = {
                 .name   = "wl18xx_driver",
-                .owner  = THIS_MODULE,
         }
 };