The bit_per_word can be set in the OF Device tree, so no need to force it as with the platform_data when using OF Platform
Signed-off-by: Patrick Vasseur <[email protected]> Signed-off-by: Christophe Leroy <[email protected]> diff -ur linux-3.8.4/drivers/gpio/gpio-max7301.c linux/drivers/gpio/gpio-max7301.c --- linux-3.8.4/drivers/gpio/gpio-max7301.c 2013-03-20 21:11:19.000000000 +0100 +++ linux/drivers/gpio/gpio-max7301.c 2013-03-16 10:27:30.000000000 +0100 @@ -56,7 +56,8 @@ int ret; /* bits_per_word cannot be configured in platform data */ - spi->bits_per_word = 16; + if (spi->dev.platform_data) + spi->bits_per_word = 16; ret = spi_setup(spi); if (ret < 0) return ret; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
