Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 589a55b0 authored by Wolfram Sang's avatar Wolfram Sang Committed by Marcel Holtmann
Browse files

net: ieee802154: don't use devm_pinctrl_get_select_default() in probe 



Since commit ab78029e (drivers/pinctrl: grab default handles from device
core), we can rely on device core for setting the default pins.

Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarVarka Bhadram <varkabhadram@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0f3adeae

drivers/net/ieee802154/cc2520.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/workqueue.h>

#include <linux/workqueue.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/skbuff.h>

#include <linux/skbuff.h>

#include <linux/pinctrl/consumer.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/ieee802154.h>

#include <linux/ieee802154.h>
@@ -841,7 +840,6 @@ cc2520_get_platform_data(struct spi_device *spi) 
static int cc2520_probe(struct spi_device *spi)

static int cc2520_probe(struct spi_device *spi)

{

{

	struct cc2520_private *priv;

	struct cc2520_private *priv;

	struct pinctrl *pinctrl;

	struct cc2520_platform_data *pdata;

	struct cc2520_platform_data *pdata;

	int ret;

	int ret;
@@ -854,11 +852,6 @@ static int cc2520_probe(struct spi_device *spi) 




	spi_set_drvdata(spi, priv);

	spi_set_drvdata(spi, priv);





	pinctrl = devm_pinctrl_get_select_default(&spi->dev);

	if (IS_ERR(pinctrl))

		dev_warn(&spi->dev,

			 "pinctrl pins are not configured\n");



	pdata = cc2520_get_platform_data(spi);

	pdata = cc2520_get_platform_data(spi);

	if (!pdata) {

	if (!pdata) {

		dev_err(&spi->dev, "no platform data\n");

		dev_err(&spi->dev, "no platform data\n");