Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17dd3f0f authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

[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: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0259567a

drivers/input/joystick/adi.c

+54 −39
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL"); 
#define ADI_MIN_LENGTH		8

#define ADI_MIN_LEN_LENGTH	10

#define ADI_MIN_ID_LENGTH	66

#define ADI_MAX_NAME_LENGTH	48

#define ADI_MAX_NAME_LENGTH	64

#define ADI_MAX_CNAME_LENGTH	16

#define ADI_MAX_PHYS_LENGTH	64
@@ -106,7 +106,7 @@ static struct { 
 */



struct adi {

	struct input_dev dev;

	struct input_dev *dev;

	int length;

	int ret;

	int idx;
@@ -215,7 +215,7 @@ static inline int adi_get_bits(struct adi *adi, int count) 


static int adi_decode(struct adi *adi)

{

	struct input_dev *dev = &adi->dev;

	struct input_dev *dev = adi->dev;

	char *abs = adi->abs;

	short *key = adi->key;

	int i, t;
@@ -318,7 +318,8 @@ static void adi_init_digital(struct gameport *gameport) 


	for (i = 0; seq[i]; i++) {

		gameport_trigger(gameport);

		if (seq[i] > 0) msleep(seq[i]);

		if (seq[i] > 0)

			msleep(seq[i]);

		if (seq[i] < 0) {

			mdelay(-seq[i]);

			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) 
	}

}



static void adi_init_input(struct adi *adi, struct adi_port *port, int half)

static int adi_init_input(struct adi *adi, struct adi_port *port, int half)

{

	int i, t;

	struct input_dev *input_dev;

	char buf[ADI_MAX_NAME_LENGTH];

	int i, t;



	if (!adi->length) return;



	init_input_dev(&adi->dev);

	adi->dev = input_dev = input_allocate_device();

	if (!input_dev)

		return -ENOMEM;



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



	snprintf(buf, ADI_MAX_PHYS_LENGTH, adi_names[t], adi->id);

	snprintf(adi->name, ADI_MAX_NAME_LENGTH, "Logitech %s", buf);

	snprintf(adi->name, ADI_MAX_NAME_LENGTH, "Logitech %s [%s]", buf, adi->cname);

	snprintf(adi->phys, ADI_MAX_PHYS_LENGTH, "%s/input%d", port->gameport->phys, half);



	adi->abs = adi_abs[t];

	adi->key = adi_key[t];



	adi->dev.open = adi_open;

	adi->dev.close = adi_close;

	input_dev->name = adi->name;

	input_dev->phys = adi->phys;

	input_dev->id.bustype = BUS_GAMEPORT;

	input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;

	input_dev->id.product = adi->id;

	input_dev->id.version = 0x0100;

	input_dev->cdev.dev = &port->gameport->dev;

	input_dev->private = port;



	adi->dev.name = adi->name;

	adi->dev.phys = adi->phys;

	adi->dev.id.bustype = BUS_GAMEPORT;

	adi->dev.id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;

	adi->dev.id.product = adi->id;

	adi->dev.id.version = 0x0100;

	input_dev->open = adi_open;

	input_dev->close = adi_close;



	adi->dev.private = port;

	adi->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);



	for (i = 0; i < adi->axes10 + adi->axes8 + (adi->hats + (adi->pad != -1)) * 2; i++)

		set_bit(adi->abs[i], adi->dev.absbit);

		set_bit(adi->abs[i], input_dev->absbit);



	for (i = 0; i < adi->buttons; i++)

		set_bit(adi->key[i], adi->dev.keybit);

		set_bit(adi->key[i], input_dev->keybit);



	return 0;

}



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



		t = adi->abs[i];

		x = adi->dev.abs[t];

		x = adi->dev->abs[t];



		if (t == ABS_THROTTLE || t == ABS_RUDDER || adi->id == ADI_ID_WGPE)

			x = i < adi->axes10 ? 512 : 128;



		if (i < adi->axes10)

			input_set_abs_params(&adi->dev, t, 64, x * 2 - 64, 2, 16);

			input_set_abs_params(adi->dev, t, 64, x * 2 - 64, 2, 16);

		else if (i < adi->axes10 + adi->axes8)

			input_set_abs_params(&adi->dev, t, 48, x * 2 - 48, 1, 16);

			input_set_abs_params(adi->dev, t, 48, x * 2 - 48, 1, 16);

		else

			input_set_abs_params(&adi->dev, t, -1, 1, 0, 0);

			input_set_abs_params(adi->dev, t, -1, 1, 0, 0);

	}

}
@@ -469,7 +474,8 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv) 
	int i;

	int err;



	if (!(port = kzalloc(sizeof(struct adi_port), GFP_KERNEL)))

	port = kzalloc(sizeof(struct adi_port), GFP_KERNEL);

	if (!port)

		return -ENOMEM;



	port->gameport = gameport;
