Skip to content

Commit 17dd3f0

Browse files
Dmitry Torokhovgregkh
Dmitry Torokhov
authored and
gregkh
committed
[PATCH] drivers/input/joystick: convert to dynamic input_dev allocation
Input: convert drivers/input/joystick to dynamic input_dev allocation This is required for input_dev sysfs integration Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1 parent 0259567 commit 17dd3f0

25 files changed

+1460
-1230
lines changed

‎drivers/input/joystick/adi.c

Lines changed: 54 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL");
5454
#define ADI_MIN_LENGTH 8
5555
#define ADI_MIN_LEN_LENGTH 10
5656
#define ADI_MIN_ID_LENGTH 66
57-
#define ADI_MAX_NAME_LENGTH 48
57+
#define ADI_MAX_NAME_LENGTH 64
5858
#define ADI_MAX_CNAME_LENGTH 16
5959
#define ADI_MAX_PHYS_LENGTH 64
6060

@@ -106,7 +106,7 @@ static struct {
106106
*/
107107

108108
struct adi {
109-
struct input_dev dev;
109+
struct input_dev *dev;
110110
int length;
111111
int ret;
112112
int idx;
@@ -215,7 +215,7 @@ static inline int adi_get_bits(struct adi *adi, int count)
215215

216216
static int adi_decode(struct adi *adi)
217217
{
218-
struct input_dev *dev = &adi->dev;
218+
struct input_dev *dev = adi->dev;
219219
char *abs = adi->abs;
220220
short *key = adi->key;
221221
int i, t;
@@ -318,7 +318,8 @@ static void adi_init_digital(struct gameport *gameport)
318318

319319
for (i = 0; seq[i]; i++) {
320320
gameport_trigger(gameport);
321-
if (seq[i] > 0) msleep(seq[i]);
321+
if (seq[i] > 0)
322+
msleep(seq[i]);
322323
if (seq[i] < 0) {
323324
mdelay(-seq[i]);
324325
udelay(-seq[i]*14); /* It looks like mdelay() is off by approx 1.4% */
@@ -397,42 +398,46 @@ static void adi_id_decode(struct adi *adi, struct adi_port *port)
397398
}
398399
}
399400

400-
static void adi_init_input(struct adi *adi, struct adi_port *port, int half)
401+
static int adi_init_input(struct adi *adi, struct adi_port *port, int half)
401402
{
402-
int i, t;
403+
struct input_dev *input_dev;
403404
char buf[ADI_MAX_NAME_LENGTH];
405+
int i, t;
404406

405-
if (!adi->length) return;
406-
407-
init_input_dev(&adi->dev);
407+
adi->dev = input_dev = input_allocate_device();
408+
if (!input_dev)
409+
return -ENOMEM;
408410

409411
t = adi->id < ADI_ID_MAX ? adi->id : ADI_ID_MAX;
410412

411413
snprintf(buf, ADI_MAX_PHYS_LENGTH, adi_names[t], adi->id);
412-
snprintf(adi->name, ADI_MAX_NAME_LENGTH, "Logitech %s", buf);
414+
snprintf(adi->name, ADI_MAX_NAME_LENGTH, "Logitech %s [%s]", buf, adi->cname);
413415
snprintf(adi->phys, ADI_MAX_PHYS_LENGTH, "%s/input%d", port->gameport->phys, half);
414416

415417
adi->abs = adi_abs[t];
416418
adi->key = adi_key[t];
417419

418-
adi->dev.open = adi_open;
419-
adi->dev.close = adi_close;
420+
input_dev->name = adi->name;
421+
input_dev->phys = adi->phys;
422+
input_dev->id.bustype = BUS_GAMEPORT;
423+
input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;
424+
input_dev->id.product = adi->id;
425+
input_dev->id.version = 0x0100;
426+
input_dev->cdev.dev = &port->gameport->dev;
427+
input_dev->private = port;
420428

421-
adi->dev.name = adi->name;
422-
adi->dev.phys = adi->phys;
423-
adi->dev.id.bustype = BUS_GAMEPORT;
424-
adi->dev.id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;
425-
adi->dev.id.product = adi->id;
426-
adi->dev.id.version = 0x0100;
429+
input_dev->open = adi_open;
430+
input_dev->close = adi_close;
427431

428-
adi->dev.private = port;
429-
adi->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
432+
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
430433

431434
for (i = 0; i < adi->axes10 + adi->axes8 + (adi->hats + (adi->pad != -1)) * 2; i++)
432-
set_bit(adi->abs[i], adi->dev.absbit);
435+
set_bit(adi->abs[i], input_dev->absbit);
433436

434437
for (i = 0; i < adi->buttons; i++)
435-
set_bit(adi->key[i], adi->dev.keybit);
438+
set_bit(adi->key[i], input_dev->keybit);
439+
440+
return 0;
436441
}
437442

438443
static void adi_init_center(struct adi *adi)
@@ -445,17 +450,17 @@ static void adi_init_center(struct adi *adi)
445450
for (i = 0; i < adi->axes10 + adi->axes8 + (adi->hats + (adi->pad != -1)) * 2; i++) {
446451

447452
t = adi->abs[i];
448-
x = adi->dev.abs[t];
453+
x = adi->dev->abs[t];
449454

450455
if (t == ABS_THROTTLE || t == ABS_RUDDER || adi->id == ADI_ID_WGPE)
451456
x = i < adi->axes10 ? 512 : 128;
452457

453458
if (i < adi->axes10)
454-
input_set_abs_params(&adi->dev, t, 64, x * 2 - 64, 2, 16);
459+
input_set_abs_params(adi->dev, t, 64, x * 2 - 64, 2, 16);
455460
else if (i < adi->axes10 + adi->axes8)
456-
input_set_abs_params(&adi->dev, t, 48, x * 2 - 48, 1, 16);
461+
input_set_abs_params(adi->dev, t, 48, x * 2 - 48, 1, 16);
457462
else
458-
input_set_abs_params(&adi->dev, t, -1, 1, 0, 0);
463+
input_set_abs_params(adi->dev, t, -1, 1, 0, 0);
459464
}
460465
}
461466

@@ -469,18 +474,17 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
469474
int i;
470475
int err;
471476

472-
if (!(port = kzalloc(sizeof(struct adi_port), GFP_KERNEL)))
477+
port = kzalloc(sizeof(struct adi_port), GFP_KERNEL);
478+
if (!port)
473479
return -ENOMEM;
474480

475481
port->gameport = gameport;
476482

477483
gameport_set_drvdata(gameport, port);
478484

479485
err = gameport_open(gameport, drv, GAMEPORT_MODE_RAW);
480-
if (err) {
481-
kfree(port);
482-
return err;
483-
}
486+
if (err)
487+
goto fail1;
484488

485489
adi_init_digital(gameport);
486490
adi_read_packet(port);
@@ -490,13 +494,18 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
490494

491495
for (i = 0; i < 2; i++) {
492496
adi_id_decode(port->adi + i, port);
493-
adi_init_input(port->adi + i, port, i);
497+
498+
if (!port->adi[i].length)
499+
continue;
500+
501+
err = adi_init_input(port->adi + i, port, i);
502+
if (err)
503+
goto fail2;
494504
}
495505

496506
if (!port->adi[0].length && !port->adi[1].length) {
497-
gameport_close(gameport);
498-
kfree(port);
499-
return -ENODEV;
507+
err = -ENODEV;
508+
goto fail2;
500509
}
501510

502511
gameport_set_poll_handler(gameport, adi_poll);
@@ -511,12 +520,18 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
511520
for (i = 0; i < 2; i++)
512521
if (port->adi[i].length > 0) {
513522
adi_init_center(port->adi + i);
514-
input_register_device(&port->adi[i].dev);
515-
printk(KERN_INFO "input: %s [%s] on %s\n",
516-
port->adi[i].name, port->adi[i].cname, gameport->phys);
523+
input_register_device(port->adi[i].dev);
517524
}
518525

519526
return 0;
527+
528+
fail2: for (i = 0; i < 2; i++)
529+
if (port->adi[i].dev)
530+
input_free_device(port->adi[i].dev);
531+
gameport_close(gameport);
532+
fail1: gameport_set_drvdata(gameport, NULL);
533+
kfree(port);
534+
return err;
520535
}
521536

522537
static void adi_disconnect(struct gameport *gameport)
@@ -526,7 +541,7 @@ static void adi_disconnect(struct gameport *gameport)
526541

527542
for (i = 0; i < 2; i++)
528543
if (port->adi[i].length > 0)
529-
input_unregister_device(&port->adi[i].dev);
544+
input_unregister_device(port->adi[i].dev);
530545
gameport_close(gameport);
531546
gameport_set_drvdata(gameport, NULL);
532547
kfree(port);

‎drivers/input/joystick/amijoy.c

Lines changed: 48 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ __obsolete_setup("amijoy=");
5353

5454
static int amijoy_used;
5555
static DECLARE_MUTEX(amijoy_sem);
56-
static struct input_dev amijoy_dev[2];
56+
static struct input_dev *amijoy_dev[2];
5757
static char *amijoy_phys[2] = { "amijoy/input0", "amijoy/input1" };
5858

59-
static char *amijoy_name = "Amiga joystick";
60-
6159
static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp)
6260
{
6361
int i, data = 0, button = 0;
@@ -70,15 +68,15 @@ static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp)
7068
case 1: data = ~custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break;
7169
}
7270

