diff options
Diffstat (limited to 'drivers/input/imx_keypad.c')
-rw-r--r-- | drivers/input/imx_keypad.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/input/imx_keypad.c b/drivers/input/imx_keypad.c index 44ff9b7856..fc6b45b3cb 100644 --- a/drivers/input/imx_keypad.c +++ b/drivers/input/imx_keypad.c @@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Driver for the IMX keypad port. * Copyright (C) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com> * Copyright (C) 2012 Christian Kapeller <christian.kapeller@cmotion.eu> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * */ /* @@ -76,7 +72,7 @@ struct imx_keypad { struct input_device input; struct clk *clk; - struct device_d *dev; + struct device *dev; void __iomem *mmio_base; struct poller_struct poller; @@ -362,7 +358,7 @@ static void imx_keypad_inhibit(struct imx_keypad *keypad) writew(0xff00, keypad->mmio_base + KPCR); } -static int __init imx_keypad_probe(struct device_d *dev) +static int __init imx_keypad_probe(struct device *dev) { struct resource *iores; struct imx_keypad *keypad; @@ -410,7 +406,7 @@ static int __init imx_keypad_probe(struct device_d *dev) keypad->poller.func = imx_keypad_check_for_events; - ret = poller_register(&keypad->poller); + ret = poller_register(&keypad->poller, dev_name(dev)); if (ret) return ret; @@ -425,8 +421,9 @@ static __maybe_unused struct of_device_id imx_keypad_dt_ids[] = { { .compatible = "fsl,imx21-kpp", }, { } }; +MODULE_DEVICE_TABLE(of, imx_keypad_dt_ids); -static struct driver_d imx_keypad_driver = { +static struct driver imx_keypad_driver = { .name = "imx-kpp", .probe = imx_keypad_probe, .of_compatible = DRV_OF_COMPAT(imx_keypad_dt_ids), |