Skip to content

Commit

Permalink
[SERIAL] serial8250: convert to the new platform device interface
Browse files Browse the repository at this point in the history
Do not use platform_device_register_simple() as it is going away.
Also set up driver's owner to create link driver->module in sysfs.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Dmitry Torokhov authored and Russell King committed Jan 13, 2006
1 parent d600b97 commit 7493a31
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions drivers/serial/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -2454,6 +2454,7 @@ static struct platform_driver serial8250_isa_driver = {
.resume = serial8250_resume,
.driver = {
.name = "serial8250",
.owner = THIS_MODULE,
},
};

Expand Down Expand Up @@ -2594,21 +2595,30 @@ static int __init serial8250_init(void)
if (ret)
goto out;

serial8250_isa_devs = platform_device_register_simple("serial8250",
PLAT8250_DEV_LEGACY, NULL, 0);
if (IS_ERR(serial8250_isa_devs)) {
ret = PTR_ERR(serial8250_isa_devs);
goto unreg;
ret = platform_driver_register(&serial8250_isa_driver);
if (ret)
goto unreg_uart_drv;

serial8250_isa_devs = platform_device_alloc("serial8250",
PLAT8250_DEV_LEGACY);
if (!serial8250_isa_devs) {
ret = -ENOMEM;
goto unreg_plat_drv;
}

ret = platform_device_add(serial8250_isa_devs);
if (ret)
goto put_dev;

serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev);

ret = platform_driver_register(&serial8250_isa_driver);
if (ret == 0)
goto out;
goto out;

platform_device_unregister(serial8250_isa_devs);
unreg:
put_dev:
platform_device_put(serial8250_isa_devs);
unreg_plat_drv:
platform_driver_unregister(&serial8250_isa_driver);
unreg_uart_drv:
uart_unregister_driver(&serial8250_reg);
out:
return ret;
Expand Down

0 comments on commit 7493a31

Please sign in to comment.