Merge remote-tracking branch 'spi/topic/tel62x0' into spi-next

diff --combined drivers/spi/spi-tle62x0.c
index b5a70e3fecb77ba50e5630dffe5b6493ede4744d,3e528c0396e797aba34716bb0fa8a4cde889e575..2d4010d80824a189710cf851f1a5c8e84226b26b
--- 1/drivers/spi/spi-tle62x0.c
--- 2/drivers/spi/spi-tle62x0.c
+++ b/drivers/spi/spi-tle62x0.c
@@@ -52,8 -52,7 +52,7 @@@ static inline int tle62x0_write(struct 
                buff[1] = gpio_state;
        }
  
-       dev_dbg(&st->us->dev, "buff %02x,%02x,%02x\n",
-               buff[0], buff[1], buff[2]);
+       dev_dbg(&st->us->dev, "buff %3ph\n", buff);
  
        return spi_write(st->us, buff, (st->nr_gpio == 16) ? 3 : 2);
  }
@@@ -247,7 -246,7 +246,7 @@@ static int tle62x0_probe(struct spi_dev
        int ptr;
        int ret;
  
 -      pdata = spi->dev.platform_data;
 +      pdata = dev_get_platdata(&spi->dev);
        if (pdata == NULL) {
                dev_err(&spi->dev, "no device data specified\n");
                return -EINVAL;