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

Commit 26421c7a authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: q40kbd - convert to the new platform device interface 



Do not use platform_device_register_simple() as it is going away,
implement ->probe() and ->remove() functions so manual binding and
unbinding will work with this driver.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 916d83cf

drivers/input/serio/q40kbd.c

+57 −32
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int q40kbd_open(struct serio *port) 


	if (request_irq(Q40_IRQ_KEYBOARD, q40kbd_interrupt, 0, "q40kbd", NULL)) {

		printk(KERN_ERR "q40kbd.c: Can't get irq %d.\n", Q40_IRQ_KEYBOARD);

		return -1;

		return -EBUSY;

	}



	/* off we go */
@@ -116,48 +116,73 @@ static void q40kbd_close(struct serio *port) 
	q40kbd_flush();

}



static struct serio * __init q40kbd_allocate_port(void)

static int __devinit q40kbd_probe(struct platform_device *dev)

{

	struct serio *serio;



	serio = kmalloc(sizeof(struct serio), GFP_KERNEL);

	if (serio) {

		memset(serio, 0, sizeof(struct serio));

		serio->id.type		= SERIO_8042;

		serio->open		= q40kbd_open;

		serio->close		= q40kbd_close;

		serio->dev.parent	= &q40kbd_device->dev;

		strlcpy(serio->name, "Q40 Kbd Port", sizeof(serio->name));

		strlcpy(serio->phys, "Q40", sizeof(serio->phys));

	q40kbd_port = kzalloc(sizeof(struct serio), GFP_KERNEL);

	if (!q40kbd_port)

		return -ENOMEM;



	q40kbd_port->id.type	= SERIO_8042;

	q40kbd_port->open	= q40kbd_open;

	q40kbd_port->close	= q40kbd_close;

	q40kbd_port->dev.parent	= &dev->dev;

	strlcpy(q40kbd_port->name, "Q40 Kbd Port", sizeof(q40kbd_port->name));

	strlcpy(q40kbd_port->phys, "Q40", sizeof(q40kbd_port->phys));



	serio_register_port(q40kbd_port);

	printk(KERN_INFO "serio: Q40 kbd registered\n");



	return 0;

}



	return serio;

static int __devexit q40kbd_remove(struct platform_device *dev)

{

	serio_unregister_port(q40kbd_port);



	return 0;

}



static struct platform_driver q40kbd_driver = {

	.driver		= {

		.name	= "q40kbd",

		.owner	= THIS_MODULE,

	},

	.probe		= q40kbd_probe,

	.remove		= __devexit_p(q40kbd_remove),

};



static int __init q40kbd_init(void)

{

	int error;



	if (!MACH_IS_Q40)

		return -EIO;



	q40kbd_device = platform_device_register_simple("q40kbd", -1, NULL, 0);

	if (IS_ERR(q40kbd_device))

		return PTR_ERR(q40kbd_device);

	error = platform_driver_register(&q40kbd_driver);

	if (error)

		return error;



	if (!(q40kbd_port = q40kbd_allocate_port())) {

		platform_device_unregister(q40kbd_device);

		return -ENOMEM;

	}

	q40kbd_device = platform_device_alloc("q40kbd", -1);

	if (!q40kbd_device)

		goto err_unregister_driver;



	serio_register_port(q40kbd_port);

	printk(KERN_INFO "serio: Q40 kbd registered\n");

	error = platform_device_add(q40kbd_device);

	if (error)

		goto err_free_device;



	return 0;



 err_free_device:

	platform_device_put(q40kbd_device);

 err_unregister_driver:

	platform_driver_unregister(&q40kbd_driver);

	return error;

}



static void __exit q40kbd_exit(void)

{

	serio_unregister_port(q40kbd_port);

	platform_device_unregister(q40kbd_device);

	platform_driver_unregister(&q40kbd_driver);

}



module_init(q40kbd_init);