remove the USB_STORAGE_ONETOUCH driver

Nearly two years ago, USB_STORAGE_ONETOUCH got a dependency on !PM. Considering that this also implies that the driver is not available e.g. when ACPI is enabled in the kernel that's not far from a dependency on BROKEN.

This patch therefore removes this driver.

---

 drivers/usb/storage/Kconfig        |   12 -
 drivers/usb/storage/Makefile       |    1 
 drivers/usb/storage/onetouch.c     |  237 -----------------------------
 drivers/usb/storage/onetouch.h     |    9 -
 drivers/usb/storage/unusual_devs.h |   17 --
 drivers/usb/storage/usb.c          |    3 
 6 files changed, 279 deletions(-)

876e6730e6fb60856da318ad652a912757359f44

index 7e53333..9b7df5f 100644
@@ -121,18 +121,6 @@ config USB_STORAGE_ALAUDA
 	  These devices are based on the Alauda chip and support both
 	  XD and SmartMedia cards.
 
-config USB_STORAGE_ONETOUCH
-	bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)"
-	depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM
-	help
-	  Say Y here to include additional code to support the Maxtor OneTouch
-	  USB hard drive's onetouch button.
-
-	  This code registers the button on the front of Maxtor OneTouch USB
-	  hard drive's as an input device. An action can be associated with
-	  this input in any keybinding software. (e.g. gnome's keyboard short-
-	  cuts)
-
 config USB_STORAGE_KARMA
 	bool "Support for Rio Karma music player"
 	depends on USB_STORAGE

index 023969b..a93ae7a 100644
@@ -19,7 +19,6 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_ISD200)	+= isd200.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_DATAFAB)	+= datafab.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT)	+= jumpshot.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA)	+= alauda.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH)	+= onetouch.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA)	+= karma.o
 
 usb-storage-objs :=	scsiglue.o protocol.o transport.o usb.o \

deleted file mode 100644
index 41c7aa8..0000000
@@ -1,9 +0,0 @@
-#ifndef _ONETOUCH_H_
-#define _ONETOUCH_H_
-
-#define ONETOUCH_PKT_LEN        0x02
-#define ONETOUCH_BUTTON         KEY_PROG1
-
-int onetouch_connect_input(struct us_data *ss);
-
-#endif

index 22ab238..2d18eae 100644
@@ -1282,23 +1282,6 @@ UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
 		US_FL_SINGLE_LUN ),
 #endif
 
