On 03/29/2012 02:33 AM, Viresh Kumar wrote:
> We don't need to allocate memory for keymap in matrix_keyboard_of_fill_keymap(),
> as this would only be used by matrix_keyboard_of_free_keymap(). Instead create
> another routine matrix_keypad_of_build_keymap() which reads directly the
> property from struct device_node and builds keymap.
>
> With this eariler routines matrix_keyboard_of_fill_keymap() and
> matrix_keyboard_of_free_keymap() go away.
>
> This patch also fixes tegra driver according to these changes.
> diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
> -static struct tegra_kbc_platform_data * __devinit
> -tegra_kbc_dt_parse_pdata(struct platform_device *pdev)
> +static struct tegra_kbc_platform_data *
> +__devinit tegra_kbc_dt_parse_pdata(struct device_node *np)
I'd be tempted to keep __devinit on the first line, but not a big deal.
> +int matrix_keypad_of_build_keymap(struct input_dev *idev,
> + unsigned int row_shift, const char *propname)
> + size = proplen / sizeof(u32);
> + if (size > idev->keycodemax) {
> + dev_err(dev, "OF: %s overflow\n", propname);
> + return -EINVAL;
> }
That is checking the number of entries in the property, not the values
of the MATRIX_SCAN_CODE values derived from those entries. I'd say just
remove this check. See below.
> + keycode = idev->keycode;
>
> + for (i = 0; i < size; i++) {
> + unsigned int key = be32_to_cpup(prop + i);
> + unsigned int row = KEY_ROW(key);
> + unsigned int col = KEY_COL(key);
> + unsigned short code = KEY_VAL(key);
>
> + if (col >= col_range) {
> + dev_err(dev, "OF: %s: column %x overflowed its range %d\n",
> + propname, col, col_range);
> + return -EINVAL;
> + }
That check is good.
> + keycode[MATRIX_SCAN_CODE(row, col, row_shift)] = code;
But, you also need to do something like:
scancode = MATRIX_SCAN_CODE(row, col, row_shift);
if (scancode >= idev->keycodemax) {
error out;
}
keycode[scancode] = code;
> + __set_bit(code, idev->keybit);
> }
> + __clear_bit(KEY_RESERVED, idev->keybit);
> +
> + return 0;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
