Skip to content

Commit

Permalink
drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() i…
Browse files Browse the repository at this point in the history
…n 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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Wolfram Sang authored and davem330 committed Jul 12, 2013
1 parent 54842ec commit fdb7027
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/net/ieee802154/mrf24j40.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);

Expand All @@ -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;
Expand Down

0 comments on commit fdb7027

Please sign in to comment.