|
@@ -404,7 +404,7 @@ static int ohci_pxa_of_init(struct platform_device *pdev)
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * usb_hcd_pxa27x_probe - initialize pxa27x-based HCDs
|
|
|
+ * ohci_hcd_pxa27x_probe - initialize pxa27x-based HCDs
|
|
|
* Context: !in_interrupt()
|
|
|
*
|
|
|
* Allocates basic resources for this USB host controller, and
|
|
@@ -412,7 +412,7 @@ static int ohci_pxa_of_init(struct platform_device *pdev)
|
|
|
* through the hotplug entry's driver_data.
|
|
|
*
|
|
|
*/
|
|
|
-int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device *pdev)
|
|
|
+static int ohci_hcd_pxa27x_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
int retval, irq;
|
|
|
struct usb_hcd *hcd;
|
|
@@ -442,7 +442,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
|
|
|
if (IS_ERR(usb_clk))
|
|
|
return PTR_ERR(usb_clk);
|
|
|
|
|
|
- hcd = usb_create_hcd (driver, &pdev->dev, "pxa27x");
|
|
|
+ hcd = usb_create_hcd(&ohci_pxa27x_hc_driver, &pdev->dev, "pxa27x");
|
|
|
if (!hcd)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -503,17 +503,18 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
|
|
|
/* may be called with controller, bus, and devices active */
|
|
|
|
|
|
/**
|
|
|
- * usb_hcd_pxa27x_remove - shutdown processing for pxa27x-based HCDs
|
|
|
+ * ohci_hcd_pxa27x_remove - shutdown processing for pxa27x-based HCDs
|
|
|
* @dev: USB Host Controller being removed
|
|
|
* Context: !in_interrupt()
|
|
|
*
|
|
|
- * Reverses the effect of usb_hcd_pxa27x_probe(), first invoking
|
|
|
+ * Reverses the effect of ohci_hcd_pxa27x_probe(), first invoking
|
|
|
* the HCD's stop() method. It is always called from a thread
|
|
|
* context, normally "rmmod", "apmd", or something similar.
|
|
|
*
|
|
|
*/
|
|
|
-void usb_hcd_pxa27x_remove (struct usb_hcd *hcd, struct platform_device *pdev)
|
|
|
+static int ohci_hcd_pxa27x_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
|
|
|
struct pxa27x_ohci *pxa_ohci = to_pxa27x_ohci(hcd);
|
|
|
unsigned int i;
|
|
|
|
|
@@ -524,28 +525,11 @@ void usb_hcd_pxa27x_remove (struct usb_hcd *hcd, struct platform_device *pdev)
|
|
|
pxa27x_ohci_set_vbus_power(pxa_ohci, i, false);
|
|
|
|
|
|
usb_put_hcd(hcd);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
-static int ohci_hcd_pxa27x_drv_probe(struct platform_device *pdev)
|
|
|
-{
|
|
|
- pr_debug ("In ohci_hcd_pxa27x_drv_probe");
|
|
|
-
|
|
|
- if (usb_disabled())
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
- return usb_hcd_pxa27x_probe(&ohci_pxa27x_hc_driver, pdev);
|
|
|
-}
|
|
|
-
|
|
|
-static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct usb_hcd *hcd = platform_get_drvdata(pdev);
|
|
|
-
|
|
|
- usb_hcd_pxa27x_remove(hcd, pdev);
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
#ifdef CONFIG_PM
|
|
|
static int ohci_hcd_pxa27x_drv_suspend(struct device *dev)
|
|
|
{
|
|
@@ -598,8 +582,8 @@ static const struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
|
|
|
#endif
|
|
|
|
|
|
static struct platform_driver ohci_hcd_pxa27x_driver = {
|
|
|
- .probe = ohci_hcd_pxa27x_drv_probe,
|
|
|
- .remove = ohci_hcd_pxa27x_drv_remove,
|
|
|
+ .probe = ohci_hcd_pxa27x_probe,
|
|
|
+ .remove = ohci_hcd_pxa27x_remove,
|
|
|
.shutdown = usb_hcd_platform_shutdown,
|
|
|
.driver = {
|
|
|
.name = "pxa27x-ohci",
|