RE: linux-next: build failure after merge of the pinctrl tree

[Prathamesh Shete <pshete@nvidia.com>]

[-- Attachment #1: Type: text/plain, Size: 1792 bytes --]

Fixed following warnings and error.
Attached the patch that fixes the issue.
Please help apply the Patch.

Thanks
Prathamesh.

-----Original Message-----
From: Stephen Rothwell <sfr@canb.auug.org.au> 
Sent: Tuesday, October 26, 2021 10:59 AM
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Kartik . <kkartik@nvidia.com>; Prathamesh Shete <pshete@nvidia.com>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the pinctrl tree

Hi all,

After merging the pinctrl tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/pinctrl/tegra/pinctrl-tegra.c: In function 'tegra_pinctrl_get_group':
drivers/pinctrl/tegra/pinctrl-tegra.c:293:12: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  293 |     return &pmx->soc->groups[group];
      |            ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra.c:282:25: warning: unused variable 'g' [-Wunused-variable]
  282 |  struct tegra_pingroup *g;
      |                         ^
drivers/pinctrl/tegra/pinctrl-tegra.c: In function 'tegra_pinctrl_gpio_disable_free':
drivers/pinctrl/tegra/pinctrl-tegra.c:341:10: error: 'return' with a value, in function returning void [-Werror=return-type]
  341 |   return -EINVAL;
      |          ^
drivers/pinctrl/tegra/pinctrl-tegra.c:327:13: note: declared here
  327 | static void tegra_pinctrl_gpio_disable_free(struct pinctrl_dev *pctldev,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  a42c7d95d29e ("pinctrl: tegra: Use correct offset for pin group")

I have used the pinctrl tree from next-20211025 for today.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: 0001-pinctrl-tegra-Fix-warnings-and-error.patch --]
[-- Type: application/octet-stream, Size: 1541 bytes --]

From d40c09bfd0415b57e102b1be3818b02a2d1080a9 Mon Sep 17 00:00:00 2001
From: Prathamesh Shete <pshete@nvidia.com>
Date: Tue, 26 Oct 2021 17:41:35 +0530
Subject: [PATCH] pinctrl: tegra: Fix warnings and error

Fix warnings are errors caused by commit a42c7d95d29e
("pinctrl: tegra: Use correct offset for pin group").

Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
---
 drivers/pinctrl/tegra/pinctrl-tegra.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c
index 0471d9c7f0ba..8d734bfc33d2 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra.c
@@ -279,7 +279,6 @@ static struct tegra_pingroup *tegra_pinctrl_get_group(struct pinctrl_dev *pctlde
 					unsigned int offset)
 {
 	struct tegra_pmx *pmx = pinctrl_dev_get_drvdata(pctldev);
-	struct tegra_pingroup *g;
 	unsigned int group, num_pins, j;
 	const unsigned int *pins;
 	int ret;
@@ -290,7 +289,7 @@ static struct tegra_pingroup *tegra_pinctrl_get_group(struct pinctrl_dev *pctlde
 			continue;
 		for (j = 0; j < num_pins; j++) {
 			if (offset == pins[j])
-				return &pmx->soc->groups[group];
+				return (struct tegra_pingroup *)&pmx->soc->groups[group];
 		}
 	}
 
@@ -338,7 +337,7 @@ static void tegra_pinctrl_gpio_disable_free(struct pinctrl_dev *pctldev,
 	group = tegra_pinctrl_get_group(pctldev, offset);
 
 	if (!group)
-		return -EINVAL;
+		return;
 
 	if (group->mux_reg < 0 || group->sfsel_bit < 0)
 		return;
-- 
2.17.1