66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
|
From c3d16b66a7f1b417a73df345cf23015ec862f616 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ondrej Jirman <megi@xff.cz>
|
||
|
|
Date: Mon, 6 Mar 2023 01:17:09 +0100
|
||
|
|
Subject: [PATCH 068/469] input: cyttsp4: Use i2c/spi names directly in the
|
||
|
|
driver
|
||
|
|
|
||
|
|
Platform data is going to be removed.
|
||
|
|
|
||
|
|
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
||
|
|
---
|
||
|
|
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 ec7a4779f3fb..dfaffb85dd8f 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, 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 = pm_ptr(&cyttsp4_pm_ops),
|
||
|
|
},
|
||
|
|
.probe_new = 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.34.1
|
||
|
|
|