aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2014-12-22 17:16:55 -0500
committerMarcel Holtmann <marcel@holtmann.org>2014-12-30 01:12:01 -0500
commit589a55b07dfb71d4c45e008a8df8bb94ff813fe6 (patch)
tree3c952d5416e49a3dcbfeae88f1f30150a54ae0ed
parent0f3adeae6011fe82ccdee858dad6b7b2bd790add (diff)
net: ieee802154: don't use devm_pinctrl_get_select_default() in probe
Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device core), we can rely on device core for setting the default pins. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Acked-by: Varka Bhadram <varkabhadram@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/net/ieee802154/cc2520.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index c2b7da3da183..033473448d9f 100644
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -19,7 +19,6 @@
19#include <linux/workqueue.h> 19#include <linux/workqueue.h>
20#include <linux/interrupt.h> 20#include <linux/interrupt.h>
21#include <linux/skbuff.h> 21#include <linux/skbuff.h>
22#include <linux/pinctrl/consumer.h>
23#include <linux/of_gpio.h> 22#include <linux/of_gpio.h>
24#include <linux/ieee802154.h> 23#include <linux/ieee802154.h>
25 24
@@ -841,7 +840,6 @@ done:
841static int cc2520_probe(struct spi_device *spi) 840static int cc2520_probe(struct spi_device *spi)
842{ 841{
843 struct cc2520_private *priv; 842 struct cc2520_private *priv;
844 struct pinctrl *pinctrl;
845 struct cc2520_platform_data *pdata; 843 struct cc2520_platform_data *pdata;
846 int ret; 844 int ret;
847 845
@@ -854,11 +852,6 @@ static int cc2520_probe(struct spi_device *spi)
854 852
855 spi_set_drvdata(spi, priv); 853 spi_set_drvdata(spi, priv);
856 854
857 pinctrl = devm_pinctrl_get_select_default(&spi->dev);
858 if (IS_ERR(pinctrl))
859 dev_warn(&spi->dev,
860 "pinctrl pins are not configured\n");
861
862 pdata = cc2520_get_platform_data(spi); 855 pdata = cc2520_get_platform_data(spi);
863 if (!pdata) { 856 if (!pdata) {
864 dev_err(&spi->dev, "no platform data\n"); 857 dev_err(&spi->dev, "no platform data\n");