Skip to content

Commit

Permalink
usb host: fix platform driver hotplug/coldplug
Browse files Browse the repository at this point in the history
Since 43cc71e, the platform modalias is
prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable USB HCDs,
to allow re-enable auto loading.

[dbrownell@users.sourceforge.net: more drivers; registration fixes]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Kay Sievers authored and Linus Torvalds committed Apr 11, 2008
1 parent f34c32f commit f4fce61
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 6 deletions.
8 changes: 6 additions & 2 deletions drivers/usb/host/isp116x-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1684,14 +1684,18 @@ static int isp116x_resume(struct platform_device *dev)

#endif

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:isp116x-hcd");

static struct platform_driver isp116x_driver = {
.probe = isp116x_probe,
.remove = isp116x_remove,
.suspend = isp116x_suspend,
.resume = isp116x_resume,
.driver = {
.name = (char *)hcd_name,
},
.name = (char *)hcd_name,
.owner = THIS_MODULE,
},
};

/*-----------------------------------------------------------------*/
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/host/ohci-at91.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ static int ohci_hcd_at91_drv_resume(struct platform_device *pdev)
#define ohci_hcd_at91_drv_resume NULL
#endif

MODULE_ALIAS("at91_ohci");
MODULE_ALIAS("platform:at91_ohci");

static struct platform_driver ohci_hcd_at91_driver = {
.probe = ohci_hcd_at91_drv_probe,
Expand All @@ -368,4 +368,3 @@ static struct platform_driver ohci_hcd_at91_driver = {
.owner = THIS_MODULE,
},
};

1 change: 1 addition & 0 deletions drivers/usb/host/ohci-au1xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,3 +345,4 @@ static struct platform_driver ohci_hcd_au1xxx_driver = {
},
};

MODULE_ALIAS("platform:au1xxx-ohci");
2 changes: 2 additions & 0 deletions drivers/usb/host/ohci-ep93xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ static struct platform_driver ohci_hcd_ep93xx_driver = {
#endif
.driver = {
.name = "ep93xx-ohci",
.owner = THIS_MODULE,
},
};

MODULE_ALIAS("platform:ep93xx-ohci");
1 change: 1 addition & 0 deletions drivers/usb/host/ohci-lh7a404.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,3 +251,4 @@ static struct platform_driver ohci_hcd_lh7a404_driver = {
},
};

MODULE_ALIAS("platform:lh7a404-ohci");
1 change: 1 addition & 0 deletions drivers/usb/host/ohci-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -544,3 +544,4 @@ static struct platform_driver ohci_hcd_omap_driver = {
},
};

MODULE_ALIAS("platform:ohci");
4 changes: 4 additions & 0 deletions drivers/usb/host/ohci-pnx4008.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,9 +456,13 @@ static int usb_hcd_pnx4008_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:usb-ohci");

static struct platform_driver usb_hcd_pnx4008_driver = {
.driver = {
.name = "usb-ohci",
.owner = THIS_MODULE,
},
.probe = usb_hcd_pnx4008_probe,
.remove = usb_hcd_pnx4008_remove,
Expand Down
5 changes: 3 additions & 2 deletions drivers/usb/host/ohci-pnx8550.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,12 @@ static int ohci_hcd_pnx8550_drv_remove(struct platform_device *pdev)
return 0;
}

MODULE_ALIAS("pnx8550-ohci");
MODULE_ALIAS("platform:pnx8550-ohci");

static struct platform_driver ohci_hcd_pnx8550_driver = {
.driver = {
.name = "pnx8550-ohci",
.name = "pnx8550-ohci",
.owner = THIS_MODULE,
},
.probe = ohci_hcd_pnx8550_drv_probe,
.remove = ohci_hcd_pnx8550_drv_remove,
Expand Down
1 change: 1 addition & 0 deletions drivers/usb/host/ohci-ppc-soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,4 @@ static struct platform_driver ohci_hcd_ppc_soc_driver = {
},
};

MODULE_ALIAS("platform:ppc-soc-ohci");
3 changes: 3 additions & 0 deletions drivers/usb/host/ohci-pxa27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,8 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
}
#endif

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:pxa27x-ohci");

static struct platform_driver ohci_hcd_pxa27x_driver = {
.probe = ohci_hcd_pxa27x_drv_probe,
Expand All @@ -375,6 +377,7 @@ static struct platform_driver ohci_hcd_pxa27x_driver = {
#endif
.driver = {
.name = "pxa27x-ohci",
.owner = THIS_MODULE,
},
};

1 change: 1 addition & 0 deletions drivers/usb/host/ohci-s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,3 +501,4 @@ static struct platform_driver ohci_hcd_s3c2410_driver = {
},
};

MODULE_ALIAS("platform:s3c2410-ohci");
1 change: 1 addition & 0 deletions drivers/usb/host/ohci-sh.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,4 @@ static struct platform_driver ohci_hcd_sh_driver = {
},
};

MODULE_ALIAS("platform:sh_ohci");
1 change: 1 addition & 0 deletions drivers/usb/host/ohci-sm501.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,4 @@ static struct platform_driver ohci_hcd_sm501_driver = {
.name = "sm501-usb",
},
};
MODULE_ALIAS("platform:sm501-usb");
2 changes: 2 additions & 0 deletions drivers/usb/host/r8a66597-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
MODULE_DESCRIPTION("R8A66597 USB Host Controller Driver");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Yoshihiro Shimoda");
MODULE_ALIAS("platform:r8a66597_hcd");

#define DRIVER_VERSION "29 May 2007"

Expand Down Expand Up @@ -2219,6 +2220,7 @@ static struct platform_driver r8a66597_driver = {
.resume = r8a66597_resume,
.driver = {
.name = (char *) hcd_name,
.owner = THIS_MODULE,
},
};

Expand Down
1 change: 1 addition & 0 deletions drivers/usb/host/sl811-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@

MODULE_DESCRIPTION("SL811HS USB Host Controller Driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:sl811-hcd");

#define DRIVER_VERSION "19 May 2005"

Expand Down
1 change: 1 addition & 0 deletions drivers/usb/host/u132-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -3316,3 +3316,4 @@ static void __exit u132_hcd_exit(void)

module_exit(u132_hcd_exit);
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:u132_hcd");

0 comments on commit f4fce61

Please sign in to comment.