Input: i8042 - clean up initialization code; abort if we (0854e52d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/input/serio/i8042.c

+100 −78

Original line number	Diff line number	Diff line
		@@ -552,7 +552,7 @@ static int i8042_enable_mux_ports(void)
		* Enable all muxed ports.
		*/

		for (i = 0; i < 4; i++) {
		for (i = 0; i < I8042_NUM_MUX_PORTS; i++) {
		i8042_command(&param, I8042_CMD_MUX_PFX + i);
		i8042_command(&param, I8042_CMD_AUX_ENABLE);
		}
		@@ -682,7 +682,7 @@ static int __init i8042_port_register(struct i8042_port *port)
		kfree(port->serio);
		port->serio = NULL;
		i8042_ctr \|= port->disable;
		return -1;
		return -EIO;
		}

		printk(KERN_INFO "serio: i8042 %s port at %#lx,%#lx irq %d\n",
		@@ -977,14 +977,15 @@ static struct device_driver i8042_driver = {
		.shutdown = i8042_shutdown,
		};

		static void __init i8042_create_kbd_port(void)
		static int __init i8042_create_kbd_port(void)
		{
		struct serio *serio;
		struct i8042_port *port = &i8042_ports[I8042_KBD_PORT_NO];

		serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
		if (serio) {
		memset(serio, 0, sizeof(struct serio));
		serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL);
		if (!serio)
		return -ENOMEM;

		serio->id.type = i8042_direct ? SERIO_8042 : SERIO_8042_XL;
		serio->write = i8042_dumbkbd ? NULL : i8042_kbd_write;
		serio->open = i8042_open;
		@@ -997,18 +998,19 @@ static void __init i8042_create_kbd_port(void)
		strlcpy(serio->phys, I8042_KBD_PHYS_DESC, sizeof(serio->phys));

		port->serio = serio;
		i8042_port_register(port);
		}

		return i8042_port_register(port);
		}

		static void __init i8042_create_aux_port(void)
		static int __init i8042_create_aux_port(void)
		{
		struct serio *serio;
		struct i8042_port *port = &i8042_ports[I8042_AUX_PORT_NO];

		serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
		if (serio) {
		memset(serio, 0, sizeof(struct serio));
		serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL);
		if (!serio)
		return -ENOMEM;

		serio->id.type = SERIO_8042;
		serio->write = i8042_aux_write;
		serio->open = i8042_open;
		@@ -1021,18 +1023,19 @@ static void __init i8042_create_aux_port(void)
		strlcpy(serio->phys, I8042_AUX_PHYS_DESC, sizeof(serio->phys));

		port->serio = serio;
		i8042_port_register(port);
		}

		return i8042_port_register(port);
		}

		static void __init i8042_create_mux_port(int index)
		static int __init i8042_create_mux_port(int index)
		{
		struct serio *serio;
		struct i8042_port *port = &i8042_ports[I8042_MUX_PORT_NO + index];

		serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
		if (serio) {
		memset(serio, 0, sizeof(struct serio));
		serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL);
		if (!serio)
		return -ENOMEM;

		serio->id.type = SERIO_8042;
		serio->write = i8042_aux_write;
		serio->open = i8042_open;
		@@ -1049,8 +1052,8 @@ static void __init i8042_create_mux_port(int index)
		snprintf(port->name, sizeof(port->name), "AUX%d", index);
		port->mux = index;
		port->serio = serio;
		i8042_port_register(port);
		}

		return i8042_port_register(port);
		}

		static int __init i8042_init(void)
		@@ -1070,36 +1073,55 @@ static int __init i8042_init(void)
		i8042_ports[I8042_KBD_PORT_NO].irq = I8042_KBD_IRQ;

		if (i8042_controller_init()) {
		i8042_platform_exit();
		return -ENODEV;
		err = -ENODEV;
		goto err_platform_exit;
		}

		err = driver_register(&i8042_driver);
		if (err) {
		i8042_platform_exit();
		return err;
		}
		if (err)
		goto err_controller_cleanup;

		i8042_platform_device = platform_device_register_simple("i8042", -1, NULL, 0);
		if (IS_ERR(i8042_platform_device)) {
		driver_unregister(&i8042_driver);
		i8042_platform_exit();
		return PTR_ERR(i8042_platform_device);
		err = PTR_ERR(i8042_platform_device);
		goto err_unregister_driver;
		}

		if (!i8042_noaux && !i8042_check_aux()) {
		if (!i8042_nomux && !i8042_check_mux())
		for (i = 0; i < I8042_NUM_MUX_PORTS; i++)
		i8042_create_mux_port(i);
		else
		i8042_create_aux_port();
		if (!i8042_nomux && !i8042_check_mux()) {
		for (i = 0; i < I8042_NUM_MUX_PORTS; i++) {
		err = i8042_create_mux_port(i);
		if (err)
		goto err_unregister_ports;
		}
		} else {
		err = i8042_create_aux_port();
		if (err)
		goto err_unregister_ports;
		}
		}

		i8042_create_kbd_port();
		err = i8042_create_kbd_port();
		if (err)
		goto err_unregister_ports;

		mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);

		return 0;

		err_unregister_ports:
		for (i = 0; i < I8042_NUM_PORTS; i++)
		if (i8042_ports[i].serio)
		serio_unregister_port(i8042_ports[i].serio);
		platform_device_unregister(i8042_platform_device);
		err_unregister_driver:
		driver_unregister(&i8042_driver);
		err_controller_cleanup:
		i8042_controller_cleanup();
		err_platform_exit:
		i8042_platform_exit();

		return err;
		}

		static void __exit i8042_exit(void)