From 4e4051152d1df1906e9e86ace4a4d0b9a08f86d0 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Mon, 6 Mar 2023 01:17:09 +0100 Subject: [PATCH 154/484] input: cyttsp4: Use i2c/spi names directly in the driver Platform data is going to be removed. Signed-off-by: Ondrej Jirman --- drivers/input/touchscreen/cyttsp4_i2c.c | 4 ++-- drivers/input/touchscreen/cyttsp4_spi.c | 2 +- include/linux/platform_data/cyttsp4.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/cyttsp4_i2c.c b/drivers/input/touchscreen/cyttsp4_i2c.c index da32c151def5..5b38a4f34209 100644 --- a/drivers/input/touchscreen/cyttsp4_i2c.c +++ b/drivers/input/touchscreen/cyttsp4_i2c.c @@ -50,14 +50,14 @@ static void cyttsp4_i2c_remove(struct i2c_client *client) } static const struct i2c_device_id cyttsp4_i2c_id[] = { - { CYTTSP4_I2C_NAME }, + { "cyttsp4_i2c_adapter" }, { } }; MODULE_DEVICE_TABLE(i2c, cyttsp4_i2c_id); static struct i2c_driver cyttsp4_i2c_driver = { .driver = { - .name = CYTTSP4_I2C_NAME, + .name = "cyttsp4_i2c_adapter", .pm = pm_ptr(&cyttsp4_pm_ops), }, .probe = cyttsp4_i2c_probe, diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c index 944fbbe9113e..f3cca8c9c119 100644 --- a/drivers/input/touchscreen/cyttsp4_spi.c +++ b/drivers/input/touchscreen/cyttsp4_spi.c @@ -172,7 +172,7 @@ static void cyttsp4_spi_remove(struct spi_device *spi) static struct spi_driver cyttsp4_spi_driver = { .driver = { - .name = CYTTSP4_SPI_NAME, + .name = "cyttsp4_spi_adapter", .pm = pm_ptr(&cyttsp4_pm_ops), }, .probe = cyttsp4_spi_probe, diff --git a/include/linux/platform_data/cyttsp4.h b/include/linux/platform_data/cyttsp4.h index 1b5b30796e43..e718d2204ce7 100644 --- a/include/linux/platform_data/cyttsp4.h +++ b/include/linux/platform_data/cyttsp4.h @@ -16,8 +16,6 @@ #define _CYTTSP4_H_ #define CYTTSP4_MT_NAME "cyttsp4_mt" -#define CYTTSP4_I2C_NAME "cyttsp4_i2c_adapter" -#define CYTTSP4_SPI_NAME "cyttsp4_spi_adapter" #define CY_TOUCH_SETTINGS_MAX 32 -- 2.49.0