From 4b8a70fb92ad05347a475334e1723984f4e88205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Tue, 1 Oct 2019 00:28:51 +0200 Subject: [PATCH 067/389] 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 28ae7c15397a..ac9c72ffac02 100644 --- a/drivers/input/touchscreen/cyttsp4_i2c.c +++ b/drivers/input/touchscreen/cyttsp4_i2c.c @@ -51,14 +51,14 @@ static void cyttsp4_i2c_remove(struct i2c_client *client) } static const struct i2c_device_id cyttsp4_i2c_id[] = { - { CYTTSP4_I2C_NAME, 0 }, + { "cyttsp4_i2c_adapter", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, cyttsp4_i2c_id); static struct i2c_driver cyttsp4_i2c_driver = { .driver = { - .name = CYTTSP4_I2C_NAME, + .name = "cyttsp4_i2c_adapter", .pm = &cyttsp4_pm_ops, }, .probe = cyttsp4_i2c_probe, diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c index 5d7db84f2749..01fff216cd2c 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 = &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.35.3