diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-05 11:12:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-05 13:57:04 -0400 |
commit | 5b457e3910251ef28712ba5d14adac8194bd5b2c (patch) | |
tree | 6c16b40793551820607abd43aab82076433d52e3 | |
parent | a7ace561f1e3ebbf40ff20adde9968721a55ef0a (diff) |
regmap: Remove redundant owner field from the bus type struct
No longer used as users link directly with the bus types so the core
module infrastructure does refcounting for us.
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 | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c index e7d916d1b3ea..38621ec87c05 100644 --- a/drivers/base/regmap/regmap-i2c.c +++ b/drivers/base/regmap/regmap-i2c.c | |||
@@ -93,7 +93,6 @@ static struct regmap_bus regmap_i2c = { | |||
93 | .write = regmap_i2c_write, | 93 | .write = regmap_i2c_write, |
94 | .gather_write = regmap_i2c_gather_write, | 94 | .gather_write = regmap_i2c_gather_write, |
95 | .read = regmap_i2c_read, | 95 | .read = regmap_i2c_read, |
96 | .owner = THIS_MODULE, | ||
97 | }; | 96 | }; |
98 | 97 | ||
99 | /** | 98 | /** |
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c index cc0f1164cf99..14132b829062 100644 --- a/drivers/base/regmap/regmap-spi.c +++ b/drivers/base/regmap/regmap-spi.c | |||
@@ -50,7 +50,6 @@ static struct regmap_bus regmap_spi = { | |||
50 | .write = regmap_spi_write, | 50 | .write = regmap_spi_write, |
51 | .gather_write = regmap_spi_gather_write, | 51 | .gather_write = regmap_spi_gather_write, |
52 | .read = regmap_spi_read, | 52 | .read = regmap_spi_read, |
53 | .owner = THIS_MODULE, | ||
54 | .read_flag_mask = 0x80, | 53 | .read_flag_mask = 0x80, |
55 | }; | 54 | }; |
56 | 55 | ||
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 449e2642da95..9438a89e1573 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -85,8 +85,6 @@ typedef int (*regmap_hw_read)(struct device *dev, | |||
85 | * if not implemented on a given device. | 85 | * if not implemented on a given device. |
86 | * @read: Read operation. Data is returned in the buffer used to transmit | 86 | * @read: Read operation. Data is returned in the buffer used to transmit |
87 | * data. | 87 | * data. |
88 | * @owner: Module with the bus implementation, used to pin the implementation | ||
89 | * in memory. | ||
90 | * @read_flag_mask: Mask to be set in the top byte of the register when doing | 88 | * @read_flag_mask: Mask to be set in the top byte of the register when doing |
91 | * a read. | 89 | * a read. |
92 | */ | 90 | */ |
@@ -94,7 +92,6 @@ struct regmap_bus { | |||
94 | regmap_hw_write write; | 92 | regmap_hw_write write; |
95 | regmap_hw_gather_write gather_write; | 93 | regmap_hw_gather_write gather_write; |
96 | regmap_hw_read read; | 94 | regmap_hw_read read; |
97 | struct module *owner; | ||
98 | u8 read_flag_mask; | 95 | u8 read_flag_mask; |
99 | }; | 96 | }; |
100 | 97 | ||