diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-07-10 11:57:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-07-11 20:18:27 -0400 |
commit | fdb70270015466076846a0525f195f59849c1966 (patch) | |
tree | 212789b2b7d7f6d73691f481759bdcc5d479a4d5 | |
parent | 54842ec2b0644b3e04c6fcfb52bc94dfcf918a43 (diff) |
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>
-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 @@ | |||
22 | #include <linux/spi/spi.h> | 22 | #include <linux/spi/spi.h> |
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/pinctrl/consumer.h> | ||
26 | #include <net/wpan-phy.h> | 25 | #include <net/wpan-phy.h> |
27 | #include <net/mac802154.h> | 26 | #include <net/mac802154.h> |
28 | #include <net/ieee802154.h> | 27 | #include <net/ieee802154.h> |
@@ -627,7 +626,6 @@ static int mrf24j40_probe(struct spi_device *spi) | |||
627 | int ret = -ENOMEM; | 626 | int ret = -ENOMEM; |
628 | u8 val; | 627 | u8 val; |
629 | struct mrf24j40 *devrec; | 628 | struct mrf24j40 *devrec; |
630 | struct pinctrl *pinctrl; | ||
631 | 629 | ||
632 | printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq); | 630 | printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq); |
633 | 631 | ||
@@ -638,11 +636,6 @@ static int mrf24j40_probe(struct spi_device *spi) | |||
638 | if (!devrec->buf) | 636 | if (!devrec->buf) |
639 | goto err_buf; | 637 | goto err_buf; |
640 | 638 | ||
641 | pinctrl = devm_pinctrl_get_select_default(&spi->dev); | ||
642 | if (IS_ERR(pinctrl)) | ||
643 | dev_warn(&spi->dev, | ||
644 | "pinctrl pins are not configured from the driver"); | ||
645 | |||
646 | spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */ | 639 | spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */ |
647 | if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) | 640 | if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) |
648 | spi->max_speed_hz = MAX_SPI_SPEED_HZ; | 641 | spi->max_speed_hz = MAX_SPI_SPEED_HZ; |