mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
mtd: gpmi-nand: 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 Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
96f2a4a1a7
commit
9f7f7d8c06
1 changed files with 0 additions and 9 deletions
|
@ -26,7 +26,6 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_mtd.h>
|
||||
|
@ -520,7 +519,6 @@ static int gpmi_get_clks(struct gpmi_nand_data *this)
|
|||
|
||||
static int acquire_resources(struct gpmi_nand_data *this)
|
||||
{
|
||||
struct pinctrl *pinctrl;
|
||||
int ret;
|
||||
|
||||
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)
|
||||
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);
|
||||
if (ret)
|
||||
goto exit_clock;
|
||||
return 0;
|
||||
|
||||
exit_clock:
|
||||
exit_pin:
|
||||
release_dma_channels(this);
|
||||
exit_dma_channels:
|
||||
release_bch_irq(this);
|
||||
|
|
Loading…
Reference in a new issue