Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / drivers / input / keyboard / bcm-keypad.c

diff --git a/drivers/input/keyboard/bcm-keypad.c b/drivers/input/keyboard/bcm-keypad.c
index 86a8b723ae1533db37f87ae400ad3f30638973e1..e1cf63ee148f5e67ddd45fde5c9fa41200faf6c6 100644 (file)
--- a/drivers/input/keyboard/bcm-keypad.c
+++ b/drivers/input/keyboard/bcm-keypad.c
@@ -213,7 +213,7 @@ static int bcm_kp_matrix_key_parse_dt(struct bcm_kp *kp)
        /* Initialize the KPCR Keypad Configuration Register */
        kp->kpcr = KPCR_STATUSFILTERENABLE | KPCR_COLFILTERENABLE;
 
-       error = matrix_keypad_parse_of_params(dev, &kp->n_rows, &kp->n_cols);
+       error = matrix_keypad_parse_properties(dev, &kp->n_rows, &kp->n_cols);
        if (error) {
                dev_err(dev, "failed to parse kp params\n");
                return error;
@@ -352,8 +352,6 @@ static int bcm_kp_probe(struct platform_device *pdev)
 
        kp->input_dev = input_dev;
 
-       platform_set_drvdata(pdev, kp);
-
        error = bcm_kp_matrix_key_parse_dt(kp);
        if (error)
                return error;