mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +00:00
usb: remove use of __devinitconst
CONFIG_HOTPLUG is going away as an option so __devinitconst is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Li Yang <leoli@freescale.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d3608b6daf
commit
2f82686e8c
@ -2710,7 +2710,7 @@ static int __devexit qe_udc_remove(struct platform_device *ofdev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------*/
|
||||||
static const struct of_device_id qe_udc_match[] __devinitconst = {
|
static const struct of_device_id qe_udc_match[] = {
|
||||||
{
|
{
|
||||||
.compatible = "fsl,mpc8323-qe-usb",
|
.compatible = "fsl,mpc8323-qe-usb",
|
||||||
.data = (void *)PORT_QE,
|
.data = (void *)PORT_QE,
|
||||||
|
@ -305,7 +305,7 @@ static int bcma_hcd_resume(struct bcma_device *dev)
|
|||||||
#define bcma_hcd_resume NULL
|
#define bcma_hcd_resume NULL
|
||||||
#endif /* CONFIG_PM */
|
#endif /* CONFIG_PM */
|
||||||
|
|
||||||
static const struct bcma_device_id bcma_hcd_table[] __devinitconst = {
|
static const struct bcma_device_id bcma_hcd_table[] = {
|
||||||
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
|
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
|
||||||
BCMA_CORETABLE_END
|
BCMA_CORETABLE_END
|
||||||
};
|
};
|
||||||
|
@ -533,7 +533,7 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev)
|
|||||||
iounmap(base);
|
iounmap(base);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct dmi_system_id __devinitconst ehci_dmi_nohandoff_table[] = {
|
static const struct dmi_system_id ehci_dmi_nohandoff_table[] = {
|
||||||
{
|
{
|
||||||
/* Pegatron Lucid (ExoPC) */
|
/* Pegatron Lucid (ExoPC) */
|
||||||
.matches = {
|
.matches = {
|
||||||
|
@ -248,7 +248,7 @@ static int ssb_hcd_resume(struct ssb_device *dev)
|
|||||||
#define ssb_hcd_resume NULL
|
#define ssb_hcd_resume NULL
|
||||||
#endif /* CONFIG_PM */
|
#endif /* CONFIG_PM */
|
||||||
|
|
||||||
static const struct ssb_device_id ssb_hcd_table[] __devinitconst = {
|
static const struct ssb_device_id ssb_hcd_table[] = {
|
||||||
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
|
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
|
||||||
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
|
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
|
||||||
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
|
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
|
||||||
|
@ -716,7 +716,7 @@ static int dsps_resume(struct device *dev)
|
|||||||
|
|
||||||
static SIMPLE_DEV_PM_OPS(dsps_pm_ops, dsps_suspend, dsps_resume);
|
static SIMPLE_DEV_PM_OPS(dsps_pm_ops, dsps_suspend, dsps_resume);
|
||||||
|
|
||||||
static const struct dsps_musb_wrapper ti81xx_driver_data __devinitconst = {
|
static const struct dsps_musb_wrapper ti81xx_driver_data = {
|
||||||
.revision = 0x00,
|
.revision = 0x00,
|
||||||
.control = 0x14,
|
.control = 0x14,
|
||||||
.status = 0x18,
|
.status = 0x18,
|
||||||
@ -747,7 +747,7 @@ static const struct dsps_musb_wrapper ti81xx_driver_data __devinitconst = {
|
|||||||
.instances = 1,
|
.instances = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct platform_device_id musb_dsps_id_table[] __devinitconst = {
|
static const struct platform_device_id musb_dsps_id_table[] = {
|
||||||
{
|
{
|
||||||
.name = "musb-ti81xx",
|
.name = "musb-ti81xx",
|
||||||
.driver_data = (kernel_ulong_t) &ti81xx_driver_data,
|
.driver_data = (kernel_ulong_t) &ti81xx_driver_data,
|
||||||
@ -757,7 +757,7 @@ static const struct platform_device_id musb_dsps_id_table[] __devinitconst = {
|
|||||||
MODULE_DEVICE_TABLE(platform, musb_dsps_id_table);
|
MODULE_DEVICE_TABLE(platform, musb_dsps_id_table);
|
||||||
|
|
||||||
#ifdef CONFIG_OF
|
#ifdef CONFIG_OF
|
||||||
static const struct of_device_id musb_dsps_of_match[] __devinitconst = {
|
static const struct of_device_id musb_dsps_of_match[] = {
|
||||||
{ .compatible = "ti,musb-am33xx",
|
{ .compatible = "ti,musb-am33xx",
|
||||||
.data = (void *) &ti81xx_driver_data, },
|
.data = (void *) &ti81xx_driver_data, },
|
||||||
{ },
|
{ },
|
||||||
|
Loading…
Reference in New Issue
Block a user