summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2017-02-22 19:32:48 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-02-23 18:21:28 +0100
commitb4816f794d672494deb6e87bb0a8ef41ca1ca329 (patch)
tree686dc2d67569bfc2107eb09130faed19830e1065
parentInput: ad7879 - allow exporting AUX/VBAT/GPIO pin via device property (diff)
downloadlinux-b4816f794d672494deb6e87bb0a8ef41ca1ca329.tar.xz
linux-b4816f794d672494deb6e87bb0a8ef41ca1ca329.zip
Input: ad7879-spi - remove bits_per_word = 16 enforcement
Using regmap this is no longer required. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/ad7879-spi.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index b995891af20d..7af5a2349173 100644
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -34,7 +34,6 @@ static int ad7879_spi_probe(struct spi_device *spi)
{
struct ad7879 *ts;
struct regmap *regmap;
- int err;
/* don't exceed max specified SPI CLK frequency */
if (spi->max_speed_hz > MAX_SPI_FREQ_HZ) {
@@ -42,13 +41,6 @@ static int ad7879_spi_probe(struct spi_device *spi)
return -EINVAL;
}
- spi->bits_per_word = 16;
- err = spi_setup(spi);
- if (err) {
- dev_dbg(&spi->dev, "spi master doesn't support 16 bits/word\n");
- return err;
- }
-
regmap = devm_regmap_init_spi(spi, &ad7879_spi_regmap_config);
if (IS_ERR(regmap))
return PTR_ERR(regmap);