73-
input_regs(amijoy_dev + i, fp);
71+
input_regs(amijoy_dev[i], fp);
7472

75-
input_report_key(amijoy_dev + i, BTN_TRIGGER, button);
73+
input_report_key(amijoy_dev[i], BTN_TRIGGER, button);
7674

77-
input_report_abs(amijoy_dev + i, ABS_X, ((data >> 1) & 1) - ((data >> 9) & 1));
75+
input_report_abs(amijoy_dev[i], ABS_X, ((data >> 1) & 1) - ((data >> 9) & 1));
7876
data = ~(data ^ (data << 1));
79-
input_report_abs(amijoy_dev + i, ABS_Y, ((data >> 1) & 1) - ((data >> 9) & 1));
77+
input_report_abs(amijoy_dev[i], ABS_Y, ((data >> 1) & 1) - ((data >> 9) & 1));
8078

81-
input_sync(amijoy_dev + i);
79+
input_sync(amijoy_dev[i]);
8280
}
8381
return IRQ_HANDLED;
8482
}
@@ -114,39 +112,52 @@ static void amijoy_close(struct input_dev *dev)
114112
static int __init amijoy_init(void)
115113
{
116114
int i, j;
115+
int err;
117116

118-
for (i = 0; i < 2; i++)
119-
if (amijoy[i]) {
120-
if (!request_mem_region(CUSTOM_PHYSADDR+10+i*2, 2,
121-
"amijoy [Denise]")) {
122-
if (i == 1 && amijoy[0]) {
123-
input_unregister_device(amijoy_dev);
124-
release_mem_region(CUSTOM_PHYSADDR+10, 2);
125-
}
126-
return -EBUSY;
127-
}
117+
for (i = 0; i < 2; i++) {
118+
if (!amijoy[i])
119+
continue;
128120

129-
amijoy_dev[i].open = amijoy_open;
130-
amijoy_dev[i].close = amijoy_close;
131-
amijoy_dev[i].evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
132-
amijoy_dev[i].absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
133-
amijoy_dev[i].keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
134-
for (j = 0; j < 2; j++) {
135-
amijoy_dev[i].absmin[ABS_X + j] = -1;
136-
amijoy_dev[i].absmax[ABS_X + j] = 1;
137-
}
121+
amijoy_dev[i] = input_allocate_device();
122+
if (!amijoy_dev[i]) {
123+
err = -ENOMEM;
124+
goto fail;
125+
}
138126

139-
amijoy_dev[i].name = amijoy_name;
140-
amijoy_dev[i].phys = amijoy_phys[i];
141-
amijoy_dev[i].id.bustype = BUS_AMIGA;
142-
amijoy_dev[i].id.vendor = 0x0001;
143-
amijoy_dev[i].id.product = 0x0003;
144-
amijoy_dev[i].id.version = 0x0100;
127+
if (!request_mem_region(CUSTOM_PHYSADDR + 10 + i * 2, 2, "amijoy [Denise]")) {
128+
input_free_device(amijoy_dev[i]);
129+
err = -EBUSY;
130+
goto fail;
131+
}
145132

146-
input_register_device(amijoy_dev + i);
147-
printk(KERN_INFO "input: %s at joy%ddat\n", amijoy_name, i);
133+
amijoy_dev[i]->name = "Amiga joystick";
134+
amijoy_dev[i]->phys = amijoy_phys[i];
135+
amijoy_dev[i]->id.bustype = BUS_AMIGA;
136+
amijoy_dev[i]->id.vendor = 0x0001;
137+
amijoy_dev[i]->id.product = 0x0003;
138+
amijoy_dev[i]->id.version = 0x0100;
139+
140+
amijoy_dev[i]->open = amijoy_open;
141+
amijoy_dev[i]->close = amijoy_close;
142+
143+
amijoy_dev[i]->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
144+
amijoy_dev[i]->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
145+
amijoy_dev[i]->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
146+
for (j = 0; j < 2; j++) {
147+
amijoy_dev[i]->absmin[ABS_X + j] = -1;
148+
amijoy_dev[i]->absmax[ABS_X + j] = 1;
148149
}
150+
151+
input_register_device(amijoy_dev[i]);
152+
}
149153
return 0;
154+
155+
fail: while (--i >= 0)
156+
if (amijoy[i]) {
157+
input_unregister_device(amijoy_dev[i]);
158+
release_mem_region(CUSTOM_PHYSADDR + 10 + i * 2, 2);
159+
}
160+
return err;
150161
}
151162

152163
static void __exit amijoy_exit(void)
@@ -155,8 +166,8 @@ static void __exit amijoy_exit(void)
155166

156167
for (i = 0; i < 2; i++)
157168
if (amijoy[i]) {
158-
input_unregister_device(amijoy_dev + i);
159-
release_mem_region(CUSTOM_PHYSADDR+10+i*2, 2);
169+
input_unregister_device(amijoy_dev[i]);
170+
release_mem_region(CUSTOM_PHYSADDR + 10 + i * 2, 2);
160171
}
161172
}
162173

0 commit comments

Comments
 (0)