This resolves some version skew issues with the AT91 USB support.
AT91: the two USB drivers (OHCI, UDC) got out of sync with various
usbcore and driver model PM updates; fix.
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Index: g26/drivers/usb/gadget/at91_udc.c
===================================================================
--- g26.orig/drivers/usb/gadget/at91_udc.c 2006-04-02 11:06:30.000000000 -0700
+++ g26/drivers/usb/gadget/at91_udc.c 2006-04-02 11:16:57.000000000 -0700
@@ -1709,7 +1709,7 @@ static int __devexit at91udc_remove(stru
}
#ifdef CONFIG_PM
-static int at91udc_suspend(struct platform_device *dev, u32 state, u32 level)
+static int at91udc_suspend(struct platform_device *dev, pm_message_t mesg)
{
struct at91_udc *udc = platform_get_drvdata(dev);
@@ -1731,7 +1731,7 @@ static int at91udc_suspend(struct platfo
return 0;
}
-static int at91udc_resume(struct platform_device *dev, u32 level)
+static int at91udc_resume(struct platform_device *dev)
{
struct at91_udc *udc = platform_get_drvdata(dev);
Index: g26/drivers/usb/host/ohci-at91.c
===================================================================
--- g26.orig/drivers/usb/host/ohci-at91.c 2006-04-02 11:06:30.000000000 -0700
+++ g26/drivers/usb/host/ohci-at91.c 2006-04-02 11:16:57.000000000 -0700
@@ -235,8 +235,8 @@ static const struct hc_driver ohci_at91_
.hub_control = ohci_hub_control,
#ifdef CONFIG_PM
- .hub_suspend = ohci_hub_suspend,
- .hub_resume = ohci_hub_resume,
+ .bus_suspend = ohci_bus_suspend,
+ .bus_resume = ohci_bus_resume,
#endif
.start_port_reset = ohci_start_port_reset,
};
@@ -254,7 +254,8 @@ static int ohci_hcd_at91_drv_remove(stru
}
#ifdef CONFIG_PM
-static int ohci_hcd_at91_drv_suspend(struct platform_device *dev, u32 state, u32 level)
+static int
+ohci_hcd_at91_drv_suspend(struct platform_device *dev, pm_message_t mesg)
{
printk("%s(%s:%d): not implemented yet\n",
__func__, __FILE__, __LINE__);
@@ -264,7 +265,7 @@ static int ohci_hcd_at91_drv_suspend(str
return 0;
}
-static int ohci_hcd_at91_drv_resume(struct platform_device *dev, u32 state)
+static int ohci_hcd_at91_drv_resume(struct platform_device *dev)
{
printk("%s(%s:%d): not implemented yet\n",
__func__, __FILE__, __LINE__);
