summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-05 20:21:12 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-23 19:24:40 +0200
commit89bf01f6434923d86bc3ad98c8db064757828922 (patch)
treea072ca4273dad77f6397859dfc77679dffb83218
parent80936272a2bdb8052774e44a6d60573ca1a3075e (diff)
backports: remove devm_regmap_init_spi()
This is not used by any code in backports, not even a DRM driver. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--backport/backport-include/linux/regmap.h5
-rw-r--r--backport/compat/compat-3.4.c73
2 files changed, 0 insertions, 78 deletions
diff --git a/backport/backport-include/linux/regmap.h b/backport/backport-include/linux/regmap.h
index ac6a3f25..870ea2c2 100644
--- a/backport/backport-include/linux/regmap.h
+++ b/backport/backport-include/linux/regmap.h
@@ -25,11 +25,6 @@ struct regmap *devm_regmap_init(struct device *dev,
struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,
const struct regmap_config *config);
#endif /* defined(CONFIG_REGMAP_I2C) */
-#if defined(CONFIG_REGMAP_SPI)
-#define devm_regmap_init_spi LINUX_BACKPORT(devm_regmap_init_spi)
-struct regmap *devm_regmap_init_spi(struct spi_device *dev,
- const struct regmap_config *config);
-#endif /* defined(CONFIG_REGMAP_SPI) */
/*
* We can't backport these unless we try to backport
diff --git a/backport/compat/compat-3.4.c b/backport/compat/compat-3.4.c
index 99dfb0cb..f6b826d3 100644
--- a/backport/compat/compat-3.4.c
+++ b/backport/compat/compat-3.4.c
@@ -260,79 +260,6 @@ struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,
EXPORT_SYMBOL_GPL(devm_regmap_init_i2c);
#endif /* defined(CONFIG_REGMAP_I2C) */
-#if defined(CONFIG_REGMAP_SPI)
-static int regmap_spi_write(
- struct device *dev,
- const void *data, size_t count)
-{
- struct spi_device *spi = to_spi_device(dev);
-
- return spi_write(spi, data, count);
-}
-
-static int regmap_spi_gather_write(
- struct device *dev,
- const void *reg, size_t reg_len,
- const void *val, size_t val_len)
-{
- struct spi_device *spi = to_spi_device(dev);
- struct spi_message m;
- struct spi_transfer t[2] = { { .tx_buf = reg, .len = reg_len, },
- { .tx_buf = val, .len = val_len, }, };
-
- spi_message_init(&m);
- spi_message_add_tail(&t[0], &m);
- spi_message_add_tail(&t[1], &m);
-
- return spi_sync(spi, &m);
-}
-
-static int regmap_spi_read(
- struct device *dev,
- const void *reg, size_t reg_size,
- void *val, size_t val_size)
-{
- struct spi_device *spi = to_spi_device(dev);
-
- return spi_write_then_read(spi, reg, reg_size, val, val_size);
-}
-
-static struct regmap_bus regmap_spi = {
- .write = regmap_spi_write,
- .gather_write = regmap_spi_gather_write,
-/*
- * See commit 0d509f2b112b
- * only 3.9 kernels have this we'll ignore it
- * given I have not seen drivers use these we
- * are backporting. We'll -EINVAL these.
- */
-#if 0
- .async_write = regmap_spi_async_write,
- .async_alloc = regmap_spi_async_alloc,
-#endif
- .read = regmap_spi_read,
- .read_flag_mask = 0x80,
-
-};
-
-/**
- * devm_regmap_init_spi(): Initialise register map
- *
- * @spi: Device that will be interacted with
- * @config: Configuration for register map
- *
- * The return value will be an ERR_PTR() on error or a valid pointer
- * to a struct regmap. The map will be automatically freed by the
- * device management code.
- */
-struct regmap *devm_regmap_init_spi(struct spi_device *spi,
- const struct regmap_config *config)
-{
- return devm_regmap_init(&spi->dev, &regmap_spi, config);
-}
-EXPORT_SYMBOL_GPL(devm_regmap_init_spi);
-#endif /* defined(CONFIG_REGMAP_SPI) */
-
#endif /* defined(CONFIG_REGMAP) */
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) */