From: Yinghai Lu <yinghai@kernel.org>
To: Sarah Sharp <sarah.a.sharp@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: linux-usb@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [RFC PATCH 2/3] usb, PCI: remove disable/enable device with non-xhci quirk
Date: Thu, 1 Mar 2012 11:24:02 -0800 [thread overview]
Message-ID: <1330629843-6027-2-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1330629843-6027-1-git-send-email-yinghai@kernel.org>
| commit cab928ee1f221c9cc48d6615070fefe2e444384a
| USB: Fix handoff when BIOS disables host PCI device.
mention only need to do disable/enable for xhci controller.
So just remove that for non-xhci controller and restore old behavior for them.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/usb/host/pci-quirks.c | 18 ------------------
1 file changed, 18 deletions(-)
Index: linux-2.6/drivers/usb/host/pci-quirks.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/pci-quirks.c
+++ linux-2.6/drivers/usb/host/pci-quirks.c
@@ -889,13 +889,7 @@ static void __devinit quirk_usb_early_ha
if (pdev->vendor == 0x184e) /* vendor Netlogic */
return;
- if (pci_enable_device(pdev) < 0) {
- dev_warn(&pdev->dev, "Can't enable PCI device, "
- "BIOS handoff failed.\n");
- return;
- }
quirk_usb_handoff_uhci(pdev);
- pci_disable_device(pdev);
}
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_early_handoff_uhci);
@@ -908,13 +902,7 @@ static void __devinit quirk_usb_early_ha
if (pdev->vendor == 0x184e) /* vendor Netlogic */
return;
- if (pci_enable_device(pdev) < 0) {
- dev_warn(&pdev->dev, "Can't enable PCI device, "
- "BIOS handoff failed.\n");
- return;
- }
quirk_usb_handoff_ohci(pdev);
- pci_disable_device(pdev);
}
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB_OHCI, 0, quirk_usb_early_handoff_ohci);
@@ -924,13 +912,7 @@ static void __devinit quirk_usb_early_ha
if (pdev->vendor == 0x184e) /* vendor Netlogic */
return;
- if (pci_enable_device(pdev) < 0) {
- dev_warn(&pdev->dev, "Can't enable PCI device, "
- "BIOS handoff failed.\n");
- return;
- }
quirk_usb_handoff_ehci(pdev);
- pci_disable_device(pdev);
}
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB_EHCI, 0, quirk_usb_early_handoff_ehci);
next prev parent reply other threads:[~2012-03-01 19:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-01 19:24 [RFC PATCH 1/3] usb, PCI: split quirk for usb host controller to four Yinghai Lu
2012-03-01 19:24 ` Yinghai Lu [this message]
2012-03-01 20:10 ` [RFC PATCH 2/3] usb, PCI: remove disable/enable device with non-xhci quirk Sarah Sharp
2012-03-02 1:04 ` Yinghai Lu
2012-03-01 19:24 ` [RFC PATCH 3/3] usb, PCI: remove vendor checking for netlogic with uhci/xhci Yinghai Lu
2012-03-02 11:15 ` [RFC PATCH 1/3] usb, PCI: split quirk for usb host controller to four Sergei Shtylyov
2012-03-02 16:34 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330629843-6027-2-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sarah.a.sharp@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).