@@ -477,10 +483,8 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv) 
	gameport_set_drvdata(gameport, port);



	err = gameport_open(gameport, drv, GAMEPORT_MODE_RAW);

	if (err) {

		kfree(port);

		return err;

	}

	if (err)

		goto fail1;



	adi_init_digital(gameport);

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


	for (i = 0; i < 2; i++) {

		adi_id_decode(port->adi + i, port);

		adi_init_input(port->adi + i, port, i);



		if (!port->adi[i].length)

			continue;



		err = adi_init_input(port->adi + i, port, i);

		if (err)

			goto fail2;

	}



	if (!port->adi[0].length && !port->adi[1].length) {

		gameport_close(gameport);

		kfree(port);

		return -ENODEV;

		err = -ENODEV;

		goto fail2;

	}



	gameport_set_poll_handler(gameport, adi_poll);
@@ -511,12 +520,18 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv) 
	for (i = 0; i < 2; i++)

		if (port->adi[i].length > 0) {

			adi_init_center(port->adi + i);

			input_register_device(&port->adi[i].dev);

			printk(KERN_INFO "input: %s [%s] on %s\n",

				port->adi[i].name, port->adi[i].cname, gameport->phys);

			input_register_device(port->adi[i].dev);

		}



	return 0;



 fail2:	for (i = 0; i < 2; i++)

		if (port->adi[i].dev)

			input_free_device(port->adi[i].dev);

	gameport_close(gameport);

 fail1:	gameport_set_drvdata(gameport, NULL);

	kfree(port);

	return err;

}



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


	for (i = 0; i < 2; i++)

		if (port->adi[i].length > 0)

			input_unregister_device(&port->adi[i].dev);

			input_unregister_device(port->adi[i].dev);

	gameport_close(gameport);

	gameport_set_drvdata(gameport, NULL);

	kfree(port);

drivers/input/joystick/amijoy.c

+48 −37
Original line number Diff line number Diff line
@@ -53,11 +53,9 @@ __obsolete_setup("amijoy="); 


static int amijoy_used;

static DECLARE_MUTEX(amijoy_sem);

static struct input_dev amijoy_dev[2];

static struct input_dev *amijoy_dev[2];

static char *amijoy_phys[2] = { "amijoy/input0", "amijoy/input1" };



static char *amijoy_name = "Amiga joystick";



static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp)

{

	int i, data = 0, button = 0;
@@ -70,15 +68,15 @@ static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp) 
				case 1: data = ~custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break;

			}



			input_regs(amijoy_dev + i, fp);

			input_regs(amijoy_dev[i], fp);



			input_report_key(amijoy_dev + i, BTN_TRIGGER, button);

			input_report_key(amijoy_dev[i], BTN_TRIGGER, button);



			input_report_abs(amijoy_dev + i, ABS_X, ((data >> 1) & 1) - ((data >> 9) & 1));

			input_report_abs(amijoy_dev[i], ABS_X, ((data >> 1) & 1) - ((data >> 9) & 1));

			data = ~(data ^ (data << 1));

			input_report_abs(amijoy_dev + i, ABS_Y, ((data >> 1) & 1) - ((data >> 9) & 1));

			input_report_abs(amijoy_dev[i], ABS_Y, ((data >> 1) & 1) - ((data >> 9) & 1));



			input_sync(amijoy_dev + i);

			input_sync(amijoy_dev[i]);

		}

	return IRQ_HANDLED;

}
@@ -114,39 +112,52 @@ static void amijoy_close(struct input_dev *dev) 
static int __init amijoy_init(void)

