From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org,
linux-usb-devel@lists.sourceforge.net
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Alan Stern <stern@rowland.harvard.edu>
Subject: [patch 20/40] USB: remove USB_QUIRK_NO_AUTOSUSPEND
Date: Wed, 14 Nov 2007 22:44:57 -0800 [thread overview]
Message-ID: <20071115064457.GU19218@kroah.com> (raw)
In-Reply-To: <20071115064302.GA19218@kroah.com>
[-- Attachment #1: usb-remove-usb_quirk_no_autosuspend.patch --]
[-- Type: text/plain, Size: 6668 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alan Stern <stern@rowland.harvard.edu>
patch a691efa9888e71232dfb4088fb8a8304ffc7b0f9 in mainline.
This patch (as995) cleans up the remains of the former NO_AUTOSUSPEND
quirk. Since autosuspend is disabled by default, we will let
userspace worry about which devices can safely be suspended. Thus the
lengthy series of quirk entries is no longer needed, and neither is
the quirk ID. I suppose someone might eventually run across a hub
that can't be suspended; let's ignore the possibility for now.
The patch also cleans up the hasty way in which autosuspend gets
disabled. Setting udev->autosuspend_delay to -1 wasn't quite right,
because the value is always supposed to be a multiple of HZ. It's
better to leave the delay value alone and set autosuspend_disabled,
which is what the quirk routine used to do.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/core/quirks.c | 81 ---------------------------------------------
include/linux/usb/quirks.h | 7 +--
2 files changed, 3 insertions(+), 85 deletions(-)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -32,52 +32,6 @@ static const struct usb_device_id usb_qu
{ USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
/* HP 5300/5370C scanner */
{ USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },
- /* Hewlett-Packard PhotoSmart 720 / PhotoSmart 935 (storage) */
- { USB_DEVICE(0x03f0, 0x4002), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
- /* SGS Thomson Microelectronics 4in1 card reader */
- { USB_DEVICE(0x0483, 0x0321), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
- /* Acer Peripherals Inc. (now BenQ Corp.) Prisa 640BU */
- { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Benq S2W 3300U */
- { USB_DEVICE(0x04a5, 0x20b0), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Canon, Inc. CanoScan N1240U/LiDE30 */
- { USB_DEVICE(0x04a9, 0x220e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Canon, Inc. CanoScan N650U/N656U */
- { USB_DEVICE(0x04a9, 0x2206), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Canon, Inc. CanoScan 1220U */
- { USB_DEVICE(0x04a9, 0x2207), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Canon, Inc. CanoScan N670U/N676U/LiDE 20 */
- { USB_DEVICE(0x04a9, 0x220d), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* old Cannon scanner */
- { USB_DEVICE(0x04a9, 0x2220), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Seiko Epson Corp. Perfection 1200 */
- { USB_DEVICE(0x04b8, 0x0104), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Seiko Epson Corp. Perfection 660 */
- { USB_DEVICE(0x04b8, 0x0114), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Epson Perfection 1260 Photo */
- { USB_DEVICE(0x04b8, 0x011d), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Seiko Epson Corp - Perfection 1670 */
- { USB_DEVICE(0x04b8, 0x011f), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* EPSON Perfection 2480 */
- { USB_DEVICE(0x04b8, 0x0121), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Seiko Epson Corp.*/
- { USB_DEVICE(0x04b8, 0x0122), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Samsung ML-2010 printer */
- { USB_DEVICE(0x04e8, 0x326c), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Samsung ML-2510 Series printer */
- { USB_DEVICE(0x04e8, 0x327e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Elsa MicroLink 56k (V.250) */
- { USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Ultima Electronics Corp.*/
- { USB_DEVICE(0x05d8, 0x4005), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
- /* Genesys USB-to-IDE */
- { USB_DEVICE(0x0503, 0x0702), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
- /* USB Graphical LCD - EEH Datalink GmbH */
- { USB_DEVICE(0x060c, 0x04eb), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
/* INTEL VALUE SSD */
{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
@@ -85,44 +39,15 @@ static const struct usb_device_id usb_qu
/* M-Systems Flash Disk Pioneers */
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Agfa Snapscan1212u */
- { USB_DEVICE(0x06bd, 0x2061), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Seagate RSS LLC */
- { USB_DEVICE(0x0bc2, 0x3000), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- /* Umax [hex] Astra 3400U */
- { USB_DEVICE(0x1606, 0x0060), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
/* Philips PSC805 audio device */
{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Alcor multi-card reader */
- { USB_DEVICE(0x058f, 0x6366), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
- /* Canon EOS 5D in PC Connection mode */
- { USB_DEVICE(0x04a9, 0x3101), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
- /* RIM Blackberry */
- { USB_DEVICE(0x0fca, 0x0001), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- { USB_DEVICE(0x0fca, 0x0004), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
- { USB_DEVICE(0x0fca, 0x0006), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
- /* Apple iPhone */
- { USB_DEVICE(0x05ac, 0x1290), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-
/* SKYMEDI USB_DRIVE */
{ USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME },
{ } /* terminating entry must be last */
};
-static void usb_autosuspend_quirk(struct usb_device *udev)
-{
-#ifdef CONFIG_USB_SUSPEND
- /* disable autosuspend, but allow the user to re-enable it via sysfs */
- udev->autosuspend_disabled = 1;
-#endif
-}
-
static const struct usb_device_id *find_id(struct usb_device *udev)
{
const struct usb_device_id *id = usb_quirk_list;
@@ -149,13 +74,9 @@ void usb_detect_quirks(struct usb_device
dev_dbg(&udev->dev, "USB quirks for this device: %x\n",
udev->quirks);
- /* do any special quirk handling here if needed */
- if (udev->quirks & USB_QUIRK_NO_AUTOSUSPEND)
- usb_autosuspend_quirk(udev);
-
/* By default, disable autosuspend for all non-hubs */
#ifdef CONFIG_USB_SUSPEND
if (udev->descriptor.bDeviceClass != USB_CLASS_HUB)
- udev->autosuspend_delay = -1;
+ udev->autosuspend_disabled = 1;
#endif
}
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -4,11 +4,8 @@
* belong here.
*/
-/* device must not be autosuspended */
-#define USB_QUIRK_NO_AUTOSUSPEND 0x00000001
-
/* string descriptors must not be fetched using a 255-byte read */
-#define USB_QUIRK_STRING_FETCH_255 0x00000002
+#define USB_QUIRK_STRING_FETCH_255 0x00000001
/* device can't resume correctly so reset it instead */
-#define USB_QUIRK_RESET_RESUME 0x00000004
+#define USB_QUIRK_RESET_RESUME 0x00000002
--
next prev parent reply other threads:[~2007-11-15 7:01 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20071115062710.885284510@mini.kroah.org>
2007-11-15 6:43 ` [patch 00/40] 2.6.23-stable review, driver (sans network) changes Greg Kroah-Hartman
2007-11-15 6:43 ` [patch 01/40] POWERPC: Fix platinumfb framebuffer Greg Kroah-Hartman
2007-11-15 6:43 ` [patch 02/40] i915: fix vbl swap allocation size Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 03/40] hwmon/w83627hf: Fix setting fan min right after driver load Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 04/40] hwmon/w83627hf: Dont assume bank 0 Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 05/40] hwmon/lm87: Fix a division by zero Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 06/40] hwmon/lm87: Disable VID when it should be Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 07/40] IB/uverbs: Fix checking of userspace object ownership Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 08/40] IB/mthca: Use mmiowb() to avoid firmware commands getting jumbled up Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 09/40] ALSA: hda-codec - Avoid zero NID in line_out_pinsof STAC codecs Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 10/40] ALSA: fix selector unit bug affecting some USB speakerphones Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 11/40] ALSA: Fix build error without CONFIG_HAS_DMA Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 12/40] ALSA: emu10k1 - Fix memory corruption Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 13/40] ALSA: hdsp - Fix zero division Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 14/40] libata: sync NCQ blacklist with upstream Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 15/40] dm delay: fix status Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 16/40] dm: fix thaw_bdev Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 17/40] md: fix an unsigned compare to allow creation of bitmaps with v1.0 metadata Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 18/40] md: raid5: fix clearing of biofill operations Greg Kroah-Hartman
2007-11-15 6:44 ` [patch 19/40] MSI: Use correct data offset for 32-bit MSI in read_msi_msg() Greg Kroah-Hartman
2007-11-15 6:44 ` Greg Kroah-Hartman [this message]
2007-11-15 15:50 ` [patch 20/40] USB: remove USB_QUIRK_NO_AUTOSUSPEND Chuck Ebbert
2007-11-15 17:57 ` Alan Stern
2007-11-15 6:45 ` [patch 21/40] usb-gadget-ether: prevent oops caused by error interrupt race Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 22/40] USB: mutual exclusion for EHCI init and port resets Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 23/40] USB: add URB_FREE_BUFFER to permissible flags Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 24/40] USB: usbserial - fix potential deadlock between write() and IRQ Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 25/40] ALSA: hda-codec - Add array terminator for dmic in STAC codec Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 26/40] i4l: Fix random hard freeze with AVM c4 card Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 27/40] i4l: fix random freezes with AVM B1 drivers Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 28/40] ide: fix serverworks.c UDMA regression Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 29/40] ide: Add ide_get_paired_drive() helper Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 30/40] ide: Fix siimage driver accessing beyond array boundary Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 31/40] ide: Fix cs5535 " Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 32/40] hptiop: avoid buffer overflow when returning sense data Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 33/40] Char: rocket, fix dynamic_dev tty Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 34/40] Char: moxa, fix and optimise empty timer Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 35/40] radeon: set the address to access the GART table on the CPU side correctly Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 36/40] libata: add HTS542525K9SA00 to NCQ blacklist Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 37/40] libata: backport ATA_FLAG_NO_SRST and ATA_FLAG_ASSUME_ATA Greg Kroah-Hartman
2007-11-15 6:45 ` [patch 38/40] libata: backport ATA_FLAG_NO_SRST and ATA_FLAG_ASSUME_ATA, part 2 Greg Kroah-Hartman
2007-11-15 6:46 ` [patch 39/40] ACPI: sleep: Fix GPE suspend cleanup Greg Kroah-Hartman
2007-11-15 6:46 ` [patch 40/40] ACPI: suspend: Wrong order of GPE restore Greg Kroah-Hartman
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=20071115064457.GU19218@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb-devel@lists.sourceforge.net \
--cc=mkrufky@linuxtv.org \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=stern@rowland.harvard.edu \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/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