regmap: Remove unused type and list fields from bus interface

We no longer enumerate the bus types, we rely on the driver telling us
this on init.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index c2231ff06cbcfebfe4a5ef6c0aee1ffa6ecc28fb..e6ce82d0ecd16d32a85362319bc69f65036d218f 100644 (file)
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -90,7 +90,6 @@ static int regmap_i2c_read(struct device *dev,
 }
 
 static struct regmap_bus regmap_i2c = {
-       .type = &i2c_bus_type,
        .write = regmap_i2c_write,
        .gather_write = regmap_i2c_gather_write,
        .read = regmap_i2c_read,

diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
index 4deba0621bc7f035b66ccc1ffc6821e580591f43..07633bda0a04770ada3b1c3565253d3fff003369 100644 (file)
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -47,7 +47,6 @@ static int regmap_spi_read(struct device *dev,
 }
 
 static struct regmap_bus regmap_spi = {
-       .type = &spi_bus_type,
        .write = regmap_spi_write,
        .gather_write = regmap_spi_gather_write,
        .read = regmap_spi_read,

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 4de137bc16a77adca41db6e0c8f35432927f996e..20a8fbf19d44fa7045a71029289068558579b5cb 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -60,8 +60,6 @@ typedef int (*regmap_hw_read)(struct device *dev,
 /**
  * Description of a hardware bus for the register map infrastructure.
  *
- * @list: Internal use.
- * @type: Bus type, used to identify bus to be used for a device.
  * @write: Write operation.
  * @gather_write: Write operation with split register/value, return -ENOTSUPP
  *                if not implemented  on a given device.
@@ -73,8 +71,6 @@ typedef int (*regmap_hw_read)(struct device *dev,
  *                  a read.
  */
 struct regmap_bus {
-       struct list_head list;
-       struct bus_type *type;
        regmap_hw_write write;
        regmap_hw_gather_write gather_write;
        regmap_hw_read read;