aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorUwe Kleine-König <[email protected]>2021-01-22 10:24:49 +0100
committerTakashi Iwai <[email protected]>2021-01-26 07:42:27 +0100
commit30e88d017fcbeb50c4b07577fe059558361067e7 (patch)
tree971c2212b650bbb811473bc7e55db671c9a57cfc /drivers/input
parent7797b4e00faf3229ef67ac37015dd2ee8e4c7901 (diff)
isa: Make the remove callback for isa drivers return void
The driver core ignores the return value of the remove callback, so don't give isa drivers the chance to provide a value. Adapt all isa_drivers with a remove callbacks accordingly; they all return 0 unconditionally anyhow. Acked-by: Marc Kleine-Budde <[email protected]> # for drivers/net/can/sja1000/tscan1.c Acked-by: William Breathitt Gray <[email protected]> Acked-by: Wolfram Sang <[email protected]> # for drivers/i2c/ Reviewed-by: Takashi Iway <[email protected]> # for sound/ Reviewed-by: Hans Verkuil <[email protected]> # for drivers/media/ Signed-off-by: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/htcpen.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
index 2f261a34f9c2..056ba76087e8 100644
--- a/drivers/input/touchscreen/htcpen.c
+++ b/drivers/input/touchscreen/htcpen.c
@@ -171,7 +171,7 @@ static int htcpen_isa_probe(struct device *dev, unsigned int id)
return err;
}
-static int htcpen_isa_remove(struct device *dev, unsigned int id)
+static void htcpen_isa_remove(struct device *dev, unsigned int id)
{
struct input_dev *htcpen_dev = dev_get_drvdata(dev);
@@ -182,8 +182,6 @@ static int htcpen_isa_remove(struct device *dev, unsigned int id)
release_region(HTCPEN_PORT_INDEX, 2);
release_region(HTCPEN_PORT_INIT, 1);
release_region(HTCPEN_PORT_IRQ_CLEAR, 1);
-
- return 0;
}
#ifdef CONFIG_PM