[PATCH 15/20] i2c: Remove I2C_SET_BUS()

Simon Glass sjg at chromium.org
Thu Jul 18 19:36:06 CEST 2024


This is very old, predating even the legacy I2C support, so drop it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 drivers/power/power_i2c.c | 5 -----
 include/i2c.h             | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index a871fc41987..c2fc1c6b42f 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -33,8 +33,6 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
 		       p->bus);
 		return -ENXIO;
 	}
-#else /* Non DM I2C support - will be removed */
-	I2C_SET_BUS(p->bus);
 #endif
 
 	switch (pmic_i2c_tx_num) {
@@ -93,9 +91,6 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
 		return -ENXIO;
 	}
 	ret = dm_i2c_read(dev, reg, buf, pmic_i2c_tx_num);
-#else /* Non DM I2C support - will be removed */
-	I2C_SET_BUS(p->bus);
-	ret = i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num);
 #endif
 	if (ret)
 		return ret;
diff --git a/include/i2c.h b/include/i2c.h
index 45ca3d63e3f..1d1430b74a6 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -954,13 +954,6 @@ static inline unsigned int I2C_GET_BUS(void)
 	return I2C_MULTI_BUS ? i2c_get_bus_num() : 0;
 }
 
-static inline void I2C_SET_BUS(unsigned int bus) __attribute__((always_inline));
-static inline void I2C_SET_BUS(unsigned int bus)
-{
-	if (I2C_MULTI_BUS)
-		i2c_set_bus_num(bus);
-}
-
 /**
  * Find the I2C bus number by given a FDT I2C node.
  *
-- 
2.34.1



More information about the U-Boot mailing list