--- initial
+++ final
@@ -1,84 +1,84 @@
 static int tca8418_keypad_probe(struct i2c_client *client, const struct i2c_device_id *id) {
   struct device *dev = &client->dev;
   const struct tca8418_keypad_platform_data *pdata = dev_get_platdata(dev);
   struct tca8418_keypad *keypad_data;
   struct input_dev *input;
   const struct matrix_keymap_data *keymap_data = NULL;
   u32 rows = 0, cols = 0;
   bool rep = false;
   bool irq_is_gpio = false;
   int irq;
   int error, row_shift, max_keys;
   unsigned long trigger = 0;
   /* Copy the platform data */
   if (pdata) {
     if (!pdata->keymap_data) {
       dev_err(dev, "no keymap data defined\n");
       return -EINVAL;
     }
     keymap_data = pdata->keymap_data;
     rows = pdata->rows;
     cols = pdata->cols;
     rep = pdata->rep;
     irq_is_gpio = pdata->irq_is_gpio;
     trigger = IRQF_TRIGGER_FALLING;
   } else {
     struct device_node *np = dev->of_node;
     int err;
-    err = matrix_keypad_parse_of_params(dev, &rows, &cols);
+    err = matrix_keypad_parse_properties(dev, &rows, &cols);
     if (err) return err;
     rep = of_property_read_bool(np, "keypad,autorepeat");
   }
   if (!rows || rows > TCA8418_MAX_ROWS) {
     dev_err(dev, "invalid rows\n");
     return -EINVAL;
   }
   if (!cols || cols > TCA8418_MAX_COLS) {
     dev_err(dev, "invalid columns\n");
     return -EINVAL;
   }
   /* Check i2c driver capabilities */
   if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE)) {
     dev_err(dev, "%s adapter not supported\n", dev_driver_string(&client->adapter->dev));
     return -ENODEV;
   }
   row_shift = get_count_order(cols);
   max_keys = rows << row_shift;
   /* Allocate memory for keypad_data and input device */
   keypad_data = devm_kzalloc(dev, sizeof(*keypad_data), GFP_KERNEL);
   if (!keypad_data) return -ENOMEM;
   keypad_data->client = client;
   keypad_data->row_shift = row_shift;
   /* Initialize the chip or fail if chip isn't present */
   error = tca8418_configure(keypad_data, rows, cols);
   if (error < 0) return error;
   /* Configure input device */
   input = devm_input_allocate_device(dev);
   if (!input) return -ENOMEM;
   keypad_data->input = input;
   input->name = client->name;
   input->id.bustype = BUS_I2C;
   input->id.vendor = 0x0001;
   input->id.product = 0x001;
   input->id.version = 0x0001;
   error = matrix_keypad_build_keymap(keymap_data, NULL, rows, cols, NULL, input);
   if (error) {
     dev_err(dev, "Failed to build keymap\n");
     return error;
   }
   if (rep) __set_bit(EV_REP, input->evbit);
   input_set_capability(input, EV_MSC, MSC_SCAN);
   irq = client->irq;
   if (irq_is_gpio) irq = gpio_to_irq(irq);
   error = devm_request_threaded_irq(dev, irq, NULL, tca8418_irq_handler, trigger | IRQF_SHARED | IRQF_ONESHOT, client->name, keypad_data);
   if (error) {
     dev_err(dev, "Unable to claim irq %d; error %d\n", client->irq, error);
     return error;
   }
   error = input_register_device(input);
   if (error) {
     dev_err(dev, "Unable to register input device, error: %d\n", error);
     return error;
   }
   return 0;
 }<sep>@@
expression e1,e2,e3;
@@
-       matrix_keypad_parse_of_params
+       matrix_keypad_parse_properties
		(e1,e2,e3)