diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:48 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 16:27:16 -0500 |
commit | 41ac7b3ab7fe1d6175839947a877fdf95cbd2211 (patch) | |
tree | 99cfe77797b6822424e37e365297d991e0800ab6 /drivers/usb/host/bcma-hcd.c | |
parent | 7690417db5085f0de03aa70b8ca01b0118e8a1b4 (diff) |
usb: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Li Yang <leoli@freescale.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Geoff Levand <geoff@infradead.org>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Olav Kongas <ok@artecdesign.ee>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/bcma-hcd.c')
-rw-r--r-- | drivers/usb/host/bcma-hcd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c index f5143a066add..8c83ed90acba 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c | |||
@@ -54,7 +54,7 @@ static int bcma_wait_bits(struct bcma_device *dev, u16 reg, u32 bitmask, | |||
54 | return -ETIMEDOUT; | 54 | return -ETIMEDOUT; |
55 | } | 55 | } |
56 | 56 | ||
57 | static void __devinit bcma_hcd_4716wa(struct bcma_device *dev) | 57 | static void bcma_hcd_4716wa(struct bcma_device *dev) |
58 | { | 58 | { |
59 | #ifdef CONFIG_BCMA_DRIVER_MIPS | 59 | #ifdef CONFIG_BCMA_DRIVER_MIPS |
60 | /* Work around for 4716 failures. */ | 60 | /* Work around for 4716 failures. */ |
@@ -88,7 +88,7 @@ static void __devinit bcma_hcd_4716wa(struct bcma_device *dev) | |||
88 | } | 88 | } |
89 | 89 | ||
90 | /* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */ | 90 | /* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */ |
91 | static void __devinit bcma_hcd_init_chip(struct bcma_device *dev) | 91 | static void bcma_hcd_init_chip(struct bcma_device *dev) |
92 | { | 92 | { |
93 | u32 tmp; | 93 | u32 tmp; |
94 | 94 | ||
@@ -165,8 +165,7 @@ static const struct usb_ehci_pdata ehci_pdata = { | |||
165 | static const struct usb_ohci_pdata ohci_pdata = { | 165 | static const struct usb_ohci_pdata ohci_pdata = { |
166 | }; | 166 | }; |
167 | 167 | ||
168 | static struct platform_device * __devinit | 168 | static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, bool ohci, u32 addr) |
169 | bcma_hcd_create_pdev(struct bcma_device *dev, bool ohci, u32 addr) | ||
170 | { | 169 | { |
171 | struct platform_device *hci_dev; | 170 | struct platform_device *hci_dev; |
172 | struct resource hci_res[2]; | 171 | struct resource hci_res[2]; |
@@ -212,7 +211,7 @@ err_alloc: | |||
212 | return ERR_PTR(ret); | 211 | return ERR_PTR(ret); |
213 | } | 212 | } |
214 | 213 | ||
215 | static int __devinit bcma_hcd_probe(struct bcma_device *dev) | 214 | static int bcma_hcd_probe(struct bcma_device *dev) |
216 | { | 215 | { |
217 | int err; | 216 | int err; |
218 | u16 chipid_top; | 217 | u16 chipid_top; |