[v4,1/3] pinctrl: mcp23s08: fix probing of mcp23s18
diff mbox series

Message ID 1519032320-103817-2-git-send-email-preid@electromag.com.au
State New
Headers show
Series
  • pinctrl: mcp32s08: add open drain config for irq
Related show

Commit Message

Phil Reid Feb. 19, 2018, 9:25 a.m. UTC
one_regmap_config is always null if mcp type is MCP_TYPE_S18.
Remove the null check so that the mcp23s18 will probe.

Fixes: 1781af563aef66c2eb7cda ("pinctrl: mcp23s08: spi: Fix
duplicate pinctrl debugfs entries")

Signed-off-by: Phil Reid <preid@electromag.com.au>
---
 drivers/pinctrl/pinctrl-mcp23s08.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Jan Kundrát Feb. 19, 2018, 9:24 p.m. UTC | #1
On pondělí 19. února 2018 10:25:18 CET, Phil Reid wrote:
> one_regmap_config is always null if mcp type is MCP_TYPE_S18.
> Remove the null check so that the mcp23s18 will probe.
>
> Fixes: 1781af563aef66c2eb7cda ("pinctrl: mcp23s08: spi: Fix
> duplicate pinctrl debugfs entries")
>
> Signed-off-by: Phil Reid <preid@electromag.com.au>

Thanks, and sorry for this mistake.

Reviewed-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Fixes: 9b3e4207661e ("pinctrl: mcp23s08: spi: Fix regmap debugfs entries")

> ---
>  drivers/pinctrl/pinctrl-mcp23s08.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c 
> b/drivers/pinctrl/pinctrl-mcp23s08.c
> index f3f9f19..83277570 100644
> --- a/drivers/pinctrl/pinctrl-mcp23s08.c
> +++ b/drivers/pinctrl/pinctrl-mcp23s08.c
> @@ -823,8 +823,6 @@ static int mcp23s08_probe_one(struct 
> mcp23s08 *mcp, struct device *dev,
>  		break;
>  
>  	case MCP_TYPE_S18:
> -		if (!one_regmap_config)
> -			return -ENOMEM;
>  		mcp->regmap = devm_regmap_init(dev, &mcp23sxx_spi_regmap, mcp,
>  					       &mcp23x17_regmap);
>  		mcp->reg_shift = 1;

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij Feb. 22, 2018, 3:05 p.m. UTC | #2
On Mon, Feb 19, 2018 at 10:25 AM, Phil Reid <preid@electromag.com.au> wrote:

> one_regmap_config is always null if mcp type is MCP_TYPE_S18.
> Remove the null check so that the mcp23s18 will probe.
>
> Fixes: 1781af563aef66c2eb7cda ("pinctrl: mcp23s08: spi: Fix
> duplicate pinctrl debugfs entries")
>
> Signed-off-by: Phil Reid <preid@electromag.com.au>

Patch applied with Jan's ACK.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox series

diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index f3f9f19..83277570 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -823,8 +823,6 @@  static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
 		break;
 
 	case MCP_TYPE_S18:
-		if (!one_regmap_config)
-			return -ENOMEM;
 		mcp->regmap = devm_regmap_init(dev, &mcp23sxx_spi_regmap, mcp,
 					       &mcp23x17_regmap);
 		mcp->reg_shift = 1;