From 56af79070f73b4dea9ac1ee889058f6fb9c045d8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 May 2012 08:54:43 -0700 Subject: [PATCH] --- yaml --- r: 304006 b: refs/heads/master c: 8e192910d96615a32646b8978b201b650f62ef34 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-hcd.c | 2 +- trunk/drivers/usb/host/ehci-pci.c | 7 ------- trunk/drivers/usb/host/ehci.h | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 819fa82ff84b..4e5a2f4f8e6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3ad558fcd5b88cba406ad099a596ebec6b3d2ee +refs/heads/master: 8e192910d96615a32646b8978b201b650f62ef34 diff --git a/trunk/drivers/usb/host/ehci-hcd.c b/trunk/drivers/usb/host/ehci-hcd.c index 5597e6099592..b100f5f9f4b6 100644 --- a/trunk/drivers/usb/host/ehci-hcd.c +++ b/trunk/drivers/usb/host/ehci-hcd.c @@ -638,7 +638,7 @@ static int ehci_init(struct usb_hcd *hcd) INIT_LIST_HEAD(&ehci->cached_itd_list); INIT_LIST_HEAD(&ehci->cached_sitd_list); - if (HCC_PGM_FRAMELISTLEN(hcc_params) && !ehci->sched_size_bug) { + if (HCC_PGM_FRAMELISTLEN(hcc_params)) { /* periodic schedule size can be smaller than default */ switch (EHCI_TUNE_FLS) { case 0: ehci->periodic_size = 1024; break; diff --git a/trunk/drivers/usb/host/ehci-pci.c b/trunk/drivers/usb/host/ehci-pci.c index 4baafa3e80b2..bc94d7bf072d 100644 --- a/trunk/drivers/usb/host/ehci-pci.c +++ b/trunk/drivers/usb/host/ehci-pci.c @@ -97,13 +97,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) break; } break; - - case PCI_VENDOR_ID_PHILIPS: - /* - * Philips controllers set HCC_PGM_FRAMELISTLEN, but - * they don't implement schedule sizes shorter than 1024. - */ - ehci->sched_size_bug = 1; } /* cache this readonly data; minimize chip reads */ diff --git a/trunk/drivers/usb/host/ehci.h b/trunk/drivers/usb/host/ehci.h index 2a6652fd5400..2694ed6558d2 100644 --- a/trunk/drivers/usb/host/ehci.h +++ b/trunk/drivers/usb/host/ehci.h @@ -149,7 +149,6 @@ struct ehci_hcd { /* one per controller */ unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ - unsigned sched_size_bug:1; /* Philips */ /* required for usb32 quirk */ #define OHCI_CTRL_HCFS (3 << 6)