Hi Thomas,
On Sat, Sep 24, 2022 at 12:46:12PM +0200, Thomas Bogendoerfer wrote:
> On Thu, Sep 22, 2022 at 09:55:40PM -0700, Dmitry Torokhov wrote:
> > This switches vmmc to use gpiod API instead of OF-specific legacy gpio
> > API that we want to stop exporting from gpiolib.
> >
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> > ---
> > arch/mips/lantiq/xway/vmmc.c | 22 +++++++++++++---------
> > 1 file changed, 13 insertions(+), 9 deletions(-)
>
> applied to mips-next.
My apologies, I screwed up. I thought this patch passed 0day before I
sent it to you, but apparently it has not.
Here is a fixup (actually cross-compiled this time), or I can send a v2
incorporating it into the original change.
Thanks.
--
Dmitry
MIPS: Lantiq: vmmc: fix compile break introduced by gpiod patch
"MIPS: Lantiq: switch vmmc to use gpiod API" patch introduced compile
errors, this patch fixes them.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
---
arch/mips/lantiq/xway/vmmc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c
index a1947306ac18..b6b0d9884b88 100644
--- a/arch/mips/lantiq/xway/vmmc.c
+++ b/arch/mips/lantiq/xway/vmmc.c
@@ -41,11 +41,11 @@ static int vmmc_probe(struct platform_device *pdev)
if (IS_ERR(gpio)) {
dev_err(&pdev->dev,
"failed to request GPIO idx %d: %d\n",
- gpio_count, PTR_ERR(gpio);
+ gpio_count, PTR_ERR(gpio));
continue;
}
- gpio_consumer_set_name(gpio, "vmmc-relay");
+ gpiod_set_consumer_name(gpio, "vmmc-relay");
}
dev_info(&pdev->dev, "reserved %dMB at 0x%p", CP1_SIZE >> 20, cp1_base);
--
2.38.0.rc1.362.ged0d419d3c-goog
