Merge tag 'v4.14-rc6' into next

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / stmfts.c

diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c
index 8c6c6178ec12fd26ed9832311419da243ed4c154..c12d0189993965121eedf9c625dffcccbc26428a 100644 (file)
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -725,8 +725,7 @@ static int stmfts_probe(struct i2c_client *client,
                }
        }
 
-       err = sysfs_create_group(&sdata->client->dev.kobj,
-                                &stmfts_attribute_group);
+       err = devm_device_add_group(&client->dev, &stmfts_attribute_group);
        if (err)
                return err;
 
@@ -738,7 +737,6 @@ static int stmfts_probe(struct i2c_client *client,
 static int stmfts_remove(struct i2c_client *client)
 {
        pm_runtime_disable(&client->dev);
-       sysfs_remove_group(&client->dev.kobj, &stmfts_attribute_group);
 
        return 0;
 }