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/ssb-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/ssb-hcd.c')
-rw-r--r-- | drivers/usb/host/ssb-hcd.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c index 4dc9a09dc346..79aa95832b26 100644 --- a/drivers/usb/host/ssb-hcd.c +++ b/drivers/usb/host/ssb-hcd.c | |||
@@ -39,7 +39,7 @@ struct ssb_hcd_device { | |||
39 | u32 enable_flags; | 39 | u32 enable_flags; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | static void __devinit ssb_hcd_5354wa(struct ssb_device *dev) | 42 | static void ssb_hcd_5354wa(struct ssb_device *dev) |
43 | { | 43 | { |
44 | #ifdef CONFIG_SSB_DRIVER_MIPS | 44 | #ifdef CONFIG_SSB_DRIVER_MIPS |
45 | /* Work around for 5354 failures */ | 45 | /* Work around for 5354 failures */ |
@@ -53,7 +53,7 @@ static void __devinit ssb_hcd_5354wa(struct ssb_device *dev) | |||
53 | #endif | 53 | #endif |
54 | } | 54 | } |
55 | 55 | ||
56 | static void __devinit ssb_hcd_usb20wa(struct ssb_device *dev) | 56 | static void ssb_hcd_usb20wa(struct ssb_device *dev) |
57 | { | 57 | { |
58 | if (dev->id.coreid == SSB_DEV_USB20_HOST) { | 58 | if (dev->id.coreid == SSB_DEV_USB20_HOST) { |
59 | /* | 59 | /* |
@@ -80,7 +80,7 @@ static void __devinit ssb_hcd_usb20wa(struct ssb_device *dev) | |||
80 | } | 80 | } |
81 | 81 | ||
82 | /* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */ | 82 | /* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */ |
83 | static u32 __devinit ssb_hcd_init_chip(struct ssb_device *dev) | 83 | static u32 ssb_hcd_init_chip(struct ssb_device *dev) |
84 | { | 84 | { |
85 | u32 flags = 0; | 85 | u32 flags = 0; |
86 | 86 | ||
@@ -101,8 +101,7 @@ static const struct usb_ehci_pdata ehci_pdata = { | |||
101 | static const struct usb_ohci_pdata ohci_pdata = { | 101 | static const struct usb_ohci_pdata ohci_pdata = { |
102 | }; | 102 | }; |
103 | 103 | ||
104 | static struct platform_device * __devinit | 104 | static struct platform_device *ssb_hcd_create_pdev(struct ssb_device *dev, bool ohci, u32 addr, u32 len) |
105 | ssb_hcd_create_pdev(struct ssb_device *dev, bool ohci, u32 addr, u32 len) | ||
106 | { | 105 | { |
107 | struct platform_device *hci_dev; | 106 | struct platform_device *hci_dev; |
108 | struct resource hci_res[2]; | 107 | struct resource hci_res[2]; |
@@ -148,7 +147,7 @@ err_alloc: | |||
148 | return ERR_PTR(ret); | 147 | return ERR_PTR(ret); |
149 | } | 148 | } |
150 | 149 | ||
151 | static int __devinit ssb_hcd_probe(struct ssb_device *dev, | 150 | static int ssb_hcd_probe(struct ssb_device *dev, |
152 | const struct ssb_device_id *id) | 151 | const struct ssb_device_id *id) |
153 | { | 152 | { |
154 | int err, tmp; | 153 | int err, tmp; |