git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...
[pandora-kernel.git]
/
drivers
/
input
/
joystick
/
tmdc.c
diff --git
a/drivers/input/joystick/tmdc.c
b/drivers/input/joystick/tmdc.c
index
bb23ed2
..
60c37bc
100644
(file)
--- a/
drivers/input/joystick/tmdc.c
+++ b/
drivers/input/joystick/tmdc.c
@@
-1,6
+1,4
@@
/*
/*
- * $Id: tmdc.c,v 1.31 2002/01/22 20:29:52 vojtech Exp $
- *
* Copyright (c) 1998-2001 Vojtech Pavlik
*
* Based on the work of:
* Copyright (c) 1998-2001 Vojtech Pavlik
*
* Based on the work of:
@@
-265,7
+263,7
@@
static void tmdc_poll(struct gameport *gameport)
static int tmdc_open(struct input_dev *dev)
{
static int tmdc_open(struct input_dev *dev)
{
- struct tmdc *tmdc =
dev->private
;
+ struct tmdc *tmdc =
input_get_drvdata(dev)
;
gameport_start_polling(tmdc->gameport);
return 0;
gameport_start_polling(tmdc->gameport);
return 0;
@@
-273,7
+271,7
@@
static int tmdc_open(struct input_dev *dev)
static void tmdc_close(struct input_dev *dev)
{
static void tmdc_close(struct input_dev *dev)
{
- struct tmdc *tmdc =
dev->private
;
+ struct tmdc *tmdc =
input_get_drvdata(dev)
;
gameport_stop_polling(tmdc->gameport);
}
gameport_stop_polling(tmdc->gameport);
}
@@
-326,13
+324,14
@@
static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
input_dev->id.vendor = GAMEPORT_ID_VENDOR_THRUSTMASTER;
input_dev->id.product = model->id;
input_dev->id.version = 0x0100;
input_dev->id.vendor = GAMEPORT_ID_VENDOR_THRUSTMASTER;
input_dev->id.product = model->id;
input_dev->id.version = 0x0100;
- input_dev->cdev.dev = &tmdc->gameport->dev;
- input_dev->private = tmdc;
+ input_dev->dev.parent = &tmdc->gameport->dev;
+
+ input_set_drvdata(input_dev, tmdc);
input_dev->open = tmdc_open;
input_dev->close = tmdc_close;
input_dev->open = tmdc_open;
input_dev->close = tmdc_close;
- input_dev->evbit[0] = BIT
(EV_KEY) | BIT
(EV_ABS);
+ input_dev->evbit[0] = BIT
_MASK(EV_KEY) | BIT_MASK
(EV_ABS);
for (i = 0; i < port->absc && i < TMDC_ABS; i++)
if (port->abs[i] >= 0)
for (i = 0; i < port->absc && i < TMDC_ABS; i++)
if (port->abs[i] >= 0)