Re: [PATCH] input: Synaptics USB device driver

[Dmitry Torokhov]

On Thu, Jan 12, 2012 at 12:08:48AM +0000, Jan Steinhoff wrote:
> On Tue, 10 Jan 2012 01:43:34 -0800
> Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> wrote:
> > The patch below seems to work well on my combo device (Lenovo keyboard
> > with integrated touchpad/trackpoint). Could you please tell me if it
> > works with your devices as well?
> 
> Yes, it works. Thanks a lot for the cleanup and improvement!
> 
> Just a last remark: The reconnects do not appear while the cPad is
> suspended, so it is save to allow it to autosuspend. Can the autopm
> calls be removed from probe and disconnect, and needs_remote_wakeup be
> set in probe instead?

OK, how about thie patch below then (on top of the previous one)?

Thanks.

-- 
Dmitry


Input: synaptics-use - rework starting of cPad-like devices

From: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>

Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
---

 drivers/input/mouse/synaptics_usb.c |   65 ++++++++++++-----------------------
 1 files changed, 22 insertions(+), 43 deletions(-)


diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c
index 216cf2b..e559a94 100644
--- a/drivers/input/mouse/synaptics_usb.c
+++ b/drivers/input/mouse/synaptics_usb.c
@@ -245,11 +245,6 @@ static int synusb_open(struct input_dev *dev)
 	struct synusb *synusb = input_get_drvdata(dev);
 	int retval;
 
-	if (synusb->flags & SYNUSB_IO_ALWAYS) {
-		/* We already started IO in synusb_probe() */
-		return 0;
-	}
-
 	retval = usb_autopm_get_interface(synusb->intf);
 	if (retval) {
 		dev_err(&synusb->intf->dev,
@@ -277,16 +272,15 @@ out:
 static void synusb_close(struct input_dev *dev)
 {
 	struct synusb *synusb = input_get_drvdata(dev);
+	int autopm_error;
 
-	if (!(synusb->flags & SYNUSB_IO_ALWAYS)) {
-		int autopm_error = usb_autopm_get_interface(synusb->intf);
+	autopm_error = usb_autopm_get_interface(synusb->intf);
 
-		usb_kill_urb(synusb->urb);
-		synusb->intf->needs_remote_wakeup = 0;
+	usb_kill_urb(synusb->urb);
+	synusb->intf->needs_remote_wakeup = 0;
 
-		if (!autopm_error)
-			usb_autopm_put_interface(synusb->intf);
-	}
+	if (!autopm_error)
+		usb_autopm_put_interface(synusb->intf);
 }
 
 static int synusb_probe(struct usb_interface *intf,
@@ -380,8 +374,10 @@ static int synusb_probe(struct usb_interface *intf,
 	usb_to_input_id(udev, &input_dev->id);
 	input_dev->dev.parent = &synusb->intf->dev;
 
-	input_dev->open = synusb_open;
-	input_dev->close = synusb_close;
+	if (!(synusb->flags & SYNUSB_IO_ALWAYS)) {
+		input_dev->open = synusb_open;
+		input_dev->close = synusb_close;
+	}
 
 	input_set_drvdata(input_dev, synusb);
 
@@ -412,40 +408,25 @@ static int synusb_probe(struct usb_interface *intf,
 
 	usb_set_intfdata(intf, synusb);
 
+	if (synusb->flags & SYNUSB_IO_ALWAYS) {
+		error = synusb_open(input_dev);
+		if (error)
+			goto err_free_dma;
+	}
+
 	error = input_register_device(input_dev);
 	if (error) {
 		dev_err(&udev->dev,
 			"Failed to register input device, error %d\n",
 			error);
-		goto err_free_dma;
-	}
-
-	if (synusb->flags & SYNUSB_IO_ALWAYS) {
-		error = usb_autopm_get_interface(synusb->intf);
-		if (error) {
-			dev_err(&udev->dev,
-				"%s - usb_autopm_get_interface failed, error: %d\n",
-				__func__, error);
-			goto err_unregister_input;
-		}
-
-		error = usb_submit_urb(synusb->urb, GFP_KERNEL);
-		if (error) {
-			dev_err(&synusb->intf->dev,
-				"%s - usb_submit_urb failed, error: %d\n",
-				__func__, error);
-			error = -EIO;
-			goto err_put_intf;
-		}
+		goto err_stop_io;
 	}
 
 	return 0;
 
-err_put_intf:
-	usb_autopm_put_interface(synusb->intf);
-err_unregister_input:
-	input_unregister_device(input_dev);
-	input_dev = NULL;
+err_stop_io:
+	if (synusb->flags & SYNUSB_IO_ALWAYS)
+		synusb_close(synusb->input);
 err_free_dma:
 	usb_free_coherent(udev, SYNUSB_RECV_SIZE, synusb->data,
 			  synusb->urb->transfer_dma);
@@ -464,10 +445,8 @@ static void synusb_disconnect(struct usb_interface *intf)
 	struct synusb *synusb = usb_get_intfdata(intf);
 	struct usb_device *udev = interface_to_usbdev(intf);
 
-	if (synusb->flags & SYNUSB_IO_ALWAYS) {
-		usb_kill_urb(synusb->urb);
-		usb_autopm_put_interface(synusb->intf);
-	}
+	if (synusb->flags & SYNUSB_IO_ALWAYS)
+		synusb_close(synusb->input);
 
 	input_unregister_device(synusb->input);
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/