--- initial
+++ final
@@ -1,89 +1,89 @@
 static int pmic8xxx_kp_probe(struct platform_device *pdev) {
   struct device_node *np = pdev->dev.of_node;
   unsigned int rows, cols;
   bool repeat;
   bool wakeup;
   struct pmic8xxx_kp *kp;
   int rc;
   unsigned int ctrl_val;
-  rc = matrix_keypad_parse_of_params(&pdev->dev, &rows, &cols);
+  rc = matrix_keypad_parse_properties(&pdev->dev, &rows, &cols);
   if (rc) return rc;
   if (cols > PM8XXX_MAX_COLS || rows > PM8XXX_MAX_ROWS || cols < PM8XXX_MIN_COLS) {
     dev_err(&pdev->dev, "invalid platform data\n");
     return -EINVAL;
   }
   repeat = !of_property_read_bool(np, "linux,input-no-autorepeat");
   wakeup = of_property_read_bool(np, "wakeup-source") ||
            /* legacy name */
            of_property_read_bool(np, "linux,keypad-wakeup");
   kp = devm_kzalloc(&pdev->dev, sizeof(*kp), GFP_KERNEL);
   if (!kp) return -ENOMEM;
   kp->regmap = dev_get_regmap(pdev->dev.parent, NULL);
   if (!kp->regmap) return -ENODEV;
   platform_set_drvdata(pdev, kp);
   kp->num_rows = rows;
   kp->num_cols = cols;
   kp->dev = &pdev->dev;
   kp->input = devm_input_allocate_device(&pdev->dev);
   if (!kp->input) {
     dev_err(&pdev->dev, "unable to allocate input device\n");
     return -ENOMEM;
   }
   kp->key_sense_irq = platform_get_irq(pdev, 0);
   if (kp->key_sense_irq < 0) {
     dev_err(&pdev->dev, "unable to get keypad sense irq\n");
     return kp->key_sense_irq;
   }
   kp->key_stuck_irq = platform_get_irq(pdev, 1);
   if (kp->key_stuck_irq < 0) {
     dev_err(&pdev->dev, "unable to get keypad stuck irq\n");
     return kp->key_stuck_irq;
   }
   kp->input->name = "PMIC8XXX keypad";
   kp->input->phys = "pmic8xxx_keypad/input0";
   kp->input->id.bustype = BUS_I2C;
   kp->input->id.version = 0x0001;
   kp->input->id.product = 0x0001;
   kp->input->id.vendor = 0x0001;
   kp->input->open = pmic8xxx_kp_open;
   kp->input->close = pmic8xxx_kp_close;
   rc = matrix_keypad_build_keymap(NULL, NULL, PM8XXX_MAX_ROWS, PM8XXX_MAX_COLS, kp->keycodes, kp->input);
   if (rc) {
     dev_err(&pdev->dev, "failed to build keymap\n");
     return rc;
   }
   if (repeat) __set_bit(EV_REP, kp->input->evbit);
   input_set_capability(kp->input, EV_MSC, MSC_SCAN);
   input_set_drvdata(kp->input, kp);
   /* initialize keypad state */
   memset(kp->keystate, 0xff, sizeof(kp->keystate));
   memset(kp->stuckstate, 0xff, sizeof(kp->stuckstate));
   rc = pmic8xxx_kpd_init(kp, pdev);
   if (rc < 0) {
     dev_err(&pdev->dev, "unable to initialize keypad controller\n");
     return rc;
   }
   rc = devm_request_any_context_irq(&pdev->dev, kp->key_sense_irq, pmic8xxx_kp_irq, IRQF_TRIGGER_RISING, "pmic-keypad", kp);
   if (rc < 0) {
     dev_err(&pdev->dev, "failed to request keypad sense irq\n");
     return rc;
   }
   rc = devm_request_any_context_irq(&pdev->dev, kp->key_stuck_irq, pmic8xxx_kp_stuck_irq, IRQF_TRIGGER_RISING, "pmic-keypad-stuck", kp);
   if (rc < 0) {
     dev_err(&pdev->dev, "failed to request keypad stuck irq\n");
     return rc;
   }
   rc = regmap_read(kp->regmap, KEYP_CTRL, &ctrl_val);
   if (rc < 0) {
     dev_err(&pdev->dev, "failed to read KEYP_CTRL register\n");
     return rc;
   }
   kp->ctrl_reg = ctrl_val;
   rc = input_register_device(kp->input);
   if (rc < 0) {
     dev_err(&pdev->dev, "unable to register keypad input device\n");
     return rc;
   }
   device_init_wakeup(&pdev->dev, wakeup);
   return 0;
 }<sep>@@
expression e1,e2,e3;
@@
-       matrix_keypad_parse_of_params
+       matrix_keypad_parse_properties
		(e1,e2,e3)