From 31eb4b554db7d1f75c3083cfeca1ec4c2874da7f Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Tue, 20 Aug 2013 08:29:23 +0200 Subject: gpio: max7301: Reverting "Do not force SPI speed when using OF Platform" This patch reverts commit 047b93a35961f7a6561e6f5dcb040738f822b892 which breaks MAX7301 GPIO driver because that commit was dependant on a rejected patch that was implementing selection of SPI speed from the Device Tree. Signed-off-by: Christophe Leroy Acked-by: Roland Stigge Signed-off-by: Linus Walleij --- drivers/gpio/gpio-max7301.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/gpio') diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c index 3b16ab701630..6e1c984a75d4 100644 --- a/drivers/gpio/gpio-max7301.c +++ b/drivers/gpio/gpio-max7301.c @@ -56,8 +56,7 @@ static int max7301_probe(struct spi_device *spi) int ret; /* bits_per_word cannot be configured in platform data */ - if (spi->dev.platform_data) - spi->bits_per_word = 16; + spi->bits_per_word = 16; ret = spi_setup(spi); if (ret < 0) return ret; -- cgit v1.2.3