aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
commite6b5be2be4e30037eb551e0ed09dd97bd00d85d3 (patch)
tree88801365987a0dc64d62d47e8a11f3b44691c37f /drivers/net
parent37da7bbbe84fe9e8862940d3f9194fd27dce59bb (diff)
parentf1c488a78d9f1a22cdb15648c15e70fd82ed229a (diff)
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/at91_can.c1
-rw-r--r--drivers/net/can/bfin_can.c1
-rw-r--r--drivers/net/can/c_can/c_can_platform.c1
-rw-r--r--drivers/net/can/cc770/cc770_isa.c1
-rw-r--r--drivers/net/can/cc770/cc770_platform.c1
-rw-r--r--drivers/net/can/flexcan.c1
-rw-r--r--drivers/net/can/grcan.c1
-rw-r--r--drivers/net/can/janz-ican3.c1
-rw-r--r--drivers/net/can/mscan/mpc5xxx_can.c1
-rw-r--r--drivers/net/can/rcar_can.c1
-rw-r--r--drivers/net/can/sja1000/sja1000_isa.c1
-rw-r--r--drivers/net/can/sja1000/sja1000_platform.c1
-rw-r--r--drivers/net/can/softing/softing_main.c1
-rw-r--r--drivers/net/can/ti_hecc.c1
-rw-r--r--drivers/net/can/xilinx_can.c1
-rw-r--r--drivers/net/ethernet/8390/ax88796.c1
-rw-r--r--drivers/net/ethernet/8390/mcf8390.c1
-rw-r--r--drivers/net/ethernet/8390/ne.c1
-rw-r--r--drivers/net/ethernet/adi/bfin_mac.c2
-rw-r--r--drivers/net/ethernet/aeroflex/greth.c1
-rw-r--r--drivers/net/ethernet/altera/altera_tse_main.c1
-rw-r--r--drivers/net/ethernet/amd/au1000_eth.c1
-rw-r--r--drivers/net/ethernet/amd/sunlance.c1
-rw-r--r--drivers/net/ethernet/apple/macmace.c1
-rw-r--r--drivers/net/ethernet/broadcom/bcmsysport.c1
-rw-r--r--drivers/net/ethernet/broadcom/genet/bcmgenet.c1
-rw-r--r--drivers/net/ethernet/broadcom/sb1250-mac.c1
-rw-r--r--drivers/net/ethernet/cadence/at91_ether.c1
-rw-r--r--drivers/net/ethernet/cadence/macb.c1
-rw-r--r--drivers/net/ethernet/cirrus/cs89x0.c1
-rw-r--r--drivers/net/ethernet/cirrus/ep93xx_eth.c1
-rw-r--r--drivers/net/ethernet/davicom/dm9000.c1
-rw-r--r--drivers/net/ethernet/ethoc.c1
-rw-r--r--drivers/net/ethernet/faraday/ftgmac100.c1
-rw-r--r--drivers/net/ethernet/faraday/ftmac100.c1
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c1
-rw-r--r--drivers/net/ethernet/freescale/fec_mpc52xx.c1
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c1
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c1
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mii-fec.c1
-rw-r--r--drivers/net/ethernet/freescale/fsl_pq_mdio.c1
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c1
-rw-r--r--drivers/net/ethernet/freescale/gianfar_ptp.c1
-rw-r--r--drivers/net/ethernet/freescale/ucc_geth.c1
-rw-r--r--drivers/net/ethernet/i825xx/sni_82596.c1
-rw-r--r--drivers/net/ethernet/ibm/emac/core.c1
-rw-r--r--drivers/net/ethernet/ibm/emac/mal.c1
-rw-r--r--drivers/net/ethernet/ibm/emac/rgmii.c1
-rw-r--r--drivers/net/ethernet/ibm/emac/tah.c1
-rw-r--r--drivers/net/ethernet/ibm/emac/zmii.c1
-rw-r--r--drivers/net/ethernet/lantiq_etop.c1
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c2
-rw-r--r--drivers/net/ethernet/micrel/ks8695net.c1
-rw-r--r--drivers/net/ethernet/micrel/ks8842.c1
-rw-r--r--drivers/net/ethernet/micrel/ks8851_mll.c1
-rw-r--r--drivers/net/ethernet/moxa/moxart_ether.c1
-rw-r--r--drivers/net/ethernet/natsemi/jazzsonic.c1
-rw-r--r--drivers/net/ethernet/natsemi/macsonic.c1
-rw-r--r--drivers/net/ethernet/netx-eth.c1
-rw-r--r--drivers/net/ethernet/nuvoton/w90p910_ether.c1
-rw-r--r--drivers/net/ethernet/octeon/octeon_mgmt.c1
-rw-r--r--drivers/net/ethernet/s6gmac.c1
-rw-r--r--drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c1
-rw-r--r--drivers/net/ethernet/seeq/sgiseeq.c1
-rw-r--r--drivers/net/ethernet/sgi/meth.c1
-rw-r--r--drivers/net/ethernet/smsc/smc911x.c1
-rw-r--r--drivers/net/ethernet/smsc/smc91x.c1
-rw-r--r--drivers/net/ethernet/smsc/smsc911x.c1
-rw-r--r--drivers/net/ethernet/sun/niu.c1
-rw-r--r--drivers/net/ethernet/sun/sunbmac.c1
-rw-r--r--drivers/net/ethernet/sun/sunhme.c1
-rw-r--r--drivers/net/ethernet/sun/sunqe.c1
-rw-r--r--drivers/net/ethernet/tundra/tsi108_eth.c1
-rw-r--r--drivers/net/ethernet/via/via-rhine.c1
-rw-r--r--drivers/net/ethernet/via/via-velocity.c1
-rw-r--r--drivers/net/ethernet/wiznet/w5100.c1
-rw-r--r--drivers/net/ethernet/wiznet/w5300.c1
-rw-r--r--drivers/net/ieee802154/fakelb.c1
-rw-r--r--drivers/net/irda/ali-ircc.c1
-rw-r--r--drivers/net/irda/au1k_ir.c1
-rw-r--r--drivers/net/irda/pxaficp_ir.c1
-rw-r--r--drivers/net/irda/sa1100_ir.c1
-rw-r--r--drivers/net/phy/mdio-bcm-unimac.c1
-rw-r--r--drivers/net/phy/mdio-gpio.c1
-rw-r--r--drivers/net/phy/mdio-mux-gpio.c1
-rw-r--r--drivers/net/phy/mdio-mux-mmioreg.c1
-rw-r--r--drivers/net/phy/mdio-octeon.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/ahb.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/debug.c415
-rw-r--r--drivers/net/wireless/ath/ath9k/debug.h11
-rw-r--r--drivers/net/wireless/ath/wcn36xx/main.c1
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c1
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c1
-rw-r--r--drivers/net/wireless/rt2x00/rt2800soc.c1
-rw-r--r--drivers/net/wireless/ti/wl12xx/main.c1
-rw-r--r--drivers/net/wireless/ti/wl18xx/main.c1
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 = {
1428 .remove = at91_can_remove, 1428 .remove = at91_can_remove,
1429 .driver = { 1429 .driver = {
1430 .name = KBUILD_MODNAME, 1430 .name = KBUILD_MODNAME,
1431 .owner = THIS_MODULE,
1432 .of_match_table = of_match_ptr(at91_can_dt_ids), 1431 .of_match_table = of_match_ptr(at91_can_dt_ids),
1433 }, 1432 },
1434 .id_table = at91_can_id_table, 1433 .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 = {
680 .resume = bfin_can_resume, 680 .resume = bfin_can_resume,
681 .driver = { 681 .driver = {
682 .name = DRV_NAME, 682 .name = DRV_NAME,
683 .owner = THIS_MODULE,
684 }, 683 },
685}; 684};
686 685
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)
471static struct platform_driver c_can_plat_driver = { 471static struct platform_driver c_can_plat_driver = {
472 .driver = { 472 .driver = {
473 .name = KBUILD_MODNAME, 473 .name = KBUILD_MODNAME,
474 .owner = THIS_MODULE,
475 .of_match_table = c_can_of_table, 474 .of_match_table = c_can_of_table,
476 }, 475 },
477 .probe = c_can_plat_probe, 476 .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 = {
318 .remove = cc770_isa_remove, 318 .remove = cc770_isa_remove,
319 .driver = { 319 .driver = {
320 .name = KBUILD_MODNAME, 320 .name = KBUILD_MODNAME,
321 .owner = THIS_MODULE,
322 }, 321 },
323}; 322};
324 323
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);
264static struct platform_driver cc770_platform_driver = { 264static struct platform_driver cc770_platform_driver = {
265 .driver = { 265 .driver = {
266 .name = DRV_NAME, 266 .name = DRV_NAME,
267 .owner = THIS_MODULE,
268 .of_match_table = cc770_platform_table, 267 .of_match_table = cc770_platform_table,
269 }, 268 },
270 .probe = cc770_platform_probe, 269 .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);
1302static struct platform_driver flexcan_driver = { 1302static struct platform_driver flexcan_driver = {
1303 .driver = { 1303 .driver = {
1304 .name = DRV_NAME, 1304 .name = DRV_NAME,
1305 .owner = THIS_MODULE,
1306 .pm = &flexcan_pm_ops, 1305 .pm = &flexcan_pm_ops,
1307 .of_match_table = flexcan_of_match, 1306 .of_match_table = flexcan_of_match,
1308 }, 1307 },
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);
1738static struct platform_driver grcan_driver = { 1738static struct platform_driver grcan_driver = {
1739 .driver = { 1739 .driver = {
1740 .name = DRV_NAME, 1740 .name = DRV_NAME,
1741 .owner = THIS_MODULE,
1742 .of_match_table = grcan_match, 1741 .of_match_table = grcan_match,
1743 }, 1742 },
1744 .probe = grcan_probe, 1743 .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)
1910static struct platform_driver ican3_driver = { 1910static struct platform_driver ican3_driver = {
1911 .driver = { 1911 .driver = {
1912 .name = DRV_NAME, 1912 .name = DRV_NAME,
1913 .owner = THIS_MODULE,
1914 }, 1913 },
1915 .probe = ican3_probe, 1914 .probe = ican3_probe,
1916 .remove = ican3_remove, 1915 .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);
441static struct platform_driver mpc5xxx_can_driver = { 441static struct platform_driver mpc5xxx_can_driver = {
442 .driver = { 442 .driver = {
443 .name = "mpc5xxx_can", 443 .name = "mpc5xxx_can",
444 .owner = THIS_MODULE,
445 .of_match_table = mpc5xxx_can_table, 444 .of_match_table = mpc5xxx_can_table,
446 }, 445 },
447 .probe = mpc5xxx_can_probe, 446 .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);
907static struct platform_driver rcar_can_driver = { 907static struct platform_driver rcar_can_driver = {
908 .driver = { 908 .driver = {
909 .name = RCAR_CAN_DRV_NAME, 909 .name = RCAR_CAN_DRV_NAME,
910 .owner = THIS_MODULE,
911 .of_match_table = of_match_ptr(rcar_can_of_table), 910 .of_match_table = of_match_ptr(rcar_can_of_table),
912 .pm = &rcar_can_pm_ops, 911 .pm = &rcar_can_pm_ops,
913 }, 912 },
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 = {
259 .remove = sja1000_isa_remove, 259 .remove = sja1000_isa_remove,
260 .driver = { 260 .driver = {
261 .name = DRV_NAME, 261 .name = DRV_NAME,
262 .owner = THIS_MODULE,
263 }, 262 },
264}; 263};
265 264
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 = {
253 .remove = sp_remove, 253 .remove = sp_remove,
254 .driver = { 254 .driver = {
255 .name = DRV_NAME, 255 .name = DRV_NAME,
256 .owner = THIS_MODULE,
257 .of_match_table = sp_of_table, 256 .of_match_table = sp_of_table,
258 }, 257 },
259}; 258};
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:
856static struct platform_driver softing_driver = { 856static struct platform_driver softing_driver = {
857 .driver = { 857 .driver = {
858 .name = "softing", 858 .name = "softing",
859 .owner = THIS_MODULE,
860 }, 859 },
861 .probe = softing_pdev_probe, 860 .probe = softing_pdev_probe,
862 .remove = softing_pdev_remove, 861 .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)
1039static struct platform_driver ti_hecc_driver = { 1039static struct platform_driver ti_hecc_driver = {
1040 .driver = { 1040 .driver = {
1041 .name = DRV_NAME, 1041 .name = DRV_NAME,
1042 .owner = THIS_MODULE,
1043 }, 1042 },
1044 .probe = ti_hecc_probe, 1043 .probe = ti_hecc_probe,
1045 .remove = ti_hecc_remove, 1044 .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 = {
1196 .probe = xcan_probe, 1196 .probe = xcan_probe,
1197 .remove = xcan_remove, 1197 .remove = xcan_remove,
1198 .driver = { 1198 .driver = {
1199 .owner = THIS_MODULE,
1200 .name = DRIVER_NAME, 1199 .name = DRIVER_NAME,
1201 .pm = &xcan_dev_pm_ops, 1200 .pm = &xcan_dev_pm_ops,
1202 .of_match_table = xcan_of_match, 1201 .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)
1000static struct platform_driver axdrv = { 1000static struct platform_driver axdrv = {
1001 .driver = { 1001 .driver = {
1002 .name = "ax88796", 1002 .name = "ax88796",
1003 .owner = THIS_MODULE,
1004 }, 1003 },
1005 .probe = ax_probe, 1004 .probe = ax_probe,
1006 .remove = ax_remove, 1005 .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)
467static struct platform_driver mcf8390_drv = { 467static struct platform_driver mcf8390_drv = {
468 .driver = { 468 .driver = {
469 .name = "mcf8390", 469 .name = "mcf8390",
470 .owner = THIS_MODULE,
471 }, 470 },
472 .probe = mcf8390_probe, 471 .probe = mcf8390_probe,
473 .remove = mcf8390_remove, 472 .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 = {
920 .resume = ne_drv_resume, 920 .resume = ne_drv_resume,
921 .driver = { 921 .driver = {
922 .name = DRV_NAME, 922 .name = DRV_NAME,
923 .owner = THIS_MODULE,
924 }, 923 },
925}; 924};
926 925
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 = {
1901 .remove = bfin_mii_bus_remove, 1901 .remove = bfin_mii_bus_remove,
1902 .driver = { 1902 .driver = {
1903 .name = "bfin_mii_bus", 1903 .name = "bfin_mii_bus",
1904 .owner = THIS_MODULE,
1905 }, 1904 },
1906}; 1905};
1907 1906
@@ -1912,7 +1911,6 @@ static struct platform_driver bfin_mac_driver = {
1912 .suspend = bfin_mac_suspend, 1911 .suspend = bfin_mac_suspend,
1913 .driver = { 1912 .driver = {
1914 .name = KBUILD_MODNAME, 1913 .name = KBUILD_MODNAME,
1915 .owner = THIS_MODULE,
1916 }, 1914 },
1917}; 1915};
1918 1916
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);
1603static struct platform_driver greth_of_driver = { 1603static struct platform_driver greth_of_driver = {
1604 .driver = { 1604 .driver = {
1605 .name = "grlib-greth", 1605 .name = "grlib-greth",
1606 .owner = THIS_MODULE,
1607 .of_match_table = greth_of_match, 1606 .of_match_table = greth_of_match,
1608 }, 1607 },
1609 .probe = greth_of_probe, 1608 .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 = {
1587 .resume = NULL, 1587 .resume = NULL,
1588 .driver = { 1588 .driver = {
1589 .name = ALTERA_TSE_RESOURCE_NAME, 1589 .name = ALTERA_TSE_RESOURCE_NAME,
1590 .owner = THIS_MODULE,
1591 .of_match_table = altera_tse_ids, 1590 .of_match_table = altera_tse_ids,
1592 }, 1591 },
1593}; 1592};
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 = {
1461 .remove = au1000_remove, 1461 .remove = au1000_remove,
1462 .driver = { 1462 .driver = {
1463 .name = "au1000-eth", 1463 .name = "au1000-eth",
1464 .owner = THIS_MODULE,
1465 }, 1464 },
1466}; 1465};
1467 1466
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);
1524static struct platform_driver sunlance_sbus_driver = { 1524static struct platform_driver sunlance_sbus_driver = {
1525 .driver = { 1525 .driver = {
1526 .name = "sunlance", 1526 .name = "sunlance",
1527 .owner = THIS_MODULE,
1528 .of_match_table = sunlance_sbus_match, 1527 .of_match_table = sunlance_sbus_match,
1529 }, 1528 },
1530 .probe = sunlance_sbus_probe, 1529 .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 = {
768 .remove = mac_mace_device_remove, 768 .remove = mac_mace_device_remove,
769 .driver = { 769 .driver = {
770 .name = mac_mace_string, 770 .name = mac_mace_string,
771 .owner = THIS_MODULE,
772 }, 771 },
773}; 772};
774 773
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 = {
1994 .remove = bcm_sysport_remove, 1994 .remove = bcm_sysport_remove,
1995 .driver = { 1995 .driver = {
1996 .name = "brcm-systemport", 1996 .name = "brcm-systemport",
1997 .owner = THIS_MODULE,
1998 .of_match_table = bcm_sysport_of_match, 1997 .of_match_table = bcm_sysport_of_match,
1999 .pm = &bcm_sysport_pm_ops, 1998 .pm = &bcm_sysport_pm_ops,
2000 }, 1999 },
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 = {
2889 .remove = bcmgenet_remove, 2889 .remove = bcmgenet_remove,
2890 .driver = { 2890 .driver = {
2891 .name = "bcmgenet", 2891 .name = "bcmgenet",
2892 .owner = THIS_MODULE,
2893 .of_match_table = bcmgenet_match, 2892 .of_match_table = bcmgenet_match,
2894 .pm = &bcmgenet_pm_ops, 2893 .pm = &bcmgenet_pm_ops,
2895 }, 2894 },
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 = {
2664 .remove = __exit_p(sbmac_remove), 2664 .remove = __exit_p(sbmac_remove),
2665 .driver = { 2665 .driver = {
2666 .name = sbmac_string, 2666 .name = sbmac_string,
2667 .owner = THIS_MODULE,
2668 }, 2667 },
2669}; 2668};
2670 2669
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 = {
469 .resume = at91ether_resume, 469 .resume = at91ether_resume,
470 .driver = { 470 .driver = {
471 .name = "at91_ether", 471 .name = "at91_ether",
472 .owner = THIS_MODULE,
473 .of_match_table = of_match_ptr(at91ether_dt_ids), 472 .of_match_table = of_match_ptr(at91ether_dt_ids),
474 }, 473 },
475}; 474};
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 = {
2459 .remove = __exit_p(macb_remove), 2459 .remove = __exit_p(macb_remove),
2460 .driver = { 2460 .driver = {
2461 .name = "macb", 2461 .name = "macb",
2462 .owner = THIS_MODULE,
2463 .of_match_table = of_match_ptr(macb_dt_ids), 2462 .of_match_table = of_match_ptr(macb_dt_ids),
2464 .pm = &macb_pm_ops, 2463 .pm = &macb_pm_ops,
2465 }, 2464 },
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)
1897static struct platform_driver cs89x0_driver = { 1897static struct platform_driver cs89x0_driver = {
1898 .driver = { 1898 .driver = {
1899 .name = DRV_NAME, 1899 .name = DRV_NAME,
1900 .owner = THIS_MODULE,
1901 }, 1900 },
1902 .remove = cs89x0_platform_remove, 1901 .remove = cs89x0_platform_remove,
1903}; 1902};
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 = {
881 .remove = ep93xx_eth_remove, 881 .remove = ep93xx_eth_remove,
882 .driver = { 882 .driver = {
883 .name = "ep93xx-eth", 883 .name = "ep93xx-eth",
884 .owner = THIS_MODULE,
885 }, 884 },
886}; 885};
887 886
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);
1749static struct platform_driver dm9000_driver = { 1749static struct platform_driver dm9000_driver = {
1750 .driver = { 1750 .driver = {
1751 .name = "dm9000", 1751 .name = "dm9000",
1752 .owner = THIS_MODULE,
1753 .pm = &dm9000_drv_pm_ops, 1752 .pm = &dm9000_drv_pm_ops,
1754 .of_match_table = of_match_ptr(dm9000_of_matches), 1753 .of_match_table = of_match_ptr(dm9000_of_matches),
1755 }, 1754 },
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 = {
1312 .resume = ethoc_resume, 1312 .resume = ethoc_resume,
1313 .driver = { 1313 .driver = {
1314 .name = "ethoc", 1314 .name = "ethoc",
1315 .owner = THIS_MODULE,
1316 .of_match_table = ethoc_match, 1315 .of_match_table = ethoc_match,
1317 }, 1316 },
1318}; 1317};
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 = {
1335 .remove = __exit_p(ftgmac100_remove), 1335 .remove = __exit_p(ftgmac100_remove),
1336 .driver = { 1336 .driver = {
1337 .name = DRV_NAME, 1337 .name = DRV_NAME,
1338 .owner = THIS_MODULE,
1339 }, 1338 },
1340}; 1339};
1341 1340
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 = {
1177 .remove = __exit_p(ftmac100_remove), 1177 .remove = __exit_p(ftmac100_remove),
1178 .driver = { 1178 .driver = {
1179 .name = DRV_NAME, 1179 .name = DRV_NAME,
1180 .owner = THIS_MODULE,
1181 }, 1180 },
1182}; 1181};
1183 1182
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);
3386static struct platform_driver fec_driver = { 3386static struct platform_driver fec_driver = {
3387 .driver = { 3387 .driver = {
3388 .name = DRIVER_NAME, 3388 .name = DRIVER_NAME,
3389 .owner = THIS_MODULE,
3390 .pm = &fec_pm_ops, 3389 .pm = &fec_pm_ops,
3391 .of_match_table = fec_dt_ids, 3390 .of_match_table = fec_dt_ids,
3392 }, 3391 },
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);
1069static struct platform_driver mpc52xx_fec_driver = { 1069static struct platform_driver mpc52xx_fec_driver = {
1070 .driver = { 1070 .driver = {
1071 .name = DRIVER_NAME, 1071 .name = DRIVER_NAME,
1072 .owner = THIS_MODULE,
1073 .of_match_table = mpc52xx_fec_match, 1072 .of_match_table = mpc52xx_fec_match,
1074 }, 1073 },
1075 .probe = mpc52xx_fec_probe, 1074 .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);
1087 1087
1088static struct platform_driver fs_enet_driver = { 1088static struct platform_driver fs_enet_driver = {
1089 .driver = { 1089 .driver = {
1090 .owner = THIS_MODULE,
1091 .name = "fs_enet", 1090 .name = "fs_enet",
1092 .of_match_table = fs_enet_match, 1091 .of_match_table = fs_enet_match,
1093 }, 1092 },
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);
224static struct platform_driver fs_enet_bb_mdio_driver = { 224static struct platform_driver fs_enet_bb_mdio_driver = {
225 .driver = { 225 .driver = {
226 .name = "fsl-bb-mdio", 226 .name = "fsl-bb-mdio",
227 .owner = THIS_MODULE,
228 .of_match_table = fs_enet_mdio_bb_match, 227 .of_match_table = fs_enet_mdio_bb_match,
229 }, 228 },
230 .probe = fs_enet_mdio_probe, 229 .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);
225static struct platform_driver fs_enet_fec_mdio_driver = { 225static struct platform_driver fs_enet_fec_mdio_driver = {
226 .driver = { 226 .driver = {
227 .name = "fsl-fec-mdio", 227 .name = "fsl-fec-mdio",
228 .owner = THIS_MODULE,
229 .of_match_table = fs_enet_mdio_fec_match, 228 .of_match_table = fs_enet_mdio_fec_match,
230 }, 229 },
231 .probe = fs_enet_mdio_probe, 230 .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)
488static struct platform_driver fsl_pq_mdio_driver = { 488static struct platform_driver fsl_pq_mdio_driver = {
489 .driver = { 489 .driver = {
490 .name = "fsl-pq_mdio", 490 .name = "fsl-pq_mdio",
491 .owner = THIS_MODULE,
492 .of_match_table = fsl_pq_mdio_match, 491 .of_match_table = fsl_pq_mdio_match,
493 }, 492 },
494 .probe = fsl_pq_mdio_probe, 493 .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);
3561static struct platform_driver gfar_driver = { 3561static struct platform_driver gfar_driver = {
3562 .driver = { 3562 .driver = {
3563 .name = "fsl-gianfar", 3563 .name = "fsl-gianfar",
3564 .owner = THIS_MODULE,
3565 .pm = GFAR_PM_OPS, 3564 .pm = GFAR_PM_OPS,
3566 .of_match_table = gfar_match, 3565 .of_match_table = gfar_match,
3567 }, 3566 },
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 = {
563 .driver = { 563 .driver = {
564 .name = "gianfar_ptp", 564 .name = "gianfar_ptp",
565 .of_match_table = match_table, 565 .of_match_table = match_table,
566 .owner = THIS_MODULE,
567 }, 566 },
568 .probe = gianfar_ptp_probe, 567 .probe = gianfar_ptp_probe,
569 .remove = gianfar_ptp_remove, 568 .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);
3943static struct platform_driver ucc_geth_driver = { 3943static struct platform_driver ucc_geth_driver = {
3944 .driver = { 3944 .driver = {
3945 .name = DRV_NAME, 3945 .name = DRV_NAME,
3946 .owner = THIS_MODULE,
3947 .of_match_table = ucc_geth_match, 3946 .of_match_table = ucc_geth_match,
3948 }, 3947 },
3949 .probe = ucc_geth_probe, 3948 .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 = {
165 .remove = sni_82596_driver_remove, 165 .remove = sni_82596_driver_remove,
166 .driver = { 166 .driver = {
167 .name = sni_82596_string, 167 .name = sni_82596_string,
168 .owner = THIS_MODULE,
169 }, 168 },
170}; 169};
171 170
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);
3002static struct platform_driver emac_driver = { 3002static struct platform_driver emac_driver = {
3003 .driver = { 3003 .driver = {
3004 .name = "emac", 3004 .name = "emac",
3005 .owner = THIS_MODULE,
3006 .of_match_table = emac_match, 3005 .of_match_table = emac_match,
3007 }, 3006 },
3008 .probe = emac_probe, 3007 .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[] =
776static struct platform_driver mal_of_driver = { 776static struct platform_driver mal_of_driver = {
777 .driver = { 777 .driver = {
778 .name = "mcmal", 778 .name = "mcmal",
779 .owner = THIS_MODULE,
780 .of_match_table = mal_platform_match, 779 .of_match_table = mal_platform_match,
781 }, 780 },
782 .probe = mal_probe, 781 .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[] =
319static struct platform_driver rgmii_driver = { 319static struct platform_driver rgmii_driver = {
320 .driver = { 320 .driver = {
321 .name = "emac-rgmii", 321 .name = "emac-rgmii",
322 .owner = THIS_MODULE,
323 .of_match_table = rgmii_match, 322 .of_match_table = rgmii_match,
324 }, 323 },
325 .probe = rgmii_probe, 324 .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[] =
163static struct platform_driver tah_driver = { 163static struct platform_driver tah_driver = {
164 .driver = { 164 .driver = {
165 .name = "emac-tah", 165 .name = "emac-tah",
166 .owner = THIS_MODULE,
167 .of_match_table = tah_match, 166 .of_match_table = tah_match,
168 }, 167 },
169 .probe = tah_probe, 168 .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[] =
310static struct platform_driver zmii_driver = { 310static struct platform_driver zmii_driver = {
311 .driver = { 311 .driver = {
312 .name = "emac-zmii", 312 .name = "emac-zmii",
313 .owner = THIS_MODULE,
314 .of_match_table = zmii_match, 313 .of_match_table = zmii_match,
315 }, 314 },
316 .probe = zmii_probe, 315 .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 = {
789 .remove = ltq_etop_remove, 789 .remove = ltq_etop_remove,
790 .driver = { 790 .driver = {
791 .name = "ltq_etop", 791 .name = "ltq_etop",
792 .owner = THIS_MODULE,
793 }, 792 },
794}; 793};
795 794
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 = {
2839 .remove = mv643xx_eth_shared_remove, 2839 .remove = mv643xx_eth_shared_remove,
2840 .driver = { 2840 .driver = {
2841 .name = MV643XX_ETH_SHARED_NAME, 2841 .name = MV643XX_ETH_SHARED_NAME,
2842 .owner = THIS_MODULE,
2843 .of_match_table = of_match_ptr(mv643xx_eth_shared_ids), 2842 .of_match_table = of_match_ptr(mv643xx_eth_shared_ids),
2844 }, 2843 },
2845}; 2844};
@@ -3188,7 +3187,6 @@ static struct platform_driver mv643xx_eth_driver = {
3188 .shutdown = mv643xx_eth_shutdown, 3187 .shutdown = mv643xx_eth_shutdown,
3189 .driver = { 3188 .driver = {
3190 .name = MV643XX_ETH_NAME, 3189 .name = MV643XX_ETH_NAME,
3191 .owner = THIS_MODULE,
3192 }, 3190 },
3193}; 3191};
3194 3192
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)
1612static struct platform_driver ks8695_driver = { 1612static struct platform_driver ks8695_driver = {
1613 .driver = { 1613 .driver = {
1614 .name = MODULENAME, 1614 .name = MODULENAME,
1615 .owner = THIS_MODULE,
1616 }, 1615 },
1617 .probe = ks8695_probe, 1616 .probe = ks8695_probe,
1618 .remove = ks8695_drv_remove, 1617 .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)
1255static struct platform_driver ks8842_platform_driver = { 1255static struct platform_driver ks8842_platform_driver = {
1256 .driver = { 1256 .driver = {
1257 .name = DRV_NAME, 1257 .name = DRV_NAME,
1258 .owner = THIS_MODULE,
1259 }, 1258 },
1260 .probe = ks8842_probe, 1259 .probe = ks8842_probe,
1261 .remove = ks8842_remove, 1260 .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)
1679static struct platform_driver ks8851_platform_driver = { 1679static struct platform_driver ks8851_platform_driver = {
1680 .driver = { 1680 .driver = {
1681 .name = DRV_NAME, 1681 .name = DRV_NAME,
1682 .owner = THIS_MODULE,
1683 .of_match_table = of_match_ptr(ks8851_ml_dt_ids), 1682 .of_match_table = of_match_ptr(ks8851_ml_dt_ids),
1684 }, 1683 },
1685 .probe = ks8851_probe, 1684 .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 = {
559 .remove = moxart_remove, 559 .remove = moxart_remove,
560 .driver = { 560 .driver = {
561 .name = "moxart-ethernet", 561 .name = "moxart-ethernet",
562 .owner = THIS_MODULE,
563 .of_match_table = moxart_mac_match, 562 .of_match_table = moxart_mac_match,
564 }, 563 },
565}; 564};
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 = {
287 .remove = jazz_sonic_device_remove, 287 .remove = jazz_sonic_device_remove,
288 .driver = { 288 .driver = {
289 .name = jazz_sonic_string, 289 .name = jazz_sonic_string,
290 .owner = THIS_MODULE,
291 }, 290 },
292}; 291};
293 292
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 = {
630 .remove = mac_sonic_device_remove, 630 .remove = mac_sonic_device_remove,
631 .driver = { 631 .driver = {
632 .name = mac_sonic_string, 632 .name = mac_sonic_string,
633 .owner = THIS_MODULE,
634 }, 633 },
635}; 634};
636 635
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 = {
457 .resume = netx_eth_drv_resume, 457 .resume = netx_eth_drv_resume,
458 .driver = { 458 .driver = {
459 .name = CARDNAME, 459 .name = CARDNAME,
460 .owner = THIS_MODULE,
461 }, 460 },
462}; 461};
463 462
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 = {
1081 .remove = w90p910_ether_remove, 1081 .remove = w90p910_ether_remove,
1082 .driver = { 1082 .driver = {
1083 .name = "nuc900-emc", 1083 .name = "nuc900-emc",
1084 .owner = THIS_MODULE,
1085 }, 1084 },
1086}; 1085};
1087 1086
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);
1568static struct platform_driver octeon_mgmt_driver = { 1568static struct platform_driver octeon_mgmt_driver = {
1569 .driver = { 1569 .driver = {
1570 .name = "octeon_mgmt", 1570 .name = "octeon_mgmt",
1571 .owner = THIS_MODULE,
1572 .of_match_table = octeon_mgmt_match, 1571 .of_match_table = octeon_mgmt_match,
1573 }, 1572 },
1574 .probe = octeon_mgmt_probe, 1573 .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 = {
1048 .remove = s6gmac_remove, 1048 .remove = s6gmac_remove,
1049 .driver = { 1049 .driver = {
1050 .name = "s6gmac", 1050 .name = "s6gmac",
1051 .owner = THIS_MODULE,
1052 }, 1051 },
1053}; 1052};
1054 1053
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 = {
233 .remove = sxgbe_platform_remove, 233 .remove = sxgbe_platform_remove,
234 .driver = { 234 .driver = {
235 .name = SXGBE_RESOURCE_NAME, 235 .name = SXGBE_RESOURCE_NAME,
236 .owner = THIS_MODULE,
237 .pm = &sxgbe_platform_pm_ops, 236 .pm = &sxgbe_platform_pm_ops,
238 .of_match_table = of_match_ptr(sxgbe_dt_ids), 237 .of_match_table = of_match_ptr(sxgbe_dt_ids),
239 }, 238 },
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 = {
826 .remove = __exit_p(sgiseeq_remove), 826 .remove = __exit_p(sgiseeq_remove),
827 .driver = { 827 .driver = {
828 .name = "sgiseeq", 828 .name = "sgiseeq",
829 .owner = THIS_MODULE,
830 } 829 }
831}; 830};
832 831
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 = {
870 .remove = __exit_p(meth_remove), 870 .remove = __exit_p(meth_remove),
871 .driver = { 871 .driver = {
872 .name = "meth", 872 .name = "meth",
873 .owner = THIS_MODULE,
874 } 873 }
875}; 874};
876 875
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 = {
2173 .resume = smc911x_drv_resume, 2173 .resume = smc911x_drv_resume,
2174 .driver = { 2174 .driver = {
2175 .name = CARDNAME, 2175 .name = CARDNAME,
2176 .owner = THIS_MODULE,
2177 }, 2176 },
2178}; 2177};
2179 2178
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 = {
2472 .remove = smc_drv_remove, 2472 .remove = smc_drv_remove,
2473 .driver = { 2473 .driver = {
2474 .name = CARDNAME, 2474 .name = CARDNAME,
2475 .owner = THIS_MODULE,
2476 .pm = &smc_drv_pm_ops, 2475 .pm = &smc_drv_pm_ops,
2477 .of_match_table = of_match_ptr(smc91x_match), 2476 .of_match_table = of_match_ptr(smc91x_match),
2478 }, 2477 },
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 = {
2659 .remove = smsc911x_drv_remove, 2659 .remove = smsc911x_drv_remove,
2660 .driver = { 2660 .driver = {
2661 .name = SMSC_CHIPNAME, 2661 .name = SMSC_CHIPNAME,
2662 .owner = THIS_MODULE,
2663 .pm = SMSC911X_PM_OPS, 2662 .pm = SMSC911X_PM_OPS,
2664 .of_match_table = of_match_ptr(smsc911x_dt_ids), 2663 .of_match_table = of_match_ptr(smsc911x_dt_ids),
2665 }, 2664 },
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);
10180static struct platform_driver niu_of_driver = { 10180static struct platform_driver niu_of_driver = {
10181 .driver = { 10181 .driver = {
10182 .name = "niu", 10182 .name = "niu",
10183 .owner = THIS_MODULE,
10184 .of_match_table = niu_match, 10183 .of_match_table = niu_match,
10185 }, 10184 },
10186 .probe = niu_of_probe, 10185 .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);
1273static struct platform_driver bigmac_sbus_driver = { 1273static struct platform_driver bigmac_sbus_driver = {
1274 .driver = { 1274 .driver = {
1275 .name = "sunbmac", 1275 .name = "sunbmac",
1276 .owner = THIS_MODULE,
1277 .of_match_table = bigmac_sbus_match, 1276 .of_match_table = bigmac_sbus_match,
1278 }, 1277 },
1279 .probe = bigmac_sbus_probe, 1278 .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);
3323static struct platform_driver hme_sbus_driver = { 3323static struct platform_driver hme_sbus_driver = {
3324 .driver = { 3324 .driver = {
3325 .name = "hme", 3325 .name = "hme",
3326 .owner = THIS_MODULE,
3327 .of_match_table = hme_sbus_match, 3326 .of_match_table = hme_sbus_match,
3328 }, 3327 },
3329 .probe = hme_sbus_probe, 3328 .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);
963static struct platform_driver qec_sbus_driver = { 963static struct platform_driver qec_sbus_driver = {
964 .driver = { 964 .driver = {
965 .name = "qec", 965 .name = "qec",
966 .owner = THIS_MODULE,
967 .of_match_table = qec_sbus_match, 966 .of_match_table = qec_sbus_match,
968 }, 967 },
969 .probe = qec_sbus_probe, 968 .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 = {
161 .remove = tsi108_ether_remove, 161 .remove = tsi108_ether_remove,
162 .driver = { 162 .driver = {
163 .name = "tsi-ethernet", 163 .name = "tsi-ethernet",
164 .owner = THIS_MODULE,
165 }, 164 },
166}; 165};
167 166
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 = {
2508 .remove = rhine_remove_one_platform, 2508 .remove = rhine_remove_one_platform,
2509 .driver = { 2509 .driver = {
2510 .name = DRV_NAME, 2510 .name = DRV_NAME,
2511 .owner = THIS_MODULE,
2512 .of_match_table = rhine_of_tbl, 2511 .of_match_table = rhine_of_tbl,
2513 .pm = RHINE_PM_OPS, 2512 .pm = RHINE_PM_OPS,
2514 } 2513 }
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 = {
3281 .remove = velocity_platform_remove, 3281 .remove = velocity_platform_remove,
3282 .driver = { 3282 .driver = {
3283 .name = "via-velocity", 3283 .name = "via-velocity",
3284 .owner = THIS_MODULE,
3285 .of_match_table = velocity_of_ids, 3284 .of_match_table = velocity_of_ids,
3286 .pm = &velocity_pm_ops, 3285 .pm = &velocity_pm_ops,
3287 }, 3286 },
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);
788static struct platform_driver w5100_driver = { 788static struct platform_driver w5100_driver = {
789 .driver = { 789 .driver = {
790 .name = DRV_NAME, 790 .name = DRV_NAME,
791 .owner = THIS_MODULE,
792 .pm = &w5100_pm_ops, 791 .pm = &w5100_pm_ops,
793 }, 792 },
794 .probe = w5100_probe, 793 .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);
700static struct platform_driver w5300_driver = { 700static struct platform_driver w5300_driver = {
701 .driver = { 701 .driver = {
702 .name = DRV_NAME, 702 .name = DRV_NAME,
703 .owner = THIS_MODULE,
704 .pm = &w5300_pm_ops, 703 .pm = &w5300_pm_ops,
705 }, 704 },
706 .probe = w5300_probe, 705 .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 = {
261 .remove = fakelb_remove, 261 .remove = fakelb_remove,
262 .driver = { 262 .driver = {
263 .name = "ieee802154fakelb", 263 .name = "ieee802154fakelb",
264 .owner = THIS_MODULE,
265 }, 264 },
266}; 265};
267 266
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 = {
61 .resume = ali_ircc_resume, 61 .resume = ali_ircc_resume,
62 .driver = { 62 .driver = {
63 .name = ALI_IRCC_DRIVER_NAME, 63 .name = ALI_IRCC_DRIVER_NAME,
64 .owner = THIS_MODULE,
65 }, 64 },
66}; 65};
67 66
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)
989static struct platform_driver au1k_irda_driver = { 989static struct platform_driver au1k_irda_driver = {
990 .driver = { 990 .driver = {
991 .name = "au1000-irda", 991 .name = "au1000-irda",
992 .owner = THIS_MODULE,
993 }, 992 },
994 .probe = au1k_irda_probe, 993 .probe = au1k_irda_probe,
995 .remove = au1k_irda_remove, 994 .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)
966static struct platform_driver pxa_ir_driver = { 966static struct platform_driver pxa_ir_driver = {
967 .driver = { 967 .driver = {
968 .name = "pxa2xx-ir", 968 .name = "pxa2xx-ir",
969 .owner = THIS_MODULE,
970 }, 969 },
971 .probe = pxa_irda_probe, 970 .probe = pxa_irda_probe,
972 .remove = pxa_irda_remove, 971 .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 = {
1114 .resume = sa1100_irda_resume, 1114 .resume = sa1100_irda_resume,
1115 .driver = { 1115 .driver = {
1116 .name = "sa11x0-ir", 1116 .name = "sa11x0-ir",
1117 .owner = THIS_MODULE,
1118 }, 1117 },
1119}; 1118};
1120 1119
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[] = {
199static struct platform_driver unimac_mdio_driver = { 199static struct platform_driver unimac_mdio_driver = {
200 .driver = { 200 .driver = {
201 .name = "unimac-mdio", 201 .name = "unimac-mdio",
202 .owner = THIS_MODULE,
203 .of_match_table = unimac_mdio_ids, 202 .of_match_table = unimac_mdio_ids,
204 }, 203 },
205 .probe = unimac_mdio_probe, 204 .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 = {
259 .remove = mdio_gpio_remove, 259 .remove = mdio_gpio_remove,
260 .driver = { 260 .driver = {
261 .name = "mdio-gpio", 261 .name = "mdio-gpio",
262 .owner = THIS_MODULE,
263 .of_match_table = mdio_gpio_of_match, 262 .of_match_table = mdio_gpio_of_match,
264 }, 263 },
265}; 264};
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);
114static struct platform_driver mdio_mux_gpio_driver = { 114static struct platform_driver mdio_mux_gpio_driver = {
115 .driver = { 115 .driver = {
116 .name = "mdio-mux-gpio", 116 .name = "mdio-mux-gpio",
117 .owner = THIS_MODULE,
118 .of_match_table = mdio_mux_gpio_match, 117 .of_match_table = mdio_mux_gpio_match,
119 }, 118 },
120 .probe = mdio_mux_gpio_probe, 119 .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);
156static struct platform_driver mdio_mux_mmioreg_driver = { 156static struct platform_driver mdio_mux_mmioreg_driver = {
157 .driver = { 157 .driver = {
158 .name = "mdio-mux-mmioreg", 158 .name = "mdio-mux-mmioreg",
159 .owner = THIS_MODULE,
160 .of_match_table = mdio_mux_mmioreg_match, 159 .of_match_table = mdio_mux_mmioreg_match,
161 }, 160 },
162 .probe = mdio_mux_mmioreg_probe, 161 .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);
263static struct platform_driver octeon_mdiobus_driver = { 263static struct platform_driver octeon_mdiobus_driver = {
264 .driver = { 264 .driver = {
265 .name = "mdio-octeon", 265 .name = "mdio-octeon",
266 .owner = THIS_MODULE,
267 .of_match_table = octeon_mdiobus_match, 266 .of_match_table = octeon_mdiobus_match,
268 }, 267 },
269 .probe = octeon_mdiobus_probe, 268 .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 = {
175 .remove = ath_ahb_remove, 175 .remove = ath_ahb_remove,
176 .driver = { 176 .driver = {
177 .name = "ath9k", 177 .name = "ath9k",
178 .owner = THIS_MODULE,
179 }, 178 },
180 .id_table = ath9k_platform_id_table, 179 .id_table = ath9k_platform_id_table,
181}; 180};
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 = {
401 .llseek = default_llseek, 401 .llseek = default_llseek,
402}; 402};
403 403
404static ssize_t read_file_dma(struct file *file, char __user *user_buf, 404static int read_file_dma(struct seq_file *file, void *data)
405 size_t count, loff_t *ppos)
406{ 405{
407 struct ath_softc *sc = file->private_data; 406 struct ath_softc *sc = file->private;
408 struct ath_hw *ah = sc->sc_ah; 407 struct ath_hw *ah = sc->sc_ah;
409 char *buf;
410 int retval;
411 unsigned int len = 0;
412 u32 val[ATH9K_NUM_DMA_DEBUG_REGS]; 408 u32 val[ATH9K_NUM_DMA_DEBUG_REGS];
413 int i, qcuOffset = 0, dcuOffset = 0; 409 int i, qcuOffset = 0, dcuOffset = 0;
414 u32 *qcuBase = &val[0], *dcuBase = &val[4]; 410 u32 *qcuBase = &val[0], *dcuBase = &val[4];
415 411
416 buf = kmalloc(DMA_BUF_LEN, GFP_KERNEL);
417 if (!buf)
418 return -ENOMEM;
419
420 ath9k_ps_wakeup(sc); 412 ath9k_ps_wakeup(sc);
421 413
422 REG_WRITE_D(ah, AR_MACMISC, 414 REG_WRITE_D(ah, AR_MACMISC,
@@ -424,21 +416,18 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
424 (AR_MACMISC_MISC_OBS_BUS_1 << 416 (AR_MACMISC_MISC_OBS_BUS_1 <<
425 AR_MACMISC_MISC_OBS_BUS_MSB_S))); 417 AR_MACMISC_MISC_OBS_BUS_MSB_S)));
426 418
427 len += scnprintf(buf + len, DMA_BUF_LEN - len, 419 seq_puts(file, "Raw DMA Debug values:\n");
428 "Raw DMA Debug values:\n");
429 420
430 for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++) { 421 for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++) {
431 if (i % 4 == 0) 422 if (i % 4 == 0)
432 len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n"); 423 seq_puts(file, "\n");
433 424
434 val[i] = REG_READ_D(ah, AR_DMADBG_0 + (i * sizeof(u32))); 425 val[i] = REG_READ_D(ah, AR_DMADBG_0 + (i * sizeof(u32)));
435 len += scnprintf(buf + len, DMA_BUF_LEN - len, "%d: %08x ", 426 seq_printf(file, "%d: %08x ", i, val[i]);
436 i, val[i]);
437 } 427 }
438 428
439 len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n\n"); 429 seq_puts(file, "\n\n");
440 len += scnprintf(buf + len, DMA_BUF_LEN - len, 430 seq_puts(file, "Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
441 "Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
442 431
443 for (i = 0; i < ATH9K_NUM_QUEUES; i++, qcuOffset += 4, dcuOffset += 5) { 432 for (i = 0; i < ATH9K_NUM_QUEUES; i++, qcuOffset += 4, dcuOffset += 5) {
444 if (i == 8) { 433 if (i == 8) {
@@ -451,55 +440,47 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
451 dcuBase++; 440 dcuBase++;
452 } 441 }
453 442
454 len += scnprintf(buf + len, DMA_BUF_LEN - len, 443 seq_printf(file, "%2d %2x %1x %2x %2x\n",
455 "%2d %2x %1x %2x %2x\n", 444 i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset,
456 i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset, 445 (*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3),
457 (*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3), 446 (val[2] & (0x7 << (i * 3))) >> (i * 3),
458 (val[2] & (0x7 << (i * 3))) >> (i * 3), 447 (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);
459 (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);
460 } 448 }
461 449
462 len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n"); 450 seq_puts(file, "\n");
463 451
464 len += scnprintf(buf + len, DMA_BUF_LEN - len, 452 seq_printf(file, "qcu_stitch state: %2x qcu_fetch state: %2x\n",
465 "qcu_stitch state: %2x qcu_fetch state: %2x\n", 453 (val[3] & 0x003c0000) >> 18, (val[3] & 0x03c00000) >> 22);
466 (val[3] & 0x003c0000) >> 18, (val[3] & 0x03c00000) >> 22); 454 seq_printf(file, "qcu_complete state: %2x dcu_complete state: %2x\n",
467 len += scnprintf(buf + len, DMA_BUF_LEN - len, 455 (val[3] & 0x1c000000) >> 26, (val[6] & 0x3));
468 "qcu_complete state: %2x dcu_complete state: %2x\n", 456 seq_printf(file, "dcu_arb state: %2x dcu_fp state: %2x\n",
469 (val[3] & 0x1c000000) >> 26, (val[6] & 0x3)); 457 (val[5] & 0x06000000) >> 25, (val[5] & 0x38000000) >> 27);
470 len += scnprintf(buf + len, DMA_BUF_LEN - len, 458 seq_printf(file, "chan_idle_dur: %3d chan_idle_dur_valid: %1d\n",
471 "dcu_arb state: %2x dcu_fp state: %2x\n", 459 (val[6] & 0x000003fc) >> 2, (val[6] & 0x00000400) >> 10);
472 (val[5] & 0x06000000) >> 25, (val[5] & 0x38000000) >> 27); 460 seq_printf(file, "txfifo_valid_0: %1d txfifo_valid_1: %1d\n",
473 len += scnprintf(buf + len, DMA_BUF_LEN - len, 461 (val[6] & 0x00000800) >> 11, (val[6] & 0x00001000) >> 12);
474 "chan_idle_dur: %3d chan_idle_dur_valid: %1d\n", 462 seq_printf(file, "txfifo_dcu_num_0: %2d txfifo_dcu_num_1: %2d\n",
475 (val[6] & 0x000003fc) >> 2, (val[6] & 0x00000400) >> 10); 463 (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17);
476 len += scnprintf(buf + len, DMA_BUF_LEN - len, 464
477 "txfifo_valid_0: %1d txfifo_valid_1: %1d\n", 465 seq_printf(file, "pcu observe: 0x%x\n", REG_READ_D(ah, AR_OBS_BUS_1));
478 (val[6] & 0x00000800) >> 11, (val[6] & 0x00001000) >> 12); 466 seq_printf(file, "AR_CR: 0x%x\n", REG_READ_D(ah, AR_CR));
479 len += scnprintf(buf + len, DMA_BUF_LEN - len,
480 "txfifo_dcu_num_0: %2d txfifo_dcu_num_1: %2d\n",
481 (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17);
482
483 len += scnprintf(buf + len, DMA_BUF_LEN - len, "pcu observe: 0x%x\n",
484 REG_READ_D(ah, AR_OBS_BUS_1));
485 len += scnprintf(buf + len, DMA_BUF_LEN - len,
486 "AR_CR: 0x%x\n", REG_READ_D(ah, AR_CR));
487 467
488 ath9k_ps_restore(sc); 468 ath9k_ps_restore(sc);
489 469
490 if (len > DMA_BUF_LEN) 470 return 0;
491 len = DMA_BUF_LEN; 471}
492 472
493 retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); 473static int open_file_dma(struct inode *inode, struct file *f)
494 kfree(buf); 474{
495 return retval; 475 return single_open(f, read_file_dma, inode->i_private);
496} 476}
497 477
498static const struct file_operations fops_dma = { 478static const struct file_operations fops_dma = {
499 .read = read_file_dma, 479 .open = open_file_dma,
500 .open = simple_open, 480 .read = seq_read,
501 .owner = THIS_MODULE, 481 .owner = THIS_MODULE,
502 .llseek = default_llseek, 482 .llseek = seq_lseek,
483 .release = single_release,
503}; 484};
504 485
505 486
@@ -556,22 +537,14 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
556 sc->debug.stats.istats.gen_timer++; 537 sc->debug.stats.istats.gen_timer++;
557} 538}
558 539
559static ssize_t read_file_interrupt(struct file *file, char __user *user_buf, 540static int read_file_interrupt(struct seq_file *file, void *data)
560 size_t count, loff_t *ppos)
561{ 541{
562 struct ath_softc *sc = file->private_data; 542 struct ath_softc *sc = file->private;
563 unsigned int len = 0;
564 int rv;
565 int mxlen = 4000;
566 char *buf = kmalloc(mxlen, GFP_KERNEL);
567 if (!buf)
568 return -ENOMEM;
569 543
570#define PR_IS(a, s) \ 544#define PR_IS(a, s) \
571 do { \ 545 do { \
572 len += scnprintf(buf + len, mxlen - len, \ 546 seq_printf(file, "%21s: %10u\n", a, \
573 "%21s: %10u\n", a, \ 547 sc->debug.stats.istats.s); \
574 sc->debug.stats.istats.s); \
575 } while (0) 548 } while (0)
576 549
577 if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) { 550 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,
602 PR_IS("GENTIMER", gen_timer); 575 PR_IS("GENTIMER", gen_timer);
603 PR_IS("TOTAL", total); 576 PR_IS("TOTAL", total);
604 577
605 len += scnprintf(buf + len, mxlen - len, 578 seq_puts(file, "SYNC_CAUSE stats:\n");
606 "SYNC_CAUSE stats:\n");
607 579
608 PR_IS("Sync-All", sync_cause_all); 580 PR_IS("Sync-All", sync_cause_all);
609 PR_IS("RTC-IRQ", sync_rtc_irq); 581 PR_IS("RTC-IRQ", sync_rtc_irq);
@@ -625,35 +597,27 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
625 PR_IS("MAC-Asleep", mac_asleep); 597 PR_IS("MAC-Asleep", mac_asleep);
626 PR_IS("MAC-Sleep-Access", mac_sleep_access); 598 PR_IS("MAC-Sleep-Access", mac_sleep_access);
627 599
628 if (len > mxlen) 600 return 0;
629 len = mxlen; 601}
630 602
631 rv = simple_read_from_buffer(user_buf, count, ppos, buf, len); 603static int open_file_interrupt(struct inode *inode, struct file *f)
632 kfree(buf); 604{
633 return rv; 605 return single_open(f, read_file_interrupt, inode->i_private);
634} 606}
635 607
636static const struct file_operations fops_interrupt = { 608static const struct file_operations fops_interrupt = {
637 .read = read_file_interrupt, 609 .read = seq_read,
638 .open = simple_open, 610 .open = open_file_interrupt,
639 .owner = THIS_MODULE, 611 .owner = THIS_MODULE,
640 .llseek = default_llseek, 612 .llseek = seq_lseek,
613 .release = single_release,
641}; 614};
642 615
643static ssize_t read_file_xmit(struct file *file, char __user *user_buf, 616static int read_file_xmit(struct seq_file *file, void *data)
644 size_t count, loff_t *ppos)
645{ 617{
646 struct ath_softc *sc = file->private_data; 618 struct ath_softc *sc = file->private;
647 char *buf;
648 unsigned int len = 0, size = 2048;
649 ssize_t retval = 0;
650
651 buf = kzalloc(size, GFP_KERNEL);
652 if (buf == NULL)
653 return -ENOMEM;
654 619
655 len += sprintf(buf, "%30s %10s%10s%10s\n\n", 620 seq_printf(file, "%30s %10s%10s%10s\n\n", "BE", "BK", "VI", "VO");
656 "BE", "BK", "VI", "VO");
657 621
658 PR("MPDUs Queued: ", queued); 622 PR("MPDUs Queued: ", queued);
659 PR("MPDUs Completed: ", completed); 623 PR("MPDUs Completed: ", completed);
@@ -678,153 +642,115 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
678 PR("HW-tx-proc-desc: ", txprocdesc); 642 PR("HW-tx-proc-desc: ", txprocdesc);
679 PR("TX-Failed: ", txfailed); 643 PR("TX-Failed: ", txfailed);
680 644
681 if (len > size) 645 return 0;
682 len = size;
683
684 retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
685 kfree(buf);
686
687 return retval;
688} 646}
689 647
690static ssize_t print_queue(struct ath_softc *sc, struct ath_txq *txq, 648static void print_queue(struct ath_softc *sc, struct ath_txq *txq,
691 char *buf, ssize_t size) 649 struct seq_file *file)
692{ 650{
693 ssize_t len = 0;
694
695 ath_txq_lock(sc, txq); 651 ath_txq_lock(sc, txq);
696 652
697 len += scnprintf(buf + len, size - len, "%s: %d ", 653 seq_printf(file, "%s: %d ", "qnum", txq->axq_qnum);
698 "qnum", txq->axq_qnum); 654 seq_printf(file, "%s: %2d ", "qdepth", txq->axq_depth);
699 len += scnprintf(buf + len, size - len, "%s: %2d ", 655 seq_printf(file, "%s: %2d ", "ampdu-depth", txq->axq_ampdu_depth);
700 "qdepth", txq->axq_depth); 656 seq_printf(file, "%s: %3d ", "pending", txq->pending_frames);
701 len += scnprintf(buf + len, size - len, "%s: %2d ", 657 seq_printf(file, "%s: %d\n", "stopped", txq->stopped);
702 "ampdu-depth", txq->axq_ampdu_depth);
703 len += scnprintf(buf + len, size - len, "%s: %3d ",
704 "pending", txq->pending_frames);
705 len += scnprintf(buf + len, size - len, "%s: %d\n",
706 "stopped", txq->stopped);
707 658
708 ath_txq_unlock(sc, txq); 659 ath_txq_unlock(sc, txq);
709 return len;
710} 660}
711 661
712static ssize_t read_file_queues(struct file *file, char __user *user_buf, 662static int read_file_queues(struct seq_file *file, void *data)
713 size_t count, loff_t *ppos)
714{ 663{
715 struct ath_softc *sc = file->private_data; 664 struct ath_softc *sc = file->private;
716 struct ath_txq *txq; 665 struct ath_txq *txq;
717 char *buf;
718 unsigned int len = 0;
719 const unsigned int size = 1024;
720 ssize_t retval = 0;
721 int i; 666 int i;
722 static const char *qname[4] = { 667 static const char *qname[4] = {
723 "VO", "VI", "BE", "BK" 668 "VO", "VI", "BE", "BK"
724 }; 669 };
725 670
726 buf = kzalloc(size, GFP_KERNEL);
727 if (buf == NULL)
728 return -ENOMEM;
729
730 for (i = 0; i < IEEE80211_NUM_ACS; i++) { 671 for (i = 0; i < IEEE80211_NUM_ACS; i++) {
731 txq = sc->tx.txq_map[i]; 672 txq = sc->tx.txq_map[i];
732 len += scnprintf(buf + len, size - len, "(%s): ", qname[i]); 673 seq_printf(file, "(%s): ", qname[i]);
733 len += print_queue(sc, txq, buf + len, size - len); 674 print_queue(sc, txq, file);
734 } 675 }
735 676
736 len += scnprintf(buf + len, size - len, "(CAB): "); 677 seq_puts(file, "(CAB): ");
737 len += print_queue(sc, sc->beacon.cabq, buf + len, size - len); 678 print_queue(sc, sc->beacon.cabq, file);
738
739 if (len > size)
740 len = size;
741
742 retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
743 kfree(buf);
744 679
745 return retval; 680 return 0;
746} 681}
747 682
748static ssize_t read_file_misc(struct file *file, char __user *user_buf, 683static int read_file_misc(struct seq_file *file, void *data)
749 size_t count, loff_t *ppos)
750{ 684{
751 struct ath_softc *sc = file->private_data; 685 struct ath_softc *sc = file->private;
752 struct ath_common *common = ath9k_hw_common(sc->sc_ah); 686 struct ath_common *common = ath9k_hw_common(sc->sc_ah);
753 struct ath9k_vif_iter_data iter_data; 687 struct ath9k_vif_iter_data iter_data;
754 struct ath_chanctx *ctx; 688 struct ath_chanctx *ctx;
755 char buf[512];
756 unsigned int len = 0;
757 ssize_t retval = 0;
758 unsigned int reg; 689 unsigned int reg;
759 u32 rxfilter, i; 690 u32 rxfilter, i;
760 691
761 len += scnprintf(buf + len, sizeof(buf) - len, 692 seq_printf(file, "BSSID: %pM\n", common->curbssid);
762 "BSSID: %pM\n", common->curbssid); 693 seq_printf(file, "BSSID-MASK: %pM\n", common->bssidmask);
763 len += scnprintf(buf + len, sizeof(buf) - len, 694 seq_printf(file, "OPMODE: %s\n",
764 "BSSID-MASK: %pM\n", common->bssidmask); 695 ath_opmode_to_string(sc->sc_ah->opmode));
765 len += scnprintf(buf + len, sizeof(buf) - len,
766 "OPMODE: %s\n",
767 ath_opmode_to_string(sc->sc_ah->opmode));
768 696
769 ath9k_ps_wakeup(sc); 697 ath9k_ps_wakeup(sc);
770 rxfilter = ath9k_hw_getrxfilter(sc->sc_ah); 698 rxfilter = ath9k_hw_getrxfilter(sc->sc_ah);
771 ath9k_ps_restore(sc); 699 ath9k_ps_restore(sc);
772 700
773 len += scnprintf(buf + len, sizeof(buf) - len, 701 seq_printf(file, "RXFILTER: 0x%x", rxfilter);
774 "RXFILTER: 0x%x", rxfilter);
775 702
776 if (rxfilter & ATH9K_RX_FILTER_UCAST) 703 if (rxfilter & ATH9K_RX_FILTER_UCAST)
777 len += scnprintf(buf + len, sizeof(buf) - len, " UCAST"); 704 seq_puts(file, " UCAST");
778 if (rxfilter & ATH9K_RX_FILTER_MCAST) 705 if (rxfilter & ATH9K_RX_FILTER_MCAST)
779 len += scnprintf(buf + len, sizeof(buf) - len, " MCAST"); 706 seq_puts(file, " MCAST");
780 if (rxfilter & ATH9K_RX_FILTER_BCAST) 707 if (rxfilter & ATH9K_RX_FILTER_BCAST)
781 len += scnprintf(buf + len, sizeof(buf) - len, " BCAST"); 708 seq_puts(file, " BCAST");
782 if (rxfilter & ATH9K_RX_FILTER_CONTROL) 709 if (rxfilter & ATH9K_RX_FILTER_CONTROL)
783 len += scnprintf(buf + len, sizeof(buf) - len, " CONTROL"); 710 seq_puts(file, " CONTROL");
784 if (rxfilter & ATH9K_RX_FILTER_BEACON) 711 if (rxfilter & ATH9K_RX_FILTER_BEACON)
785 len += scnprintf(buf + len, sizeof(buf) - len, " BEACON"); 712 seq_puts(file, " BEACON");
786 if (rxfilter & ATH9K_RX_FILTER_PROM) 713 if (rxfilter & ATH9K_RX_FILTER_PROM)
787 len += scnprintf(buf + len, sizeof(buf) - len, " PROM"); 714 seq_puts(file, " PROM");
788 if (rxfilter & ATH9K_RX_FILTER_PROBEREQ) 715 if (rxfilter & ATH9K_RX_FILTER_PROBEREQ)
789 len += scnprintf(buf + len, sizeof(buf) - len, " PROBEREQ"); 716 seq_puts(file, " PROBEREQ");
790 if (rxfilter & ATH9K_RX_FILTER_PHYERR) 717 if (rxfilter & ATH9K_RX_FILTER_PHYERR)
791 len += scnprintf(buf + len, sizeof(buf) - len, " PHYERR"); 718 seq_puts(file, " PHYERR");
792 if (rxfilter & ATH9K_RX_FILTER_MYBEACON) 719 if (rxfilter & ATH9K_RX_FILTER_MYBEACON)
793 len += scnprintf(buf + len, sizeof(buf) - len, " MYBEACON"); 720 seq_puts(file, " MYBEACON");
794 if (rxfilter & ATH9K_RX_FILTER_COMP_BAR) 721 if (rxfilter & ATH9K_RX_FILTER_COMP_BAR)
795 len += scnprintf(buf + len, sizeof(buf) - len, " COMP_BAR"); 722 seq_puts(file, " COMP_BAR");
796 if (rxfilter & ATH9K_RX_FILTER_PSPOLL) 723 if (rxfilter & ATH9K_RX_FILTER_PSPOLL)
797 len += scnprintf(buf + len, sizeof(buf) - len, " PSPOLL"); 724 seq_puts(file, " PSPOLL");
798 if (rxfilter & ATH9K_RX_FILTER_PHYRADAR) 725 if (rxfilter & ATH9K_RX_FILTER_PHYRADAR)
799 len += scnprintf(buf + len, sizeof(buf) - len, " PHYRADAR"); 726 seq_puts(file, " PHYRADAR");
800 if (rxfilter & ATH9K_RX_FILTER_MCAST_BCAST_ALL) 727 if (rxfilter & ATH9K_RX_FILTER_MCAST_BCAST_ALL)
801 len += scnprintf(buf + len, sizeof(buf) - len, " MCAST_BCAST_ALL"); 728 seq_puts(file, " MCAST_BCAST_ALL");
802 if (rxfilter & ATH9K_RX_FILTER_CONTROL_WRAPPER) 729 if (rxfilter & ATH9K_RX_FILTER_CONTROL_WRAPPER)
803 len += scnprintf(buf + len, sizeof(buf) - len, " CONTROL_WRAPPER"); 730 seq_puts(file, " CONTROL_WRAPPER");
804 731
805 len += scnprintf(buf + len, sizeof(buf) - len, "\n"); 732 seq_puts(file, "\n");
806 733
807 reg = sc->sc_ah->imask; 734 reg = sc->sc_ah->imask;
808 735
809 len += scnprintf(buf + len, sizeof(buf) - len, 736 seq_printf(file, "INTERRUPT-MASK: 0x%x", reg);
810 "INTERRUPT-MASK: 0x%x", reg);
811 737
812 if (reg & ATH9K_INT_SWBA) 738 if (reg & ATH9K_INT_SWBA)
813 len += scnprintf(buf + len, sizeof(buf) - len, " SWBA"); 739 seq_puts(file, " SWBA");
814 if (reg & ATH9K_INT_BMISS) 740 if (reg & ATH9K_INT_BMISS)
815 len += scnprintf(buf + len, sizeof(buf) - len, " BMISS"); 741 seq_puts(file, " BMISS");
816 if (reg & ATH9K_INT_CST) 742 if (reg & ATH9K_INT_CST)
817 len += scnprintf(buf + len, sizeof(buf) - len, " CST"); 743 seq_puts(file, " CST");
818 if (reg & ATH9K_INT_RX) 744 if (reg & ATH9K_INT_RX)
819 len += scnprintf(buf + len, sizeof(buf) - len, " RX"); 745 seq_puts(file, " RX");
820 if (reg & ATH9K_INT_RXHP) 746 if (reg & ATH9K_INT_RXHP)
821 len += scnprintf(buf + len, sizeof(buf) - len, " RXHP"); 747 seq_puts(file, " RXHP");
822 if (reg & ATH9K_INT_RXLP) 748 if (reg & ATH9K_INT_RXLP)
823 len += scnprintf(buf + len, sizeof(buf) - len, " RXLP"); 749 seq_puts(file, " RXLP");
824 if (reg & ATH9K_INT_BB_WATCHDOG) 750 if (reg & ATH9K_INT_BB_WATCHDOG)
825 len += scnprintf(buf + len, sizeof(buf) - len, " BB_WATCHDOG"); 751 seq_puts(file, " BB_WATCHDOG");
826 752
827 len += scnprintf(buf + len, sizeof(buf) - len, "\n"); 753 seq_puts(file, "\n");
828 754
829 i = 0; 755 i = 0;
830 ath_for_each_chanctx(sc, ctx) { 756 ath_for_each_chanctx(sc, ctx) {
@@ -832,27 +758,22 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
832 continue; 758 continue;
833 ath9k_calculate_iter_data(sc, ctx, &iter_data); 759 ath9k_calculate_iter_data(sc, ctx, &iter_data);
834 760
835 len += scnprintf(buf + len, sizeof(buf) - len, 761 seq_printf(file,
836 "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i", 762 "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i",
837 i++, (int)(ctx->assigned), iter_data.naps, 763 i++, (int)(ctx->assigned), iter_data.naps,
838 iter_data.nstations, 764 iter_data.nstations,
839 iter_data.nmeshes, iter_data.nwds); 765 iter_data.nmeshes, iter_data.nwds);
840 len += scnprintf(buf + len, sizeof(buf) - len, 766 seq_printf(file, " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",
841 " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n", 767 iter_data.nadhocs, sc->cur_chan->nvifs,
842 iter_data.nadhocs, sc->cur_chan->nvifs, sc->nbcnvifs); 768 sc->nbcnvifs);
843 } 769 }
844 770
845 if (len > sizeof(buf)) 771 return 0;
846 len = sizeof(buf);
847
848 retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
849 return retval;
850} 772}
851 773
852static ssize_t read_file_reset(struct file *file, char __user *user_buf, 774static int read_file_reset(struct seq_file *file, void *data)
853 size_t count, loff_t *ppos)
854{ 775{
855 struct ath_softc *sc = file->private_data; 776 struct ath_softc *sc = file->private;
856 static const char * const reset_cause[__RESET_TYPE_MAX] = { 777 static const char * const reset_cause[__RESET_TYPE_MAX] = {
857 [RESET_TYPE_BB_HANG] = "Baseband Hang", 778 [RESET_TYPE_BB_HANG] = "Baseband Hang",
858 [RESET_TYPE_BB_WATCHDOG] = "Baseband Watchdog", 779 [RESET_TYPE_BB_WATCHDOG] = "Baseband Watchdog",
@@ -866,23 +787,17 @@ static ssize_t read_file_reset(struct file *file, char __user *user_buf,
866 [RESET_TYPE_MCI] = "MCI Reset", 787 [RESET_TYPE_MCI] = "MCI Reset",
867 [RESET_TYPE_CALIBRATION] = "Calibration error", 788 [RESET_TYPE_CALIBRATION] = "Calibration error",
868 }; 789 };
869 char buf[512];
870 unsigned int len = 0;
871 int i; 790 int i;
872 791
873 for (i = 0; i < ARRAY_SIZE(reset_cause); i++) { 792 for (i = 0; i < ARRAY_SIZE(reset_cause); i++) {
874 if (!reset_cause[i]) 793 if (!reset_cause[i])
875 continue; 794 continue;
876 795
877 len += scnprintf(buf + len, sizeof(buf) - len, 796 seq_printf(file, "%17s: %2d\n", reset_cause[i],
878 "%17s: %2d\n", reset_cause[i], 797 sc->debug.stats.reset[i]);
879 sc->debug.stats.reset[i]);
880 } 798 }
881 799
882 if (len > sizeof(buf)) 800 return 0;
883 len = sizeof(buf);
884
885 return simple_read_from_buffer(user_buf, count, ppos, buf, len);
886} 801}
887 802
888void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf, 803void 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,
922 TX_STAT_INC(qnum, delim_underrun); 837 TX_STAT_INC(qnum, delim_underrun);
923} 838}
924 839
840static int open_file_xmit(struct inode *inode, struct file *f)
841{
842 return single_open(f, read_file_xmit, inode->i_private);
843}
844
925static const struct file_operations fops_xmit = { 845static const struct file_operations fops_xmit = {
926 .read = read_file_xmit, 846 .read = seq_read,
927 .open = simple_open, 847 .open = open_file_xmit,
928 .owner = THIS_MODULE, 848 .owner = THIS_MODULE,
929 .llseek = default_llseek, 849 .llseek = seq_lseek,
850 .release = single_release,
930}; 851};
931 852
853static int open_file_queues(struct inode *inode, struct file *f)
854{
855 return single_open(f, read_file_queues, inode->i_private);
856}
857
932static const struct file_operations fops_queues = { 858static const struct file_operations fops_queues = {
933 .read = read_file_queues, 859 .read = seq_read,
934 .open = simple_open, 860 .open = open_file_queues,
935 .owner = THIS_MODULE, 861 .owner = THIS_MODULE,
936 .llseek = default_llseek, 862 .llseek = seq_lseek,
863 .release = single_release,
937}; 864};
938 865
866static int open_file_misc(struct inode *inode, struct file *f)
867{
868 return single_open(f, read_file_misc, inode->i_private);
869}
870
939static const struct file_operations fops_misc = { 871static const struct file_operations fops_misc = {
940 .read = read_file_misc, 872 .read = seq_read,
941 .open = simple_open, 873 .open = open_file_misc,
942 .owner = THIS_MODULE, 874 .owner = THIS_MODULE,
943 .llseek = default_llseek, 875 .llseek = seq_lseek,
876 .release = single_release,
944}; 877};
945 878
879static int open_file_reset(struct inode *inode, struct file *f)
880{
881 return single_open(f, read_file_reset, inode->i_private);
882}
883
946static const struct file_operations fops_reset = { 884static const struct file_operations fops_reset = {
947 .read = read_file_reset, 885 .read = seq_read,
948 .open = simple_open, 886 .open = open_file_reset,
949 .owner = THIS_MODULE, 887 .owner = THIS_MODULE,
950 .llseek = default_llseek, 888 .llseek = seq_lseek,
889 .release = single_release,
951}; 890};
952 891
953void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs) 892void 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)
956} 895}
957 896
958static ssize_t read_file_regidx(struct file *file, char __user *user_buf, 897static ssize_t read_file_regidx(struct file *file, char __user *user_buf,
959 size_t count, loff_t *ppos) 898 size_t count, loff_t *ppos)
960{ 899{
961 struct ath_softc *sc = file->private_data; 900 struct ath_softc *sc = file->private_data;
962 char buf[32]; 901 char buf[32];
@@ -967,7 +906,7 @@ static ssize_t read_file_regidx(struct file *file, char __user *user_buf,
967} 906}
968 907
969static ssize_t write_file_regidx(struct file *file, const char __user *user_buf, 908static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,
970 size_t count, loff_t *ppos) 909 size_t count, loff_t *ppos)
971{ 910{
972 struct ath_softc *sc = file->private_data; 911 struct ath_softc *sc = file->private_data;
973 unsigned long regidx; 912 unsigned long regidx;
@@ -995,7 +934,7 @@ static const struct file_operations fops_regidx = {
995}; 934};
996 935
997static ssize_t read_file_regval(struct file *file, char __user *user_buf, 936static ssize_t read_file_regval(struct file *file, char __user *user_buf,
998 size_t count, loff_t *ppos) 937 size_t count, loff_t *ppos)
999{ 938{
1000 struct ath_softc *sc = file->private_data; 939 struct ath_softc *sc = file->private_data;
1001 struct ath_hw *ah = sc->sc_ah; 940 struct ath_hw *ah = sc->sc_ah;
@@ -1011,7 +950,7 @@ static ssize_t read_file_regval(struct file *file, char __user *user_buf,
1011} 950}
1012 951
1013static ssize_t write_file_regval(struct file *file, const char __user *user_buf, 952static ssize_t write_file_regval(struct file *file, const char __user *user_buf,
1014 size_t count, loff_t *ppos) 953 size_t count, loff_t *ppos)
1015{ 954{
1016 struct ath_softc *sc = file->private_data; 955 struct ath_softc *sc = file->private_data;
1017 struct ath_hw *ah = sc->sc_ah; 956 struct ath_hw *ah = sc->sc_ah;
@@ -1077,57 +1016,45 @@ static const struct file_operations fops_regdump = {
1077 .llseek = default_llseek,/* read accesses f_pos */ 1016 .llseek = default_llseek,/* read accesses f_pos */
1078}; 1017};
1079 1018
1080static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf, 1019static int read_file_dump_nfcal(struct seq_file *file, void *data)
1081 size_t count, loff_t *ppos)
1082{ 1020{
1083 struct ath_softc *sc = file->private_data; 1021 struct ath_softc *sc = file->private;
1084 struct ath_hw *ah = sc->sc_ah; 1022 struct ath_hw *ah = sc->sc_ah;
1085 struct ath9k_nfcal_hist *h = sc->cur_chan->caldata.nfCalHist; 1023 struct ath9k_nfcal_hist *h = sc->cur_chan->caldata.nfCalHist;
1086 struct ath_common *common = ath9k_hw_common(ah); 1024 struct ath_common *common = ath9k_hw_common(ah);
1087 struct ieee80211_conf *conf = &common->hw->conf; 1025 struct ieee80211_conf *conf = &common->hw->conf;
1088 u32 len = 0, size = 1500;
1089 u32 i, j; 1026 u32 i, j;
1090 ssize_t retval = 0;
1091 char *buf;
1092 u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask; 1027 u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
1093 u8 nread; 1028 u8 nread;
1094 1029
1095 buf = kzalloc(size, GFP_KERNEL); 1030 seq_printf(file, "Channel Noise Floor : %d\n", ah->noise);
1096 if (!buf) 1031 seq_puts(file, "Chain | privNF | # Readings | NF Readings\n");
1097 return -ENOMEM;
1098
1099 len += scnprintf(buf + len, size - len,
1100 "Channel Noise Floor : %d\n", ah->noise);
1101 len += scnprintf(buf + len, size - len,
1102 "Chain | privNF | # Readings | NF Readings\n");
1103 for (i = 0; i < NUM_NF_READINGS; i++) { 1032 for (i = 0; i < NUM_NF_READINGS; i++) {
1104 if (!(chainmask & (1 << i)) || 1033 if (!(chainmask & (1 << i)) ||
1105 ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))) 1034 ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
1106 continue; 1035 continue;
1107 1036
1108 nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount; 1037 nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount;
1109 len += scnprintf(buf + len, size - len, " %d\t %d\t %d\t\t", 1038 seq_printf(file, " %d\t %d\t %d\t\t", i, h[i].privNF, nread);
1110 i, h[i].privNF, nread);
1111 for (j = 0; j < nread; j++) 1039 for (j = 0; j < nread; j++)
1112 len += scnprintf(buf + len, size - len, 1040 seq_printf(file, " %d", h[i].nfCalBuffer[j]);
1113 " %d", h[i].nfCalBuffer[j]); 1041 seq_puts(file, "\n");
1114 len += scnprintf(buf + len, size - len, "\n");
1115 } 1042 }
1116 1043
1117 if (len > size) 1044 return 0;
1118 len = size; 1045}
1119
1120 retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
1121 kfree(buf);
1122 1046
1123 return retval; 1047static int open_file_dump_nfcal(struct inode *inode, struct file *f)
1048{
1049 return single_open(f, read_file_dump_nfcal, inode->i_private);
1124} 1050}
1125 1051
1126static const struct file_operations fops_dump_nfcal = { 1052static const struct file_operations fops_dump_nfcal = {
1127 .read = read_file_dump_nfcal, 1053 .read = seq_read,
1128 .open = simple_open, 1054 .open = open_file_dump_nfcal,
1129 .owner = THIS_MODULE, 1055 .owner = THIS_MODULE,
1130 .llseek = default_llseek, 1056 .llseek = seq_lseek,
1057 .release = single_release,
1131}; 1058};
1132 1059
1133#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT 1060#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 {
196#define TXSTATS sc->debug.stats.txstats 196#define TXSTATS sc->debug.stats.txstats
197#define PR(str, elem) \ 197#define PR(str, elem) \
198 do { \ 198 do { \
199 len += scnprintf(buf + len, size - len, \ 199 seq_printf(file, "%s%13u%11u%10u%10u\n", str, \
200 "%s%13u%11u%10u%10u\n", str, \ 200 TXSTATS[PR_QNUM(IEEE80211_AC_BE)].elem,\
201 TXSTATS[PR_QNUM(IEEE80211_AC_BE)].elem,\ 201 TXSTATS[PR_QNUM(IEEE80211_AC_BK)].elem,\
202 TXSTATS[PR_QNUM(IEEE80211_AC_BK)].elem,\ 202 TXSTATS[PR_QNUM(IEEE80211_AC_VI)].elem,\
203 TXSTATS[PR_QNUM(IEEE80211_AC_VI)].elem,\ 203 TXSTATS[PR_QNUM(IEEE80211_AC_VO)].elem); \
204 TXSTATS[PR_QNUM(IEEE80211_AC_VO)].elem); \
205 } while(0) 204 } while(0)
206 205
207struct ath_rx_rate_stats { 206struct 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 = {
1078 .remove = wcn36xx_remove, 1078 .remove = wcn36xx_remove,
1079 .driver = { 1079 .driver = {
1080 .name = "wcn36xx", 1080 .name = "wcn36xx",
1081 .owner = THIS_MODULE,
1082 }, 1081 },
1083 .id_table = wcn36xx_platform_id_table, 1082 .id_table = wcn36xx_platform_id_table,
1084}; 1083};
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 = {
1221 .remove = brcmf_sdio_pd_remove, 1221 .remove = brcmf_sdio_pd_remove,
1222 .driver = { 1222 .driver = {
1223 .name = BRCMFMAC_SDIO_PDATA_NAME, 1223 .name = BRCMFMAC_SDIO_PDATA_NAME,
1224 .owner = THIS_MODULE,
1225 } 1224 }
1226}; 1225};
1227 1226
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;
395static struct platform_driver mac80211_hwsim_driver = { 395static struct platform_driver mac80211_hwsim_driver = {
396 .driver = { 396 .driver = {
397 .name = "mac80211_hwsim", 397 .name = "mac80211_hwsim",
398 .owner = THIS_MODULE,
399 }, 398 },
400}; 399};
401 400
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)
244static struct platform_driver rt2800soc_driver = { 244static struct platform_driver rt2800soc_driver = {
245 .driver = { 245 .driver = {
246 .name = "rt2800_wmac", 246 .name = "rt2800_wmac",
247 .owner = THIS_MODULE,
248 .mod_name = KBUILD_MODNAME, 247 .mod_name = KBUILD_MODNAME,
249 }, 248 },
250 .probe = rt2800soc_probe, 249 .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 = {
1900 .id_table = wl12xx_id_table, 1900 .id_table = wl12xx_id_table,
1901 .driver = { 1901 .driver = {
1902 .name = "wl12xx_driver", 1902 .name = "wl12xx_driver",
1903 .owner = THIS_MODULE,
1904 } 1903 }
1905}; 1904};
1906 1905
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 = {
1968 .id_table = wl18xx_id_table, 1968 .id_table = wl18xx_id_table,
1969 .driver = { 1969 .driver = {
1970 .name = "wl18xx_driver", 1970 .name = "wl18xx_driver",
1971 .owner = THIS_MODULE,
1972 } 1971 }
1973}; 1972};
1974 1973
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-11 11:48:25 -0500