diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 21:41:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-09 11:26:38 -0400 |
| commit | 790923e56be795e14eaaeb3305cb4e171cd0a72f (patch) | |
| tree | 778262685fbb373401a939679190177d92dbe482 | |
| parent | cb3c2dcfa34072b785cf292ca0b66494496572b9 (diff) | |
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>
| -rw-r--r-- | drivers/base/regmap/regmap-i2c.c | 1 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap-spi.c | 1 | ||||
| -rw-r--r-- | include/linux/regmap.h | 4 |
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c index c2231ff06cbc..e6ce82d0ecd1 100644 --- 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, | |||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | static struct regmap_bus regmap_i2c = { | 92 | static struct regmap_bus regmap_i2c = { |
| 93 | .type = &i2c_bus_type, | ||
| 94 | .write = regmap_i2c_write, | 93 | .write = regmap_i2c_write, |
| 95 | .gather_write = regmap_i2c_gather_write, | 94 | .gather_write = regmap_i2c_gather_write, |
| 96 | .read = regmap_i2c_read, | 95 | .read = regmap_i2c_read, |
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c index 4deba0621bc7..07633bda0a04 100644 --- 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, | |||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | static struct regmap_bus regmap_spi = { | 49 | static struct regmap_bus regmap_spi = { |
| 50 | .type = &spi_bus_type, | ||
| 51 | .write = regmap_spi_write, | 50 | .write = regmap_spi_write, |
| 52 | .gather_write = regmap_spi_gather_write, | 51 | .gather_write = regmap_spi_gather_write, |
| 53 | .read = regmap_spi_read, | 52 | .read = regmap_spi_read, |
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 4de137bc16a7..20a8fbf19d44 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
| @@ -60,8 +60,6 @@ typedef int (*regmap_hw_read)(struct device *dev, | |||
| 60 | /** | 60 | /** |
| 61 | * Description of a hardware bus for the register map infrastructure. | 61 | * Description of a hardware bus for the register map infrastructure. |
| 62 | * | 62 | * |
| 63 | * @list: Internal use. | ||
| 64 | * @type: Bus type, used to identify bus to be used for a device. | ||
| 65 | * @write: Write operation. | 63 | * @write: Write operation. |
| 66 | * @gather_write: Write operation with split register/value, return -ENOTSUPP | 64 | * @gather_write: Write operation with split register/value, return -ENOTSUPP |
| 67 | * if not implemented on a given device. | 65 | * if not implemented on a given device. |
| @@ -73,8 +71,6 @@ typedef int (*regmap_hw_read)(struct device *dev, | |||
| 73 | * a read. | 71 | * a read. |
| 74 | */ | 72 | */ |
| 75 | struct regmap_bus { | 73 | struct regmap_bus { |
| 76 | struct list_head list; | ||
| 77 | struct bus_type *type; | ||
| 78 | regmap_hw_write write; | 74 | regmap_hw_write write; |
| 79 | regmap_hw_gather_write gather_write; | 75 | regmap_hw_gather_write gather_write; |
| 80 | regmap_hw_read read; | 76 | regmap_hw_read read; |
