From 0cc1df40eebbdd9137cf7913d02ad18117f6eed9 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 8 May 2007 00:31:30 -0400 Subject: [PATCH] --- yaml --- r: 56839 b: refs/heads/master c: 09b7002d68cfa1c45cc413a0c7cca399c25a57c6 h: refs/heads/master i: 56837: 87209d878c26ede9952e7953f88127206c8db0ae 56835: 1f156c49e82f2af79632ee4eaa36bcc65e9ec6d7 56831: d641ca083d62e25aba6c30065b1ec4ebcecc2ebb v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/onetouch.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 41f4eb86ca6b..e6368392a790 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57a21c1b929450b1e020c0a03cca6fa7448f4222 +refs/heads/master: 09b7002d68cfa1c45cc413a0c7cca399c25a57c6 diff --git a/trunk/drivers/usb/storage/onetouch.c b/trunk/drivers/usb/storage/onetouch.c index 6d3dad3d1dae..d35369392fed 100644 --- a/trunk/drivers/usb/storage/onetouch.c +++ b/trunk/drivers/usb/storage/onetouch.c @@ -84,7 +84,7 @@ static void usb_onetouch_irq(struct urb *urb) static int usb_onetouch_open(struct input_dev *dev) { - struct usb_onetouch *onetouch = dev->private; + struct usb_onetouch *onetouch = input_get_drvdata(dev); onetouch->is_open = 1; onetouch->irq->dev = onetouch->udev; @@ -98,7 +98,7 @@ static int usb_onetouch_open(struct input_dev *dev) static void usb_onetouch_close(struct input_dev *dev) { - struct usb_onetouch *onetouch = dev->private; + struct usb_onetouch *onetouch = input_get_drvdata(dev); usb_kill_urb(onetouch->irq); onetouch->is_open = 0; @@ -185,13 +185,14 @@ int onetouch_connect_input(struct us_data *ss) input_dev->name = onetouch->name; input_dev->phys = onetouch->phys; usb_to_input_id(udev, &input_dev->id); - input_dev->cdev.dev = &udev->dev; + input_dev->dev.parent = &udev->dev; set_bit(EV_KEY, input_dev->evbit); set_bit(ONETOUCH_BUTTON, input_dev->keybit); clear_bit(0, input_dev->keybit); - input_dev->private = onetouch; + input_set_drvdata(input_dev, onetouch); + input_dev->open = usb_onetouch_open; input_dev->close = usb_onetouch_close;