{

	int i, j;

	int err;



	for (i = 0; i < 2; i++)

		if (amijoy[i]) {

			if (!request_mem_region(CUSTOM_PHYSADDR+10+i*2, 2,

						"amijoy [Denise]")) {

				if (i == 1 && amijoy[0]) {

					input_unregister_device(amijoy_dev);

					release_mem_region(CUSTOM_PHYSADDR+10, 2);

	for (i = 0; i < 2; i++) {

		if (!amijoy[i])

			continue;



		amijoy_dev[i] = input_allocate_device();

		if (!amijoy_dev[i]) {

			err = -ENOMEM;

			goto fail;

		}

				return -EBUSY;



		if (!request_mem_region(CUSTOM_PHYSADDR + 10 + i * 2, 2, "amijoy [Denise]")) {

			input_free_device(amijoy_dev[i]);

			err = -EBUSY;

			goto fail;

		}



			amijoy_dev[i].open = amijoy_open;

			amijoy_dev[i].close = amijoy_close;

			amijoy_dev[i].evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

			amijoy_dev[i].absbit[0] = BIT(ABS_X) | BIT(ABS_Y);

			amijoy_dev[i].keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);

		amijoy_dev[i]->name = "Amiga joystick";

		amijoy_dev[i]->phys = amijoy_phys[i];

		amijoy_dev[i]->id.bustype = BUS_AMIGA;

		amijoy_dev[i]->id.vendor = 0x0001;

		amijoy_dev[i]->id.product = 0x0003;

		amijoy_dev[i]->id.version = 0x0100;



		amijoy_dev[i]->open = amijoy_open;

		amijoy_dev[i]->close = amijoy_close;



		amijoy_dev[i]->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

		amijoy_dev[i]->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);

		amijoy_dev[i]->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);

		for (j = 0; j < 2; j++) {

				amijoy_dev[i].absmin[ABS_X + j] = -1;

				amijoy_dev[i].absmax[ABS_X + j] = 1;

			amijoy_dev[i]->absmin[ABS_X + j] = -1;

			amijoy_dev[i]->absmax[ABS_X + j] = 1;

		}



			amijoy_dev[i].name = amijoy_name;

			amijoy_dev[i].phys = amijoy_phys[i];

			amijoy_dev[i].id.bustype = BUS_AMIGA;

			amijoy_dev[i].id.vendor = 0x0001;

			amijoy_dev[i].id.product = 0x0003;

			amijoy_dev[i].id.version = 0x0100;



			input_register_device(amijoy_dev + i);

			printk(KERN_INFO "input: %s at joy%ddat\n", amijoy_name, i);

		input_register_device(amijoy_dev[i]);

	}

	return 0;



 fail:	while (--i >= 0)

		if (amijoy[i]) {

			input_unregister_device(amijoy_dev[i]);

			release_mem_region(CUSTOM_PHYSADDR + 10 + i * 2, 2);

		}

	return err;

}



static void __exit amijoy_exit(void)
@@ -155,7 +166,7 @@ static void __exit amijoy_exit(void) 


	for (i = 0; i < 2; i++)

		if (amijoy[i]) {

			input_unregister_device(amijoy_dev + i);

			input_unregister_device(amijoy_dev[i]);

			release_mem_region(CUSTOM_PHYSADDR + 10 + i * 2, 2);

		}

}

drivers/input/joystick/analog.c

