Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72abb461 authored by Kay Sievers's avatar Kay Sievers Committed by Jeff Garzik
Browse files

net drivers: fix platform driver hotplug/coldplug 



Since 43cc71ee, the platform modalias is
prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable network
platform drivers, to re-enable auto loading.

NOTE: didn't change drivers/net/fs_enet/fs_enet-main.c "old binding" support.
That looks problematic in the first place (it even uses the ancient "struct
device_driver" binding scheme for platform_bus!) and I suspect it will vanish
soonish when arch/powerpc rules the world.  Also, drivers/net/ne.c would have
needed more thought to sort out.

[akpm@linux-foundation.org: fix sgiseeq.c]
[dbrownell@users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Vitaly Bordug <vitb@kernel.crashing.org>
Cc: Dale Farnsworth <dale@farnsworth.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Andrew Victor <andrew@sanpeople.com>
Cc: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent a433686c

drivers/net/arm/at91_ether.c

+1 −0
Original line number Diff line number Diff line
@@ -1246,3 +1246,4 @@ module_exit(at91ether_exit) 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("AT91RM9200 EMAC Ethernet driver");

MODULE_AUTHOR("Andrew Victor");

MODULE_ALIAS("platform:" DRV_NAME);

drivers/net/arm/ep93xx_eth.c

+2 −0
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ static struct platform_driver ep93xx_eth_driver = { 
	.remove		= ep93xx_eth_remove,

	.driver		= {

		.name	= "ep93xx-eth",

		.owner	= THIS_MODULE,

	},

};
@@ -914,3 +915,4 @@ static void __exit ep93xx_eth_cleanup_module(void) 
module_init(ep93xx_eth_init_module);

module_exit(ep93xx_eth_cleanup_module);

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:ep93xx-eth");

drivers/net/ax88796.c

+1 −0
Original line number Diff line number Diff line
@@ -1005,3 +1005,4 @@ module_exit(axdrv_exit); 
MODULE_DESCRIPTION("AX88796 10/100 Ethernet platform driver");

MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:ax88796");

drivers/net/bfin_mac.c

+5 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
MODULE_AUTHOR(DRV_AUTHOR);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION(DRV_DESC);

MODULE_ALIAS("platform:bfin_mac");



#if defined(CONFIG_BFIN_MAC_USE_L1)

# define bfin_mac_alloc(dma_handle, size)  l1_data_sram_zalloc(size)
@@ -1090,6 +1091,7 @@ static struct platform_driver bfin_mac_driver = { 
	.suspend = bfin_mac_suspend,

	.driver = {

		.name = DRV_NAME,

		.owner	= THIS_MODULE,

	},

};
@@ -1106,3 +1108,4 @@ static void __exit bfin_mac_cleanup(void) 
}



module_exit(bfin_mac_cleanup);

drivers/net/cpmac.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>");

MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:cpmac");



static int debug_level = 8;

static int dumb_switch;
@@ -1103,6 +1104,7 @@ static int __devexit cpmac_remove(struct platform_device *pdev) 


static struct platform_driver cpmac_driver = {

	.driver.name = "cpmac",

	.driver.owner = THIS_MODULE,

	.probe = cpmac_probe,

	.remove = __devexit_p(cpmac_remove),

};