diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2013-07-10 16:57:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-11 17:18:27 -0700 |
| commit | fdb70270015466076846a0525f195f59849c1966 (patch) | |
| tree | 212789b2b7d7f6d73691f481759bdcc5d479a4d5 /drivers/net/ieee802154/mrf24j40.c | |
| parent | 54842ec2b0644b3e04c6fcfb52bc94dfcf918a43 (diff) | |
| download | talos-obmc-linux-fdb70270015466076846a0525f195f59849c1966.tar.gz talos-obmc-linux-fdb70270015466076846a0525f195f59849c1966.zip | |
drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe
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>
Diffstat (limited to 'drivers/net/ieee802154/mrf24j40.c')
| -rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index ede3ce4912f9..42e6deee6db5 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -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; |
