Commit 9d383e96 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Wolfram Sang

Input: elantech - Prepare a complete software node for the device

Creating a software node and supplying that for the device
instead of only the device properties in it. A software
node was always created in any case to hold the additional
device properties, so this change does not have any real
effect.

This change makes it possible to remove support for the
problematic "dangling" device properties from i2c subsystem,
i.e. the "properties" member from struct i2c_board_info. The
problems caused by them are not related to this driver.
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 2c02f659
...@@ -1885,8 +1885,6 @@ static int elantech_create_smbus(struct psmouse *psmouse, ...@@ -1885,8 +1885,6 @@ static int elantech_create_smbus(struct psmouse *psmouse,
}; };
unsigned int idx = 0; unsigned int idx = 0;
smbus_board.properties = i2c_props;
i2c_props[idx++] = PROPERTY_ENTRY_U32("touchscreen-size-x", i2c_props[idx++] = PROPERTY_ENTRY_U32("touchscreen-size-x",
info->x_max + 1); info->x_max + 1);
i2c_props[idx++] = PROPERTY_ENTRY_U32("touchscreen-size-y", i2c_props[idx++] = PROPERTY_ENTRY_U32("touchscreen-size-y",
...@@ -1918,6 +1916,10 @@ static int elantech_create_smbus(struct psmouse *psmouse, ...@@ -1918,6 +1916,10 @@ static int elantech_create_smbus(struct psmouse *psmouse,
if (elantech_is_buttonpad(info)) if (elantech_is_buttonpad(info))
i2c_props[idx++] = PROPERTY_ENTRY_BOOL("elan,clickpad"); i2c_props[idx++] = PROPERTY_ENTRY_BOOL("elan,clickpad");
smbus_board.fwnode = fwnode_create_software_node(i2c_props, NULL);
if (IS_ERR(smbus_board.fwnode))
return PTR_ERR(smbus_board.fwnode);
return psmouse_smbus_init(psmouse, &smbus_board, NULL, 0, false, return psmouse_smbus_init(psmouse, &smbus_board, NULL, 0, false,
leave_breadcrumbs); leave_breadcrumbs);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment