|
@@ -128,15 +128,10 @@ MODULE_DEVICE_TABLE(of, ts4900_gpio_of_match_table);
|
|
|
static int ts4900_gpio_probe(struct i2c_client *client,
|
|
|
const struct i2c_device_id *id)
|
|
|
{
|
|
|
- const struct of_device_id *match;
|
|
|
struct ts4900_gpio_priv *priv;
|
|
|
u32 ngpio;
|
|
|
int ret;
|
|
|
|
|
|
- match = of_match_device(ts4900_gpio_of_match_table, &client->dev);
|
|
|
- if (!match)
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
if (of_property_read_u32(client->dev.of_node, "ngpios", &ngpio))
|
|
|
ngpio = DEFAULT_PIN_NUMBER;
|
|
|
|
|
@@ -148,7 +143,7 @@ static int ts4900_gpio_probe(struct i2c_client *client,
|
|
|
priv->gpio_chip.label = "ts4900-gpio";
|
|
|
priv->gpio_chip.ngpio = ngpio;
|
|
|
priv->gpio_chip.parent = &client->dev;
|
|
|
- priv->input_bit = (uintptr_t)match->data;
|
|
|
+ priv->input_bit = (uintptr_t)of_device_get_match_data(&client->dev);
|
|
|
|
|
|
priv->regmap = devm_regmap_init_i2c(client, &ts4900_regmap_config);
|
|
|
if (IS_ERR(priv->regmap)) {
|