diff options
Diffstat (limited to 'drivers/input/serio/altera_ps2.c')
| -rw-r--r-- | drivers/input/serio/altera_ps2.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index 3a92304f64fb..aa445b1941e9 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c @@ -78,7 +78,6 @@ static void altera_ps2_close(struct serio *io) static int altera_ps2_probe(struct platform_device *pdev) { struct ps2if *ps2if; - struct resource *res; struct serio *serio; int error, irq; @@ -86,8 +85,7 @@ static int altera_ps2_probe(struct platform_device *pdev) if (!ps2if) return -ENOMEM; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - ps2if->base = devm_ioremap_resource(&pdev->dev, res); + ps2if->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); if (IS_ERR(ps2if->base)) return PTR_ERR(ps2if->base); @@ -102,7 +100,7 @@ static int altera_ps2_probe(struct platform_device *pdev) return error; } - serio = kzalloc(sizeof(struct serio), GFP_KERNEL); + serio = kzalloc(sizeof(*serio), GFP_KERNEL); if (!serio) return -ENOMEM; @@ -127,13 +125,11 @@ static int altera_ps2_probe(struct platform_device *pdev) /* * Remove one device from this driver. */ -static int altera_ps2_remove(struct platform_device *pdev) +static void altera_ps2_remove(struct platform_device *pdev) { struct ps2if *ps2if = platform_get_drvdata(pdev); serio_unregister_port(ps2if->io); - - return 0; } #ifdef CONFIG_OF |