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

Commit 9f7f7d8c authored by Wolfram Sang's avatar Wolfram Sang Committed by David Woodhouse
Browse files

mtd: gpmi-nand: 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. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 96f2a4a1

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

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

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/pinctrl/consumer.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/of_mtd.h>

#include <linux/of_mtd.h>
@@ -520,7 +519,6 @@ err_clock: 




static int acquire_resources(struct gpmi_nand_data *this)

static int acquire_resources(struct gpmi_nand_data *this)

{

{

	struct pinctrl *pinctrl;

	int ret;

	int ret;





	ret = acquire_register_block(this, GPMI_NAND_GPMI_REGS_ADDR_RES_NAME);

	ret = acquire_register_block(this, GPMI_NAND_GPMI_REGS_ADDR_RES_NAME);
@@ -539,19 +537,12 @@ static int acquire_resources(struct gpmi_nand_data *this) 
	if (ret)

	if (ret)

		goto exit_dma_channels;

		goto exit_dma_channels;





	pinctrl = devm_pinctrl_get_select_default(&this->pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		goto exit_pin;

	}



	ret = gpmi_get_clks(this);

	ret = gpmi_get_clks(this);

	if (ret)

	if (ret)

		goto exit_clock;

		goto exit_clock;

	return 0;

	return 0;





exit_clock:

exit_clock:

exit_pin:

	release_dma_channels(this);

	release_dma_channels(this);

exit_dma_channels:

exit_dma_channels:

	release_bch_irq(this);

	release_bch_irq(this);