aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-07-30 09:57:31 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-30 09:57:31 -0700
commit5499635960459eddc3d9a453535043f425151df3 (patch)
treee7558ad06314b937bd8076f7f4bcbda46608eff0 /usb
parent9ae1296a9c904f627ccee652380dcd681549f68a (diff)
downloadpatches-5499635960459eddc3d9a453535043f425151df3.tar.gz
remove driver core patches now in mainline.
Also add a hv patch and update the usb-au1xx patch
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-au1xxx-add-dev_pm_ops.patch67
1 files changed, 35 insertions, 32 deletions
diff --git a/usb/usb-au1xxx-add-dev_pm_ops.patch b/usb/usb-au1xxx-add-dev_pm_ops.patch
index 98765105caff55..00d6eb040c49e8 100644
--- a/usb/usb-au1xxx-add-dev_pm_ops.patch
+++ b/usb/usb-au1xxx-add-dev_pm_ops.patch
@@ -1,10 +1,10 @@
-From manuel.lauss@googlemail.com Mon Jul 27 08:43:15 2009
+From manuel.lauss@googlemail.com Thu Jul 30 09:20:41 2009
From: Manuel Lauss <manuel.lauss@googlemail.com>
-Date: Mon, 20 Jul 2009 20:45:51 +0200
+Date: Wed, 29 Jul 2009 19:13:13 +0200
Subject: USB: au1xxx: add dev_pm_ops
-To: linux-usb@vger.kernel.org
+To: Greg KH <greg@kroah.com>, linux-usb@vger.kernel.org
Cc: Manuel Lauss <manuel.lauss@gmail.com>
-Message-ID: <1248115551-20103-1-git-send-email-manuel.lauss@gmail.com>
+Message-ID: <1248887593-30007-1-git-send-email-manuel.lauss@gmail.com>
move both ohci-au1xxx and ehci-au1xxx over to dev_pm_ops.
@@ -12,23 +12,19 @@ move both ohci-au1xxx and ehci-au1xxx over to dev_pm_ops.
Tested on Au1200.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
-Cc: David Brownell <dbrownell@users.sourceforge.net>
-Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
---
- drivers/usb/host/ehci-au1xxx.c | 28 +++++++++-------------------
- drivers/usb/host/ohci-au1xxx.c | 26 ++++++++++----------------
- 2 files changed, 19 insertions(+), 35 deletions(-)
+ drivers/usb/host/ehci-au1xxx.c | 29 +++++++++++++----------------
+ drivers/usb/host/ohci-au1xxx.c | 27 ++++++++++++++-------------
+ 2 files changed, 27 insertions(+), 29 deletions(-)
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
-@@ -198,11 +198,9 @@ static int ehci_hcd_au1xxx_drv_remove(st
- return 0;
+@@ -199,10 +199,9 @@ static int ehci_hcd_au1xxx_drv_remove(st
}
--#ifdef CONFIG_PM
+ #ifdef CONFIG_PM
-static int ehci_hcd_au1xxx_drv_suspend(struct platform_device *pdev,
- pm_message_t message)
+static int ehci_hcd_au1xxx_drv_suspend(struct device *dev)
@@ -38,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
unsigned long flags;
int rc;
-@@ -229,12 +227,6 @@ static int ehci_hcd_au1xxx_drv_suspend(s
+@@ -229,12 +228,6 @@ static int ehci_hcd_au1xxx_drv_suspend(s
ehci_writel(ehci, 0, &ehci->regs->intr_enable);
(void)ehci_readl(ehci, &ehci->regs->intr_enable);
@@ -51,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
au1xxx_stop_ehc();
-@@ -248,10 +240,9 @@ bail:
+@@ -248,10 +241,9 @@ bail:
return rc;
}
@@ -64,18 +60,22 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
au1xxx_start_ehc();
-@@ -305,20 +296,19 @@ static int ehci_hcd_au1xxx_drv_resume(st
+@@ -305,20 +297,25 @@ static int ehci_hcd_au1xxx_drv_resume(st
return 0;
}
--#else
--#define ehci_hcd_au1xxx_drv_suspend NULL
--#define ehci_hcd_au1xxx_drv_resume NULL
--#endif
+static struct dev_pm_ops au1xxx_ehci_pmops = {
+ .suspend = ehci_hcd_au1xxx_drv_suspend,
+ .resume = ehci_hcd_au1xxx_drv_resume,
+};
++
++#define AU1XXX_EHCI_PMOPS &au1xxx_ehci_pmops
++
+ #else
+-#define ehci_hcd_au1xxx_drv_suspend NULL
+-#define ehci_hcd_au1xxx_drv_resume NULL
++#define AU1XXX_EHCI_PMOPS NULL
+ #endif
static struct platform_driver ehci_hcd_au1xxx_driver = {
.probe = ehci_hcd_au1xxx_drv_probe,
@@ -86,17 +86,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.driver = {
.name = "au1xxx-ehci",
.owner = THIS_MODULE,
-+ .pm = &au1xxx_ehci_pmops,
++ .pm = AU1XXX_EHCI_PMOPS,
}
};
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
-@@ -247,11 +247,9 @@ static int ohci_hcd_au1xxx_drv_remove(st
- return 0;
+@@ -248,10 +248,9 @@ static int ohci_hcd_au1xxx_drv_remove(st
}
--#ifdef CONFIG_PM
+ #ifdef CONFIG_PM
-static int ohci_hcd_au1xxx_drv_suspend(struct platform_device *pdev,
- pm_message_t message)
+static int ohci_hcd_au1xxx_drv_suspend(struct device *dev)
@@ -106,7 +105,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
unsigned long flags;
int rc;
-@@ -274,10 +272,6 @@ static int ohci_hcd_au1xxx_drv_suspend(s
+@@ -274,10 +273,6 @@ static int ohci_hcd_au1xxx_drv_suspend(s
ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
(void)ohci_readl(ohci, &ohci->regs->intrdisable);
@@ -117,7 +116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
au1xxx_stop_ohc();
-@@ -287,9 +281,9 @@ bail:
+@@ -287,9 +282,9 @@ bail:
return rc;
}
@@ -129,19 +128,23 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
au1xxx_start_ohc();
-@@ -298,20 +292,20 @@ static int ohci_hcd_au1xxx_drv_resume(st
+@@ -298,20 +293,26 @@ static int ohci_hcd_au1xxx_drv_resume(st
return 0;
}
--#else
--#define ohci_hcd_au1xxx_drv_suspend NULL
--#define ohci_hcd_au1xxx_drv_resume NULL
--#endif
+
+static struct dev_pm_ops au1xxx_ohci_pmops = {
+ .suspend = ohci_hcd_au1xxx_drv_suspend,
+ .resume = ohci_hcd_au1xxx_drv_resume,
+};
++
++#define AU1XXX_OHCI_PMOPS &au1xxx_ohci_pmops
++
+ #else
+-#define ohci_hcd_au1xxx_drv_suspend NULL
+-#define ohci_hcd_au1xxx_drv_resume NULL
++#define AU1XXX_OHCI_PMOPS NULL
+ #endif
static struct platform_driver ohci_hcd_au1xxx_driver = {
.probe = ohci_hcd_au1xxx_drv_probe,
@@ -152,7 +155,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.driver = {
.name = "au1xxx-ohci",
.owner = THIS_MODULE,
-+ .pm = &au1xxx_ohci_pmops,
++ .pm = AU1XXX_OHCI_PMOPS,
},
};
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:20:47 +0000