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

Commit 458622fc authored by Kay Sievers's avatar Kay Sievers Committed by Jeff Garzik
Browse files

ATA/IDE: fix platform driver hotplug/coldplug 



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

NOTE: both ata/pata_platform.c and ide/legacy/ide_platform.c claim
to provide "the" platform_pata driver, and there's no build-time
mutual exclusion mechanism.  This means that configs which enable
both drivers will make some trouble when hotplugging...

[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: Tejun Heo <htejun@gmail.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 8e5443a0

drivers/ata/pata_at32.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -381,6 +381,9 @@ static int __exit pata_at32_remove(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





/* work with hotplug and coldplug */

MODULE_ALIAS("platform:at32_ide");



static struct platform_driver pata_at32_driver = {

static struct platform_driver pata_at32_driver = {

	.remove	       = __exit_p(pata_at32_remove),

	.remove	       = __exit_p(pata_at32_remove),

	.driver	       = {

	.driver	       = {

drivers/ata/pata_bf54x.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1601,3 +1601,4 @@ MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>"); 
MODULE_DESCRIPTION("PATA driver for blackfin 54x ATAPI controller");

MODULE_DESCRIPTION("PATA driver for blackfin 54x ATAPI controller");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);

MODULE_VERSION(DRV_VERSION);

MODULE_ALIAS("platform:" DRV_NAME);

drivers/ata/pata_ixp4xx_cf.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,7 @@ MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); 
MODULE_DESCRIPTION("low-level driver for ixp4xx Compact Flash PATA");

MODULE_DESCRIPTION("low-level driver for ixp4xx Compact Flash PATA");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);

MODULE_VERSION(DRV_VERSION);

MODULE_ALIAS("platform:" DRV_NAME);





module_init(ixp4xx_pata_init);

module_init(ixp4xx_pata_init);

module_exit(ixp4xx_pata_exit);
 
module_exit(ixp4xx_pata_exit);

drivers/ata/pata_platform.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -277,3 +277,4 @@ MODULE_AUTHOR("Paul Mundt"); 
MODULE_DESCRIPTION("low-level driver for platform device ATA");

MODULE_DESCRIPTION("low-level driver for platform device ATA");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);

MODULE_VERSION(DRV_VERSION);

MODULE_ALIAS("platform:" DRV_NAME);

drivers/ata/pata_rb500_cf.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -239,6 +239,9 @@ static __devexit int rb500_pata_driver_remove(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





/* work with hotplug and coldplug */

MODULE_ALIAS("platform:" DRV_NAME);



static struct platform_driver rb500_pata_platform_driver = {

static struct platform_driver rb500_pata_platform_driver = {

	.probe		= rb500_pata_driver_probe,

	.probe		= rb500_pata_driver_probe,

	.remove		= __devexit_p(rb500_pata_driver_remove),

	.remove		= __devexit_p(rb500_pata_driver_remove),