summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/sc16is7xx_i2c.c
diff options
context:
space:
mode:
authorHugo Villeneuve <hvilleneuve@dimonoff.com>2024-04-09 11:42:53 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-11 14:08:08 +0200
commit48d4a801be0ff64740832fcc71ac4632c12fd73b (patch)
tree8c75642f8da8b97ba4a3f69d7779f988a6acd718 /drivers/tty/serial/sc16is7xx_i2c.c
parentcf9c37530fdabc0c25a896ff56f4c9208dcb9c86 (diff)
downloadlinux-48d4a801be0ff64740832fcc71ac4632c12fd73b.tar.gz
linux-48d4a801be0ff64740832fcc71ac4632c12fd73b.tar.bz2
linux-48d4a801be0ff64740832fcc71ac4632c12fd73b.zip
serial: sc16is7xx: split into core and I2C/SPI parts (sc16is7xx_regcfg)
Since each I2C/SPI probe function can modify sc16is7xx_regcfg at the same time, change structure to be constant and do the required modifications on a local copy. Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> Reviewed-by: Andy Shevchenko <andy@kernel.org> Link: https://lore.kernel.org/r/20240409154253.3043822-6-hugo@hugovil.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/sc16is7xx_i2c.c')
-rw-r--r--drivers/tty/serial/sc16is7xx_i2c.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/tty/serial/sc16is7xx_i2c.c b/drivers/tty/serial/sc16is7xx_i2c.c
index de51d1675abf..3ed47c306d85 100644
--- a/drivers/tty/serial/sc16is7xx_i2c.c
+++ b/drivers/tty/serial/sc16is7xx_i2c.c
@@ -14,17 +14,20 @@ static int sc16is7xx_i2c_probe(struct i2c_client *i2c)
{
const struct sc16is7xx_devtype *devtype;
struct regmap *regmaps[SC16IS7XX_MAX_PORTS];
+ struct regmap_config regcfg;
unsigned int i;
devtype = i2c_get_match_data(i2c);
if (!devtype)
return dev_err_probe(&i2c->dev, -ENODEV, "Failed to match device\n");
+ memcpy(&regcfg, &sc16is7xx_regcfg, sizeof(struct regmap_config));
+
for (i = 0; i < devtype->nr_uart; i++) {
- sc16is7xx_regcfg.name = sc16is7xx_regmap_name(i);
- sc16is7xx_regcfg.read_flag_mask = sc16is7xx_regmap_port_mask(i);
- sc16is7xx_regcfg.write_flag_mask = sc16is7xx_regmap_port_mask(i);
- regmaps[i] = devm_regmap_init_i2c(i2c, &sc16is7xx_regcfg);
+ regcfg.name = sc16is7xx_regmap_name(i);
+ regcfg.read_flag_mask = sc16is7xx_regmap_port_mask(i);
+ regcfg.write_flag_mask = sc16is7xx_regmap_port_mask(i);
+ regmaps[i] = devm_regmap_init_i2c(i2c, &regcfg);
}
return sc16is7xx_probe(&i2c->dev, devtype, regmaps, i2c->irq);