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

Commit dfda7d8f authored by Fabio Estevam's avatar Fabio Estevam Committed by Wolfram Sang
Browse files

i2c: mxs: Let device core handle pinctrl 



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

So remove devm_pinctrl_get_select_default() from the driver.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 76b1f723

drivers/i2c/busses/i2c-mxs.c

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

#include <linux/jiffies.h>

#include <linux/io.h>

#include <linux/pinctrl/consumer.h>

#include <linux/stmp_device.h>

#include <linux/of.h>

#include <linux/of_device.h>
@@ -638,15 +637,10 @@ static int mxs_i2c_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct mxs_i2c_dev *i2c;

	struct i2c_adapter *adap;

	struct pinctrl *pinctrl;

	struct resource *res;

	resource_size_t res_size;

	int err, irq;



	pinctrl = devm_pinctrl_get_select_default(dev);

	if (IS_ERR(pinctrl))

		return PTR_ERR(pinctrl);



	i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL);

	if (!i2c)

		return -ENOMEM;