diff options
author | Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> | 2009-06-10 00:38:54 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 02:47:24 -0400 |
commit | 03fa68c245cccbcb99035cbabaa13b408ba91ab5 (patch) | |
tree | b6190d60db6302fd9b84c3aac50bf75b7351f70c /drivers/usb/host/ehci-ps3.c | |
parent | 9f08e9db84c1e9234e07b9b595f5b2508c621823 (diff) |
ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Geoff Levand <geoffrey.levand@am.sony.com>
Cc: Jim Paris <jim@jtan.com>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/usb/host/ehci-ps3.c')
-rw-r--r-- | drivers/usb/host/ehci-ps3.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c index 1ba9f9a8c308..bb870b8f81bc 100644 --- a/drivers/usb/host/ehci-ps3.c +++ b/drivers/usb/host/ehci-ps3.c | |||
@@ -162,7 +162,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) | |||
162 | dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, | 162 | dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, |
163 | (unsigned long)virq); | 163 | (unsigned long)virq); |
164 | 164 | ||
165 | ps3_system_bus_set_driver_data(dev, hcd); | 165 | ps3_system_bus_set_drvdata(dev, hcd); |
166 | 166 | ||
167 | result = usb_add_hcd(hcd, virq, IRQF_DISABLED); | 167 | result = usb_add_hcd(hcd, virq, IRQF_DISABLED); |
168 | 168 | ||
@@ -195,8 +195,7 @@ fail_start: | |||
195 | static int ps3_ehci_remove(struct ps3_system_bus_device *dev) | 195 | static int ps3_ehci_remove(struct ps3_system_bus_device *dev) |
196 | { | 196 | { |
197 | unsigned int tmp; | 197 | unsigned int tmp; |
198 | struct usb_hcd *hcd = | 198 | struct usb_hcd *hcd = ps3_system_bus_get_drvdata(dev); |
199 | (struct usb_hcd *)ps3_system_bus_get_driver_data(dev); | ||
200 | 199 | ||
201 | BUG_ON(!hcd); | 200 | BUG_ON(!hcd); |
202 | 201 | ||
@@ -208,7 +207,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev) | |||
208 | ehci_shutdown(hcd); | 207 | ehci_shutdown(hcd); |
209 | usb_remove_hcd(hcd); | 208 | usb_remove_hcd(hcd); |
210 | 209 | ||
211 | ps3_system_bus_set_driver_data(dev, NULL); | 210 | ps3_system_bus_set_drvdata(dev, NULL); |
212 | 211 | ||
213 | BUG_ON(!hcd->regs); | 212 | BUG_ON(!hcd->regs); |
214 | iounmap(hcd->regs); | 213 | iounmap(hcd->regs); |