diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-ppc-of.c | 6 | ||||
-rw-r--r-- | drivers/usb/host/ehci-xilinx-of.c | 12 | ||||
-rw-r--r-- | drivers/usb/host/fhci-hcd.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/isp1760-if.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-ppc-of.c | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c index 5aec92866ab3..335ee699fd85 100644 --- a/drivers/usb/host/ehci-ppc-of.c +++ b/drivers/usb/host/ehci-ppc-of.c | |||
@@ -106,7 +106,7 @@ ppc44x_enable_bmt(struct device_node *dn) | |||
106 | 106 | ||
107 | 107 | ||
108 | static int __devinit | 108 | static int __devinit |
109 | ehci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) | 109 | ehci_hcd_ppc_of_probe(struct platform_device *op, const struct of_device_id *match) |
110 | { | 110 | { |
111 | struct device_node *dn = op->dev.of_node; | 111 | struct device_node *dn = op->dev.of_node; |
112 | struct usb_hcd *hcd; | 112 | struct usb_hcd *hcd; |
@@ -210,7 +210,7 @@ err_rmr: | |||
210 | } | 210 | } |
211 | 211 | ||
212 | 212 | ||
213 | static int ehci_hcd_ppc_of_remove(struct of_device *op) | 213 | static int ehci_hcd_ppc_of_remove(struct platform_device *op) |
214 | { | 214 | { |
215 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); | 215 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); |
216 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 216 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
@@ -253,7 +253,7 @@ static int ehci_hcd_ppc_of_remove(struct of_device *op) | |||
253 | } | 253 | } |
254 | 254 | ||
255 | 255 | ||
256 | static int ehci_hcd_ppc_of_shutdown(struct of_device *op) | 256 | static int ehci_hcd_ppc_of_shutdown(struct platform_device *op) |
257 | { | 257 | { |
258 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); | 258 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); |
259 | 259 | ||
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c index 4899f451add9..6c8076ad821d 100644 --- a/drivers/usb/host/ehci-xilinx-of.c +++ b/drivers/usb/host/ehci-xilinx-of.c | |||
@@ -140,7 +140,7 @@ static const struct hc_driver ehci_xilinx_of_hc_driver = { | |||
140 | 140 | ||
141 | /** | 141 | /** |
142 | * ehci_hcd_xilinx_of_probe - Probe method for the USB host controller | 142 | * ehci_hcd_xilinx_of_probe - Probe method for the USB host controller |
143 | * @op: pointer to the of_device to which the host controller bound | 143 | * @op: pointer to the platform_device bound to the host controller |
144 | * @match: pointer to of_device_id structure, not used | 144 | * @match: pointer to of_device_id structure, not used |
145 | * | 145 | * |
146 | * This function requests resources and sets up appropriate properties for the | 146 | * This function requests resources and sets up appropriate properties for the |
@@ -149,7 +149,7 @@ static const struct hc_driver ehci_xilinx_of_hc_driver = { | |||
149 | * entry, and sets an appropriate value for hcd->has_tt. | 149 | * entry, and sets an appropriate value for hcd->has_tt. |
150 | */ | 150 | */ |
151 | static int __devinit | 151 | static int __devinit |
152 | ehci_hcd_xilinx_of_probe(struct of_device *op, const struct of_device_id *match) | 152 | ehci_hcd_xilinx_of_probe(struct platform_device *op, const struct of_device_id *match) |
153 | { | 153 | { |
154 | struct device_node *dn = op->dev.of_node; | 154 | struct device_node *dn = op->dev.of_node; |
155 | struct usb_hcd *hcd; | 155 | struct usb_hcd *hcd; |
@@ -242,12 +242,12 @@ err_rmr: | |||
242 | 242 | ||
243 | /** | 243 | /** |
244 | * ehci_hcd_xilinx_of_remove - shutdown hcd and release resources | 244 | * ehci_hcd_xilinx_of_remove - shutdown hcd and release resources |
245 | * @op: pointer to of_device structure that is to be removed | 245 | * @op: pointer to platform_device structure that is to be removed |
246 | * | 246 | * |
247 | * Remove the hcd structure, and release resources that has been requested | 247 | * Remove the hcd structure, and release resources that has been requested |
248 | * during probe. | 248 | * during probe. |
249 | */ | 249 | */ |
250 | static int ehci_hcd_xilinx_of_remove(struct of_device *op) | 250 | static int ehci_hcd_xilinx_of_remove(struct platform_device *op) |
251 | { | 251 | { |
252 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); | 252 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); |
253 | dev_set_drvdata(&op->dev, NULL); | 253 | dev_set_drvdata(&op->dev, NULL); |
@@ -266,11 +266,11 @@ static int ehci_hcd_xilinx_of_remove(struct of_device *op) | |||
266 | 266 | ||
267 | /** | 267 | /** |
268 | * ehci_hcd_xilinx_of_shutdown - shutdown the hcd | 268 | * ehci_hcd_xilinx_of_shutdown - shutdown the hcd |
269 | * @op: pointer to of_device structure that is to be removed | 269 | * @op: pointer to platform_device structure that is to be removed |
270 | * | 270 | * |
271 | * Properly shutdown the hcd, call driver's shutdown routine. | 271 | * Properly shutdown the hcd, call driver's shutdown routine. |
272 | */ | 272 | */ |
273 | static int ehci_hcd_xilinx_of_shutdown(struct of_device *op) | 273 | static int ehci_hcd_xilinx_of_shutdown(struct platform_device *op) |
274 | { | 274 | { |
275 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); | 275 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); |
276 | 276 | ||
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index c7c8392a88b9..20092a27a1e8 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c | |||
@@ -561,7 +561,7 @@ static const struct hc_driver fhci_driver = { | |||
561 | .hub_control = fhci_hub_control, | 561 | .hub_control = fhci_hub_control, |
562 | }; | 562 | }; |
563 | 563 | ||
564 | static int __devinit of_fhci_probe(struct of_device *ofdev, | 564 | static int __devinit of_fhci_probe(struct platform_device *ofdev, |
565 | const struct of_device_id *ofid) | 565 | const struct of_device_id *ofid) |
566 | { | 566 | { |
567 | struct device *dev = &ofdev->dev; | 567 | struct device *dev = &ofdev->dev; |
@@ -801,7 +801,7 @@ static int __devexit fhci_remove(struct device *dev) | |||
801 | return 0; | 801 | return 0; |
802 | } | 802 | } |
803 | 803 | ||
804 | static int __devexit of_fhci_remove(struct of_device *ofdev) | 804 | static int __devexit of_fhci_remove(struct platform_device *ofdev) |
805 | { | 805 | { |
806 | return fhci_remove(&ofdev->dev); | 806 | return fhci_remove(&ofdev->dev); |
807 | } | 807 | } |
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index ec85d0c3cc3e..3b28dbfca058 100644 --- a/drivers/usb/host/isp1760-if.c +++ b/drivers/usb/host/isp1760-if.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #ifdef CONFIG_PPC_OF | 29 | #ifdef CONFIG_PPC_OF |
30 | static int of_isp1760_probe(struct of_device *dev, | 30 | static int of_isp1760_probe(struct platform_device *dev, |
31 | const struct of_device_id *match) | 31 | const struct of_device_id *match) |
32 | { | 32 | { |
33 | struct usb_hcd *hcd; | 33 | struct usb_hcd *hcd; |
@@ -95,7 +95,7 @@ release_reg: | |||
95 | return ret; | 95 | return ret; |
96 | } | 96 | } |
97 | 97 | ||
98 | static int of_isp1760_remove(struct of_device *dev) | 98 | static int of_isp1760_remove(struct platform_device *dev) |
99 | { | 99 | { |
100 | struct usb_hcd *hcd = dev_get_drvdata(&dev->dev); | 100 | struct usb_hcd *hcd = dev_get_drvdata(&dev->dev); |
101 | 101 | ||
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index df165917412a..b2c2dbf08766 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
@@ -81,7 +81,7 @@ static const struct hc_driver ohci_ppc_of_hc_driver = { | |||
81 | 81 | ||
82 | 82 | ||
83 | static int __devinit | 83 | static int __devinit |
84 | ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) | 84 | ohci_hcd_ppc_of_probe(struct platform_device *op, const struct of_device_id *match) |
85 | { | 85 | { |
86 | struct device_node *dn = op->dev.of_node; | 86 | struct device_node *dn = op->dev.of_node; |
87 | struct usb_hcd *hcd; | 87 | struct usb_hcd *hcd; |
@@ -183,7 +183,7 @@ err_rmr: | |||
183 | return rv; | 183 | return rv; |
184 | } | 184 | } |
185 | 185 | ||
186 | static int ohci_hcd_ppc_of_remove(struct of_device *op) | 186 | static int ohci_hcd_ppc_of_remove(struct platform_device *op) |
187 | { | 187 | { |
188 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); | 188 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); |
189 | dev_set_drvdata(&op->dev, NULL); | 189 | dev_set_drvdata(&op->dev, NULL); |
@@ -201,7 +201,7 @@ static int ohci_hcd_ppc_of_remove(struct of_device *op) | |||
201 | return 0; | 201 | return 0; |
202 | } | 202 | } |
203 | 203 | ||
204 | static int ohci_hcd_ppc_of_shutdown(struct of_device *op) | 204 | static int ohci_hcd_ppc_of_shutdown(struct platform_device *op) |
205 | { | 205 | { |
206 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); | 206 | struct usb_hcd *hcd = dev_get_drvdata(&op->dev); |
207 | 207 | ||