From 44c5151293849736118090bf5230d6b298a9d0b0 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Fri, 21 Jul 2023 13:39:43 +0530 Subject: [PATCH] include: sbi_utils: Remove driver pointer from struct i2c_adapter The "driver" pointer in struct i2c_adapter is not used anywhere so let us remove it. Signed-off-by: Anup Patel Reviewed-by: Xiang W --- include/sbi_utils/i2c/i2c.h | 3 --- lib/utils/i2c/fdt_i2c_dw.c | 3 --- lib/utils/i2c/fdt_i2c_sifive.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/include/sbi_utils/i2c/i2c.h b/include/sbi_utils/i2c/i2c.h index 5a70364..93a44f4 100644 --- a/include/sbi_utils/i2c/i2c.h +++ b/include/sbi_utils/i2c/i2c.h @@ -15,9 +15,6 @@ /** Representation of a I2C adapter */ struct i2c_adapter { - /** Pointer to I2C driver owning this I2C adapter */ - void *driver; - /** Unique ID of the I2C adapter assigned by the driver */ int id; diff --git a/lib/utils/i2c/fdt_i2c_dw.c b/lib/utils/i2c/fdt_i2c_dw.c index 99b2ddb..358ad3c 100644 --- a/lib/utils/i2c/fdt_i2c_dw.c +++ b/lib/utils/i2c/fdt_i2c_dw.c @@ -15,8 +15,6 @@ #include #include -extern struct fdt_i2c_adapter fdt_i2c_adapter_dw; - static int fdt_dw_i2c_init(void *fdt, int nodeoff, const struct fdt_match *match) { @@ -35,7 +33,6 @@ static int fdt_dw_i2c_init(void *fdt, int nodeoff, } adapter->addr = addr; - adapter->adapter.driver = &fdt_i2c_adapter_dw; rc = dw_i2c_init(&adapter->adapter, nodeoff); if (rc) { diff --git a/lib/utils/i2c/fdt_i2c_sifive.c b/lib/utils/i2c/fdt_i2c_sifive.c index b85b245..1174062 100644 --- a/lib/utils/i2c/fdt_i2c_sifive.c +++ b/lib/utils/i2c/fdt_i2c_sifive.c @@ -46,8 +46,6 @@ struct sifive_i2c_adapter { struct i2c_adapter adapter; }; -extern struct fdt_i2c_adapter fdt_i2c_adapter_sifive; - static inline void sifive_i2c_setreg(struct sifive_i2c_adapter *adap, uint8_t reg, uint8_t value) { @@ -250,7 +248,6 @@ static int sifive_i2c_init(void *fdt, int nodeoff, } adapter->addr = addr; - adapter->adapter.driver = &fdt_i2c_adapter_sifive; adapter->adapter.id = nodeoff; adapter->adapter.write = sifive_i2c_adapter_write; adapter->adapter.read = sifive_i2c_adapter_read;