-/* Submitted by: Nick Sillik <[email protected]>
- * Needed for OneTouch extension to usb-storage
- *
- */
-#ifdef CONFIG_USB_STORAGE_ONETOUCH
-	UNUSUAL_DEV(  0x0d49, 0x7000, 0x0000, 0x9999,
-			"Maxtor",
-			"OneTouch External Harddrive",
-			US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input,
-			0),
-	UNUSUAL_DEV(  0x0d49, 0x7010, 0x0000, 0x9999,
-			"Maxtor",
-			"OneTouch External Harddrive",
-			US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input,
-			0),
-#endif
-
 /*
  * Pete Zaitcev <[email protected]>, bz#164688.
  * The device blatantly ignores LUN and returns 1 in GetMaxLUN.

index ac6114e..2691fa4 100644
@@ -92,9 +92,6 @@
 #ifdef CONFIG_USB_STORAGE_JUMPSHOT
 #include "jumpshot.h"
 #endif
-#ifdef CONFIG_USB_STORAGE_ONETOUCH
-#include "onetouch.h"
-#endif
 #ifdef CONFIG_USB_STORAGE_ALAUDA
 #include "alauda.h"
 #endif

Hmm...

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=c9d00fc148b210aa8cf388d6e1eac187a0e855a6
-> Adds !PM because suspend was broken (17.11.2005)

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7931e1c6f8007d5fef8a0bb2dc71bd97315eeae9
-> Adds suspend support, but fails to remove the !PM (5.12.2005)

So it looks like that !PM is false.

I have the following device:
Bus 001 Device 005: ID 1058:0400 Western Digital Technologies, Inc. Bus 001 Device 004: ID 1058:0600 Western Digital Technologies, Inc. Bus 001 Device 003: ID 1058:0500 Western Digital Technologies, Inc. aka Western Digital Media Center
This firewire+usb hdd enclosure also has three buttons.
But it looks like that uses another driver:
hiddev0hidraw1: USB HID v1.10 Device [Western Digital External HDD] on usb-0000:00:02.1-5.2

Otherwise I would be willing to try to test this, if someone would tell me how to check that the second commit did fix the suspend problem.

Torsten

If you need to unbind usbhid driver from the device and bind another one, you can use the 'unbind' and 'bind' files in sysfs.

As soon as the driver you are willing to test is bound to the device, you can go ahead with testing any functionality you wish (probably suspend/resume cycle is needed here?).

If the device is claimed by usbhid driver (because its descriptor probably states that it's HID-compliant device) and should be claimed by another driver, it's necessary to add it to usbhid blacklist -- just let me know.

Jiri Kosina

Maybe onetouch driver is not needed after all. I wonder what key/button does HID deriver reports when it binds to it... Torsten, could you please post your /proc/bus/input/devices?

Dmitry

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

[snip]

I only read the mail from Adrian, because I was 100% sure that my device is such a Maxtor Onetouch, because it's a external HDD and has buttons. (I even compiled this driver into my kernel when it was added...)
But after finding these two git commits and starting to write my initial mail I looked for the exact name of my device and found that this is not a Maxtor at all but a Western Digital.
So I'm rather unsure if this driver will work for me...

Anyway here is my /proc/bus/input/devices:
I: Bus=0019 Vendor=0000 Product=0002 Version=0000
N: Name="Power Button (FF)"
P: Phys=LNXPWRBN/button/input0
S: Sysfs=/devices/virtual/input/input0
U: Uniq=
H: Handlers=kbd event0
B: EV=3
B: KEY=10000000000000 0

I: Bus=0019 Vendor=0000 Product=0001 Version=0000
N: Name="Power Button (CM)"
P: Phys=PNP0C0C/button/input0
S: Sysfs=/devices/virtual/input/input1
U: Uniq=
H: Handlers=kbd event1
B: EV=3
B: KEY=10000000000000 0

I: Bus=0011 Vendor=0001 Product=0001 Version=ab41
N: Name="AT Translated Set 2 keyboard"
P: Phys=isa0060/serio0/input0
S: Sysfs=/devices/platform/i8042/serio0/input/input2
U: Uniq=
H: Handlers=kbd event2
B: EV=120013
B: KEY=402000000 3803078f800d001 feffffdfffefffff fffffffffffffffe
B: MSC=10
B: LED=7

I: Bus=0010 Vendor=001f Product=0001 Version=0100
N: Name="PC Speaker"
P: Phys=isa0061/input0
S: Sysfs=/devices/platform/pcspkr/input/input3
U: Uniq=
H: Handlers=kbd event3
B: EV=40001
B: SND=6

I: Bus=0003 Vendor=062a Product=0000 Version=0110
N: Name="HID 062a:0000"
P: Phys=usb-0000:00:02.0-9/input0
S: Sysfs=/devices/pci0000:00/0000:00:02.0/usb2/2-9/2-9:1.0/input/input4
U: Uniq=
H: Handlers=mouse0 event4
B: EV=17
B: KEY=70000 0 0 0 0
B: REL=103
B: MSC=10

The button part of the device is visible in sysfs under bus/usb, but not under class/input:
(There is also a cardreader, a hub and the hdd visible under /sys/bus/usb/devices/1-5 )

/sys/bus/usb/devices/1-5.2:1.1

|-- driver -> ../../../../../../../bus/usb/drivers/usbhid
|-- ep_81 -> ../../../../../../../devices/pci0000:00/0000:00:02.1/usb1/1-5/1-5.2/1-5.2:1.1/usb_endpoint/usbdev1.5_ep81
|-- subsystem -> ../../../../../../../bus/usb
|-- usb
|   `-- hiddev0
|       |-- device ->
../../../../../../../../../devices/pci0000:00/0000:00:02.1/usb1/1-5/1-5.2/1-5.2:1.1
|       `-- subsystem -> ../../../../../../../../../class/usb
`-- usb_endpoint
    `-- usbdev1.5_ep81
        |-- device ->
../../../../../../../../../devices/pci0000:00/0000:00:02.1/usb1/1-5/1-5.2/1-5.2:1.1
        `-- subsystem -> ../../../../../../../../../class/usb_endpoint

Torsten

You guys all sound confused about this.

The original reason writing for the onetouch driver was because the button on this disk drive isn't an HID device! That is, the drive doesn't include any of the usual HID descriptors for the button and the button doesn't send HID-style reports.

Torsten's assessment was correct. Originally there was no PM support for the onetouch driver. Now there is (although it isn't very good), so it would be legitimate to remove the !PM condition.

As far as I know, the only person who ever used the onetouch driver was its author.

Alan Stern

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

The only reason I was talking about it in terms of being a HID device was because Thorsten stated that usbhid driver gets bound to it.

Now that we know that Torsten was having different HW, my point is of course invalid :)

Thanks,

Jiri Kosina