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>
This commit is contained in:
parent
54842ec2b0
commit
fdb7027001
|
@ -22,7 +22,6 @@
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/pinctrl/consumer.h>
|
|
||||||
#include <net/wpan-phy.h>
|
#include <net/wpan-phy.h>
|
||||||
#include <net/mac802154.h>
|
#include <net/mac802154.h>
|
||||||
#include <net/ieee802154.h>
|
#include <net/ieee802154.h>
|
||||||
|
@ -627,7 +626,6 @@ static int mrf24j40_probe(struct spi_device *spi)
|
||||||
int ret = -ENOMEM;
|
int ret = -ENOMEM;
|
||||||
u8 val;
|
u8 val;
|
||||||
struct mrf24j40 *devrec;
|
struct mrf24j40 *devrec;
|
||||||
struct pinctrl *pinctrl;
|
|
||||||
|
|
||||||
printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);
|
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)
|
if (!devrec->buf)
|
||||||
goto err_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? */
|
spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */
|
||||||
if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
|
if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
|
||||||
spi->max_speed_hz = MAX_SPI_SPEED_HZ;
|
spi->max_speed_hz = MAX_SPI_SPEED_HZ;
|
||||||
|
|
Loading…
Reference in New Issue