+43 −53
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static short analog_joy_btn[] = { BTN_TRIGGER, BTN_THUMB, BTN_TOP, BTN_TOP2, BTN 
static unsigned char analog_chf[] = { 0xf, 0x0, 0x1, 0x9, 0x2, 0x4, 0xc, 0x8, 0x3, 0x5, 0xb, 0x7, 0xd, 0xe, 0xa, 0x6 };



struct analog {

	struct input_dev dev;

	struct input_dev *dev;

	int mask;

	short *buttons;

	char name[ANALOG_MAX_NAME_LENGTH];
@@ -182,7 +182,7 @@ static unsigned long analog_faketime = 0; 


static void analog_decode(struct analog *analog, int *axes, int *initial, int buttons)

{

	struct input_dev *dev = &analog->dev;

	struct input_dev *dev = analog->dev;

	int i, j;



	if (analog->mask & ANALOG_HAT_FCS)
@@ -428,27 +428,30 @@ static void analog_name(struct analog *analog) 
 * analog_init_device()

 */



static void analog_init_device(struct analog_port *port, struct analog *analog, int index)

static int analog_init_device(struct analog_port *port, struct analog *analog, int index)

{

	struct input_dev *input_dev;

	int i, j, t, v, w, x, y, z;



	analog_name(analog);

	sprintf(analog->phys, "%s/input%d", port->gameport->phys, index);

	analog->buttons = (analog->mask & ANALOG_GAMEPAD) ? analog_pad_btn : analog_joy_btn;



	init_input_dev(&analog->dev);

	analog->dev = input_dev = input_allocate_device();

	if (!input_dev)

		return -ENOMEM;



	analog->dev.name = analog->name;

	analog->dev.phys = analog->phys;

	analog->dev.id.bustype = BUS_GAMEPORT;

	analog->dev.id.vendor = GAMEPORT_ID_VENDOR_ANALOG;

	analog->dev.id.product = analog->mask >> 4;

	analog->dev.id.version = 0x0100;

	input_dev->name = analog->name;

	input_dev->phys = analog->phys;

	input_dev->id.bustype = BUS_GAMEPORT;

	input_dev->id.vendor = GAMEPORT_ID_VENDOR_ANALOG;

	input_dev->id.product = analog->mask >> 4;

	input_dev->id.version = 0x0100;



	analog->dev.open = analog_open;

	analog->dev.close = analog_close;

	analog->dev.private = port;

	analog->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

	input_dev->open = analog_open;

	input_dev->close = analog_close;

	input_dev->private = port;

	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);



	for (i = j = 0; i < 4; i++)

		if (analog->mask & (1 << i)) {
@@ -461,8 +464,6 @@ static void analog_init_device(struct analog_port *port, struct analog *analog, 
			v = (x >> 3);

			w = (x >> 3);



			set_bit(t, analog->dev.absbit);



			if ((i == 2 || i == 3) && (j == 2 || j == 3) && (z > (y >> 3)))

				x = y;
@@ -472,11 +473,7 @@ static void analog_init_device(struct analog_port *port, struct analog *analog, 
				w = (x >> 4);

			}



			analog->dev.absmax[t] = (x << 1) - v;

			analog->dev.absmin[t] = v;

			analog->dev.absfuzz[t] = port->fuzz;

			analog->dev.absflat[t] = w;



			input_set_abs_params(input_dev, t, v, (x << 1) - v, port->fuzz, w);

			j++;

		}
@@ -484,41 +481,30 @@ static void analog_init_device(struct analog_port *port, struct analog *analog, 
		if (analog->mask & analog_exts[i])

			for (x = 0; x < 2; x++) {

				t = analog_hats[j++];

				set_bit(t, analog->dev.absbit);

				analog->dev.absmax[t] = 1;

				analog->dev.absmin[t] = -1;

				input_set_abs_params(input_dev, t, -1, 1, 0, 0);

			}



	for (i = j = 0; i < 4; i++)

		if (analog->mask & (0x10 << i))

			set_bit(analog->buttons[j++], analog->dev.keybit);

			set_bit(analog->buttons[j++], input_dev->keybit);



	if (analog->mask & ANALOG_BTNS_CHF)

		for (i = 0; i < 2; i++)

			set_bit(analog->buttons[j++], analog->dev.keybit);

			set_bit(analog->buttons[j++], input_dev->keybit);



	if (analog->mask & ANALOG_HBTN_CHF)

		for (i = 0; i < 4; i++)

			set_bit(analog->buttons[j++], analog->dev.keybit);

			set_bit(analog->buttons[j++], input_dev->keybit);



	for (i = 0; i < 4; i++)

		if (analog->mask & (ANALOG_BTN_TL << i))

			set_bit(analog_pads[i], analog->dev.keybit);

			set_bit(analog_pads[i], input_dev->keybit);



	analog_decode(analog, port->axes, port->initial, port->buttons);



	input_register_device(&analog->dev);

	input_register_device(analog->dev);



	printk(KERN_INFO "input: %s at %s", analog->name, port->gameport->phys);



	if (port->cooked)

		printk(" [ADC port]\n");

	else

		printk(" [%s timer, %d %sHz clock, %d ns res]\n", TIME_NAME,

		port->speed > 10000 ? (port->speed + 800) / 1000 : port->speed,

		port->speed > 10000 ? "M" : "k",

		port->speed > 10000 ? (port->loop * 1000) / (port->speed / 1000)

				    : (port->loop * 1000000) / port->speed);

	return 0;

}



/*
@@ -659,37 +645,41 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv 
		return - ENOMEM;



	err = analog_init_port(gameport, drv, port);

	if (err) {

		kfree(port);

		return err;

	}

	if (err)

		goto fail1;



	err = analog_init_masks(port);

	if (err) {

		gameport_close(gameport);

		gameport_set_drvdata(gameport, NULL);

		kfree(port);

		return err;

	}

	if (err)

		goto fail2;



	gameport_set_poll_handler(gameport, analog_poll);

	gameport_set_poll_interval(gameport, 10);



	for (i = 0; i < 2; i++)

		if (port->analog[i].mask)

			analog_init_device(port, port->analog + i, i);

		if (port->analog[i].mask) {

			err = analog_init_device(port, port->analog + i, i);

			if (err)

				goto fail3;

		}



	return 0;



 fail3: while (--i >= 0)

		input_unregister_device(port->analog[i].dev);

 fail2:	gameport_close(gameport);

 fail1:	gameport_set_drvdata(gameport, NULL);

	kfree(port);

	return err;

}



static void analog_disconnect(struct gameport *gameport)

{

	int i;

	struct analog_port *port = gameport_get_drvdata(gameport);

	int i;



	for (i = 0; i < 2; i++)

		if (port->analog[i].mask)

			input_unregister_device(&port->analog[i].dev);

			input_unregister_device(port->analog[i].dev);

	gameport_close(gameport);

	gameport_set_drvdata(gameport, NULL);

	printk(KERN_INFO "analog.c: %d out of %d reads (%d%%) on %s failed\n",

drivers/input/joystick/cobra.c

+37 −29
Original line number Diff line number Diff line
@@ -44,13 +44,11 @@ MODULE_LICENSE("GPL"); 
#define COBRA_MAX_STROBE	45	/* 45 us max wait for first strobe */

#define COBRA_LENGTH		36



static char* cobra_name = "Creative Labs Blaster GamePad Cobra";



static int cobra_btn[] = { BTN_START, BTN_SELECT, BTN_TL, BTN_TR, BTN_X, BTN_Y, BTN_Z, BTN_A, BTN_B, BTN_C, BTN_TL2, BTN_TR2, 0 };



struct cobra {

	struct gameport *gameport;

	struct input_dev dev[2];

	struct input_dev *dev[2];

	int reads;

	int bads;

	unsigned char exists;
@@ -128,7 +126,7 @@ static void cobra_poll(struct gameport *gameport) 
	for (i = 0; i < 2; i++)

		if (cobra->exists & r & (1 << i)) {



			dev = cobra->dev + i;

			dev = cobra->dev[i];



			input_report_abs(dev, ABS_X, ((data[i] >> 4) & 1) - ((data[i] >> 3) & 1));

			input_report_abs(dev, ABS_Y, ((data[i] >> 2) & 1) - ((data[i] >> 1) & 1));
@@ -159,11 +157,13 @@ static void cobra_close(struct input_dev *dev) 
static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)

{

	struct cobra *cobra;

	struct input_dev *input_dev;

	unsigned int data[2];

	int i, j;

	int err;



	if (!(cobra = kzalloc(sizeof(struct cobra), GFP_KERNEL)))

	cobra = kzalloc(sizeof(struct cobra), GFP_KERNEL);

	if (!cobra)

		return -ENOMEM;



	cobra->gameport = gameport;
@@ -191,36 +191,44 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv) 
	gameport_set_poll_handler(gameport, cobra_poll);

	gameport_set_poll_interval(gameport, 20);



	for (i = 0; i < 2; i++)

		if ((cobra->exists >> i) & 1) {



			sprintf(cobra->phys[i], "%s/input%d", gameport->phys, i);



			cobra->dev[i].private = cobra;

			cobra->dev[i].open = cobra_open;

			cobra->dev[i].close = cobra_close;



			cobra->dev[i].name = cobra_name;

			cobra->dev[i].phys = cobra->phys[i];

			cobra->dev[i].id.bustype = BUS_GAMEPORT;

			cobra->dev[i].id.vendor = GAMEPORT_ID_VENDOR_CREATIVE;

			cobra->dev[i].id.product = 0x0008;

			cobra->dev[i].id.version = 0x0100;

	for (i = 0; i < 2; i++) {

		if (~(cobra->exists >> i) & 1)

			continue;



			cobra->dev[i].evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

		cobra->dev[i] = input_dev = input_allocate_device();

		if (!input_dev) {

			err = -ENOMEM;

			goto fail3;

		}



			input_set_abs_params(&cobra->dev[i], ABS_X, -1, 1, 0, 0);

			input_set_abs_params(&cobra->dev[i], ABS_Y, -1, 1, 0, 0);

		sprintf(cobra->phys[i], "%s/input%d", gameport->phys, i);



		input_dev->name = "Creative Labs Blaster GamePad Cobra";

		input_dev->phys = cobra->phys[i];

		input_dev->id.bustype = BUS_GAMEPORT;

		input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE;

		input_dev->id.product = 0x0008;

		input_dev->id.version = 0x0100;

		input_dev->cdev.dev = &gameport->dev;

		input_dev->private = cobra;



		input_dev->open = cobra_open;

		input_dev->close = cobra_close;



		input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

		input_set_abs_params(input_dev, ABS_X, -1, 1, 0, 0);

		input_set_abs_params(input_dev, ABS_Y, -1, 1, 0, 0);

		for (j = 0; cobra_btn[j]; j++)

				set_bit(cobra_btn[j], cobra->dev[i].keybit);

			set_bit(cobra_btn[j], input_dev->keybit);



			input_register_device(&cobra->dev[i]);

			printk(KERN_INFO "input: %s on %s\n", cobra_name, gameport->phys);

		input_register_device(cobra->dev[i]);

	}



	return 0;



 fail3:	for (i = 0; i < 2; i++)

		if (cobra->dev[i])

			input_unregister_device(cobra->dev[i]);

 fail2:	gameport_close(gameport);

 fail1:	gameport_set_drvdata(gameport, NULL);

	kfree(cobra);
@@ -234,7 +242,7 @@ static void cobra_disconnect(struct gameport *gameport) 


	for (i = 0; i < 2; i++)

		if ((cobra->exists >> i) & 1)

			input_unregister_device(cobra->dev + i);

			input_unregister_device(cobra->dev[i]);

	gameport_close(gameport);

	gameport_set_drvdata(gameport, NULL);

	kfree(cobra);

drivers/input/joystick/db9.c

+176 −116

File changed.

Preview size limit exceeded, changes collapsed.