Merge tag 'spi-3.6' into v3.5-rc7-dt-v3

spi: Updates for 3.6

Since Grant is even more specacularly busy than usual for the time being
I've been collecting SPI patches for him for this release - probably
things will revert back to Grant before the next release.  There's
nothing too exciting here, mostly it's simple driver specific stuff:

- Add spi: to the modaliases of SPI devices to provide namespacing.
- A driver for AD-FMCOMMS1-EBZ.
- DT binding for Orion.
- Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers.

There may be a few more fixes I've missed, people keep sending me new
things.

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 47877d687614..e834ff8c0188 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -626,7 +626,7 @@ static void spi_imx_chipselect(struct spi_device *spi, int is_active)
         int active = is_active != BITBANG_CS_INACTIVE;
         int dev_is_lowactive = !(spi->mode & SPI_CS_HIGH);
 
-        if (gpio < 0)
+        if (!gpio_is_valid(gpio))
                 return;
 
         gpio_set_value(gpio, dev_is_lowactive ^ active);
@@ -688,8 +688,6 @@ static int spi_imx_setupxfer(struct spi_device *spi,
                 config.speed_hz = spi->max_speed_hz;
         if (!config.bpw)
                 config.bpw = spi->bits_per_word;
-        if (!config.speed_hz)
-                config.speed_hz = spi->max_speed_hz;
 
         /* Initialize the functions for transfer */
         if (config.bpw <= 8) {
@@ -738,7 +736,7 @@ static int spi_imx_setup(struct spi_device *spi)
         dev_dbg(&spi->dev, "%s: mode %d, %u bpw, %d hz\n", __func__,
                  spi->mode, spi->bits_per_word, spi->max_speed_hz);
 
-        if (gpio >= 0)
+        if (gpio_is_valid(gpio))
                 gpio_direction_output(gpio, spi->mode & SPI_CS_HIGH ? 0 : 1);
 
         spi_imx_chipselect(spi, BITBANG_CS_INACTIVE);
@@ -791,11 +789,11 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
 
         for (i = 0; i < master->num_chipselect; i++) {
                 int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);
-                if (cs_gpio < 0 && mxc_platform_info)
+                if (!gpio_is_valid(cs_gpio) && mxc_platform_info)
                         cs_gpio = mxc_platform_info->chipselect[i];
 
                 spi_imx->chipselect[i] = cs_gpio;
-                if (cs_gpio < 0)
+                if (!gpio_is_valid(cs_gpio))
                         continue;
 
                 ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME);
@@ -897,7 +895,7 @@ out_release_mem:
         release_mem_region(res->start, resource_size(res));
 out_gpio_free:
         while (--i >= 0) {
-                if (spi_imx->chipselect[i] >= 0)
+                if (gpio_is_valid(spi_imx->chipselect[i]))
                         gpio_free(spi_imx->chipselect[i]);
         }
         spi_master_put(master);
@@ -922,7 +920,7 @@ static int __devexit spi_imx_remove(struct platform_device *pdev)
         iounmap(spi_imx->base);
 
         for (i = 0; i < master->num_chipselect; i++)
-                if (spi_imx->chipselect[i] >= 0)
+                if (gpio_is_valid(spi_imx->chipselect[i]))
                         gpio_free(spi_imx->chipselect[i]);
 
         spi_master_put(master);