2023-09-10 00:14:23

by Biju Das

Subject: [PATCH v2 0/4] Match data improvements for mcp23s08 driver

This patch series aims to add match data improvements for mcp23s08 driver.
This patch series is only compile tested.

v1->v2:
* Arranged variable declaration in reverse xmas tree for patch#1.
* Updated commit description for patch#2.
* Dropped printing 'type' in error path for i2c_get_match_data().
* Added similar simplification for SPI driver.
Biju Das (4):
pinctrl: mcp23s08_i2c: Extend match support for OF tables
pinctrl: mcp23s08_i2c: Simplify probe()
pinctrl: mcp23s08_spi: Simplify probe()
pinctrl: mcp23s08_spi: Simplify mcp23s08_spi_regmap_init()

drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 101 ++++++++++++-------------
drivers/pinctrl/pinctrl-mcp23s08_spi.c | 101 +++++++++++++------------
2 files changed, 100 insertions(+), 102 deletions(-)

--
2.25.1

2023-09-10 13:50:11

by Biju Das

Subject: [PATCH v2 2/4] pinctrl: mcp23s08_i2c: Simplify probe()

Add struct mcp23s08_i2c_info and simplify probe() by replacing
match data 'type' with 'struct mcp23s08_i2c_info'.

While at it, replace 'dev_err()'->'dev_err_probe()' and drop printing
'type' in error path for i2c_get_match_data().

Signed-off-by: Biju Das <[email protected]>
---
v1->v2:
* Updated commit description
* Dropped printing 'type' in error path for i2c_get_match_data().
---
drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 101 ++++++++++++-------------
1 file changed, 49 insertions(+), 52 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
index 41ea2650a7e4..34b2cfb45860 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
@@ -8,52 +8,40 @@

#include "pinctrl-mcp23s08.h"

+struct mcp23s08_i2c_info {
+ const struct regmap_config *regmap;
+ const char *label;
+ unsigned int type;
+ u16 ngpio;
+ bool reg_shift;
+};
+
static int mcp230xx_probe(struct i2c_client *client)
{
+ const struct mcp23s08_i2c_info *info;
struct device *dev = &client->dev;
struct mcp23s08 *mcp;
- unsigned int type;
int ret;

mcp = devm_kzalloc(dev, sizeof(*mcp), GFP_KERNEL);
if (!mcp)
return -ENOMEM;

- type = (uintptr_t)i2c_get_match_data(client);
- switch (type) {
- case MCP_TYPE_008:
- mcp->regmap = devm_regmap_init_i2c(client, &mcp23x08_regmap);
- mcp->reg_shift = 0;
- mcp->chip.ngpio = 8;
- mcp->chip.label = "mcp23008";
- break;
-
- case MCP_TYPE_017:
- mcp->regmap = devm_regmap_init_i2c(client, &mcp23x17_regmap);
- mcp->reg_shift = 1;
- mcp->chip.ngpio = 16;
- mcp->chip.label = "mcp23017";
- break;
-
- case MCP_TYPE_018:
- mcp->regmap = devm_regmap_init_i2c(client, &mcp23x17_regmap);
- mcp->reg_shift = 1;
- mcp->chip.ngpio = 16;
- mcp->chip.label = "mcp23018";
- break;
-
- default:
- dev_err(dev, "invalid device type (%d)\n", type);
- return -EINVAL;
- }
+ info = i2c_get_match_data(client);
+ if (!info)
+ return dev_err_probe(dev, -EINVAL, "invalid device type\n");

+ mcp->reg_shift = info->reg_shift;
+ mcp->chip.ngpio = info->ngpio;
+ mcp->chip.label = info->label;
+ mcp->regmap = devm_regmap_init_i2c(client, info->regmap);
if (IS_ERR(mcp->regmap))
return PTR_ERR(mcp->regmap);

mcp->irq = client->irq;
mcp->pinctrl_desc.name = "mcp23xxx-pinctrl";

- ret = mcp23s08_probe_one(mcp, dev, client->addr, type, -1);
+ ret = mcp23s08_probe_one(mcp, dev, client->addr, info->type, -1);
if (ret)
return ret;

@@ -62,36 +50,45 @@ static int mcp230xx_probe(struct i2c_client *client)
return 0;
}

+static const struct mcp23s08_i2c_info mcp23s08_i2c_0008 = {
+ .regmap = &mcp23x08_regmap,
+ .label = "mcp23008",
+ .type = MCP_TYPE_008,
+ .ngpio = 8,
+ .reg_shift = 0,
+};
+
+static const struct mcp23s08_i2c_info mcp23s08_i2c_0017 = {
+ .regmap = &mcp23x17_regmap,
+ .label = "mcp23017",
+ .type = MCP_TYPE_017,
+ .ngpio = 16,
+ .reg_shift = 1,
+};
+
+static const struct mcp23s08_i2c_info mcp23s08_i2c_0018 = {
+ .regmap = &mcp23x17_regmap,
+ .label = "mcp23018",
+ .type = MCP_TYPE_018,
+ .ngpio = 16,
+ .reg_shift = 1,
+};
+
static const struct i2c_device_id mcp230xx_id[] = {
- { "mcp23008", MCP_TYPE_008 },
- { "mcp23017", MCP_TYPE_017 },
- { "mcp23018", MCP_TYPE_018 },
+ { "mcp23008", (kernel_ulong_t)&mcp23s08_i2c_0008 },
+ { "mcp23017", (kernel_ulong_t)&mcp23s08_i2c_0017 },
+ { "mcp23018", (kernel_ulong_t)&mcp23s08_i2c_0018 },
{ }
};
MODULE_DEVICE_TABLE(i2c, mcp230xx_id);

static const struct of_device_id mcp23s08_i2c_of_match[] = {
- {
- .compatible = "microchip,mcp23008",
- .data = (void *) MCP_TYPE_008,
- },
- {
- .compatible = "microchip,mcp23017",
- .data = (void *) MCP_TYPE_017,
- },
- {
- .compatible = "microchip,mcp23018",
- .data = (void *) MCP_TYPE_018,
- },
+ { .compatible = "microchip,mcp23008", .data = &mcp23s08_i2c_0008 },
+ { .compatible = "microchip,mcp23017", .data = &mcp23s08_i2c_0017 },
+ { .compatible = "microchip,mcp23018", .data = &mcp23s08_i2c_0018 },
/* NOTE: The use of the mcp prefix is deprecated and will be removed. */
- {
- .compatible = "mcp,mcp23008",
- .data = (void *) MCP_TYPE_008,
- },
- {
- .compatible = "mcp,mcp23017",
- .data = (void *) MCP_TYPE_017,
- },
+ { .compatible = "mcp,mcp23008", .data = &mcp23s08_i2c_0008 },
+ { .compatible = "mcp,mcp23017", .data = &mcp23s08_i2c_0017 },
{ }
};
MODULE_DEVICE_TABLE(of, mcp23s08_i2c_of_match);
--
2.25.1