diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-11-11 12:43:12 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-31 11:31:48 -0800 |
| commit | aef01aad89e457e34a60ff6e8fd69ff6740cf201 (patch) | |
| tree | a1a02536fd46b11f05e8e804f018b8384068e45a /drivers/input/keyboard/cros_ec_keyb.c | |
| parent | Input: delete MPU3050 driver (diff) | |
| download | linux-dev-aef01aad89e457e34a60ff6e8fd69ff6740cf201.tar.xz linux-dev-aef01aad89e457e34a60ff6e8fd69ff6740cf201.zip | |
Input: matrix-keypad - switch to using generic device properties
Instead of being OF-specific, let's switch to using generic device
properties, which will make this code usable on ACPI, device tree and
legacy boards that use property sets.
As part of the change let's rename matrix_keypad_parse_of_params() to
matrix_keypad_parse_properties().
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard/cros_ec_keyb.c')
| -rw-r--r-- | drivers/input/keyboard/cros_ec_keyb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c index 87d071ae21da..780977dcf92d 100644 --- a/drivers/input/keyboard/cros_ec_keyb.c +++ b/drivers/input/keyboard/cros_ec_keyb.c @@ -229,7 +229,8 @@ static int cros_ec_keyb_probe(struct platform_device *pdev) ckdev = devm_kzalloc(dev, sizeof(*ckdev), GFP_KERNEL); if (!ckdev) return -ENOMEM; - err = matrix_keypad_parse_of_params(dev, &ckdev->rows, &ckdev->cols); + + err = matrix_keypad_parse_properties(dev, &ckdev->rows, &ckdev->cols); if (err) return err; |