Message ID | 20190520092711.30662-2-wsa+renesas@sang-engineering.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 6981a2356181083ffa6d566323546eb7894cd87b |
Headers | show |
Series | input: da9063 updates | expand |
On Mon, May 20, 2019 at 12:40 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > There are no in-kernel users anymore, so remove this outdated interface. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > Acked-by: Steve Twiss <stwiss.opensource@diasemi.com> > Tested-by: Steve Twiss <stwiss.opensource@diasemi.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Mon, May 20, 2019 at 01:26:15PM +0200, Geert Uytterhoeven wrote: > On Mon, May 20, 2019 at 12:40 PM Wolfram Sang > <wsa+renesas@sang-engineering.com> wrote: > > There are no in-kernel users anymore, so remove this outdated interface. > > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > > Acked-by: Steve Twiss <stwiss.opensource@diasemi.com> > > Tested-by: Steve Twiss <stwiss.opensource@diasemi.com> > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Applied, thank you.
diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c index 3e9c353d82ef..e3a273c74123 100644 --- a/drivers/input/misc/da9063_onkey.c +++ b/drivers/input/misc/da9063_onkey.c @@ -22,7 +22,6 @@ #include <linux/regmap.h> #include <linux/of.h> #include <linux/mfd/da9063/core.h> -#include <linux/mfd/da9063/pdata.h> #include <linux/mfd/da9063/registers.h> #include <linux/mfd/da9062/core.h> #include <linux/mfd/da9062/registers.h> @@ -201,8 +200,6 @@ static void da9063_cancel_poll(void *data) static int da9063_onkey_probe(struct platform_device *pdev) { - struct da9063 *da9063 = dev_get_drvdata(pdev->dev.parent); - struct da9063_pdata *pdata = dev_get_platdata(da9063->dev); struct da9063_onkey *onkey; const struct of_device_id *match; int irq; @@ -229,12 +226,8 @@ static int da9063_onkey_probe(struct platform_device *pdev) return -ENXIO; } - if (pdata) - onkey->key_power = pdata->key_power; - else - onkey->key_power = - !of_property_read_bool(pdev->dev.of_node, - "dlg,disable-key-power"); + onkey->key_power = !of_property_read_bool(pdev->dev.of_node, + "dlg,disable-key-power"); onkey->input = devm_input_allocate_device(&pdev->dev); if (!onkey->input) {