summaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds-lp5562.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2022-08-26 15:14:33 +0200
committerLinus Walleij <linus.walleij@linaro.org>2022-08-26 15:14:33 +0200
commit1681956cb79c99371024cec0b9536fbdd73d04c3 (patch)
tree434a943c22e9ce78743358276dc4e5c5d0d10d01 /drivers/leds/leds-lp5562.c
parent0684bc79cd52edca88e430b177f06d980aed5779 (diff)
parented5c2f5fd10dda07263f79f338a512c0f49f76f5 (diff)
downloadlinux-1681956cb79c99371024cec0b9536fbdd73d04c3.tar.bz2
Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into devel
This branch is needed to make the i2c driver remove() callback in new driver compile properly. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/leds/leds-lp5562.c')
-rw-r--r--drivers/leds/leds-lp5562.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index 31c14016d289..0e490085ff35 100644
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -573,7 +573,7 @@ err_init:
return ret;
}
-static int lp5562_remove(struct i2c_client *client)
+static void lp5562_remove(struct i2c_client *client)
{
struct lp55xx_led *led = i2c_get_clientdata(client);
struct lp55xx_chip *chip = led->chip;
@@ -582,8 +582,6 @@ static int lp5562_remove(struct i2c_client *client)
lp55xx_unregister_sysfs(chip);
lp55xx_deinit_device(chip);
-
- return 0;
}
static const struct i2c_device_id lp5562_id[] = {