diff options
Diffstat (limited to 'drivers/input/matrix-keymap.c')
| -rw-r--r-- | drivers/input/matrix-keymap.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c index 288b6a4b53..70551d4a2b 100644 --- a/drivers/input/matrix-keymap.c +++ b/drivers/input/matrix-keymap.c @@ -1,36 +1,27 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - */ +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <input/matrix_keypad.h> -static int matrix_keypad_parse_of_keymap(struct device_d *dev, +static int matrix_keypad_parse_of_keymap(struct device *dev, unsigned int row_shift, unsigned short *keymap) { unsigned int proplen, i, size; const __be32 *prop; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const char *propname = "linux,keymap"; prop = of_get_property(np, propname, &proplen); if (!prop) { - dev_err(dev, "OF: %s property not defined in %s\n", - propname, np->full_name); + dev_err(dev, "OF: %s property not defined in %pOF\n", + propname, np); return -ENOENT; } if (proplen % sizeof(u32)) { - dev_err(dev, "OF: Malformed keycode property %s in %s\n", - propname, np->full_name); + dev_err(dev, "OF: Malformed keycode property %s in %pOF\n", + propname, np); return -EINVAL; } @@ -64,13 +55,14 @@ static int matrix_keypad_parse_of_keymap(struct device_d *dev, * an array of keycodes that is suitable for using in a standard matrix * keyboard driver that uses row and col as indices. */ -int matrix_keypad_build_keymap(struct device_d *dev, const struct matrix_keymap_data *keymap_data, - unsigned int row_shift, - unsigned short *keymap) +int matrix_keypad_build_keymap(struct device *dev, + const struct matrix_keymap_data *keymap_data, + unsigned int row_shift, + unsigned short *keymap) { int i; - if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) + if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) return matrix_keypad_parse_of_keymap(dev, row_shift, keymap); if (!keymap_data) |