]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe
authorWolfram Sang <wsa@the-dreams.de>
Wed, 10 Jul 2013 15:57:44 +0000 (16:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Jul 2013 00:18:27 +0000 (17:18 -0700)
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ieee802154/mrf24j40.c

index ede3ce4912f92162b9411167fb8cab5ea248c479..42e6deee6db55ed607170109438960523d6b9b8e 100644 (file)
@@ -22,7 +22,6 @@
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/pinctrl/consumer.h>
 #include <net/wpan-phy.h>
 #include <net/mac802154.h>
 #include <net/ieee802154.h>
@@ -627,7 +626,6 @@ static int mrf24j40_probe(struct spi_device *spi)
        int ret = -ENOMEM;
        u8 val;
        struct mrf24j40 *devrec;
-       struct pinctrl *pinctrl;
 
        printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);
 
@@ -638,11 +636,6 @@ static int mrf24j40_probe(struct spi_device *spi)
        if (!devrec->buf)
                goto err_buf;
 
-       pinctrl = devm_pinctrl_get_select_default(&spi->dev);
-       if (IS_ERR(pinctrl))
-               dev_warn(&spi->dev,
-                       "pinctrl pins are not configured from the driver");
-
        spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */
        if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
                spi->max_speed_hz = MAX_SPI_SPEED_HZ;