From 2d95b92c333c60291afc933b0dd819c1672fcda3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 5 Sep 2011 08:12:05 -0700 Subject: [PATCH] --- yaml --- r: 266978 b: refs/heads/master c: 5b457e3910251ef28712ba5d14adac8194bd5b2c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regmap-i2c.c | 1 - trunk/drivers/base/regmap/regmap-spi.c | 1 - trunk/include/linux/regmap.h | 3 --- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5bac99411c7b..262a22925edb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7ace561f1e3ebbf40ff20adde9968721a55ef0a +refs/heads/master: 5b457e3910251ef28712ba5d14adac8194bd5b2c diff --git a/trunk/drivers/base/regmap/regmap-i2c.c b/trunk/drivers/base/regmap/regmap-i2c.c index e7d916d1b3ea..38621ec87c05 100644 --- a/trunk/drivers/base/regmap/regmap-i2c.c +++ b/trunk/drivers/base/regmap/regmap-i2c.c @@ -93,7 +93,6 @@ static struct regmap_bus regmap_i2c = { .write = regmap_i2c_write, .gather_write = regmap_i2c_gather_write, .read = regmap_i2c_read, - .owner = THIS_MODULE, }; /** diff --git a/trunk/drivers/base/regmap/regmap-spi.c b/trunk/drivers/base/regmap/regmap-spi.c index cc0f1164cf99..14132b829062 100644 --- a/trunk/drivers/base/regmap/regmap-spi.c +++ b/trunk/drivers/base/regmap/regmap-spi.c @@ -50,7 +50,6 @@ static struct regmap_bus regmap_spi = { .write = regmap_spi_write, .gather_write = regmap_spi_gather_write, .read = regmap_spi_read, - .owner = THIS_MODULE, .read_flag_mask = 0x80, }; diff --git a/trunk/include/linux/regmap.h b/trunk/include/linux/regmap.h index 449e2642da95..9438a89e1573 100644 --- a/trunk/include/linux/regmap.h +++ b/trunk/include/linux/regmap.h @@ -85,8 +85,6 @@ typedef int (*regmap_hw_read)(struct device *dev, * if not implemented on a given device. * @read: Read operation. Data is returned in the buffer used to transmit * data. - * @owner: Module with the bus implementation, used to pin the implementation - * in memory. * @read_flag_mask: Mask to be set in the top byte of the register when doing * a read. */ @@ -94,7 +92,6 @@ struct regmap_bus { regmap_hw_write write; regmap_hw_gather_write gather_write; regmap_hw_read read; - struct module *owner; u8 read_flag_mask; };