serial: max310x: use common power function for all variants

Simplify driver by defining a common function to handle the power
control of all variants.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Link: https://lore.kernel.org/r/20240118152213.2644269-15-hugo@hugovil.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 83beaab3a0c57ed3be2e51262a684c6429e5c249..e39d8ea51e4eee5cd17da674771793104cc51f02 100644 (file)
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -260,11 +260,12 @@ struct max310x_devtype {
                unsigned short max;
        } slave_addr;
        int     nr;
-       void    (*power)(struct uart_port *, int);
        char    name[9];
        u8      mode1;
        u8      rev_id_val;
        u8      rev_id_reg; /* Relevant only if rev_id_val is defined. */
+       u8      power_reg; /* Register address for power/sleep control. */
+       u8      power_bit; /* Bit for sleep or power-off mode (active high). */
 };
 
 struct max310x_one {
@@ -378,18 +379,10 @@ static int max310x_detect(struct device *dev)
 
 static void max310x_power(struct uart_port *port, int on)
 {
-       max310x_port_update(port, MAX310X_MODE1_REG,
-                           MAX310X_MODE1_FORCESLEEP_BIT,
-                           on ? 0 : MAX310X_MODE1_FORCESLEEP_BIT);
-       if (on)
-               msleep(50);
-}
+       struct max310x_port *s = dev_get_drvdata(port->dev);
 
-static void max14830_power(struct uart_port *port, int on)
-{
-       max310x_port_update(port, MAX310X_BRGCFG_REG,
-                           MAX14830_BRGCFG_CLKDIS_BIT,
-                           on ? 0 : MAX14830_BRGCFG_CLKDIS_BIT);
+       max310x_port_update(port, s->devtype->power_reg, s->devtype->power_bit,
+                           on ? 0 : s->devtype->power_bit);
        if (on)
                msleep(50);
 }
@@ -400,7 +393,8 @@ static const struct max310x_devtype max3107_devtype = {
        .mode1  = MAX310X_MODE1_AUTOSLEEP_BIT | MAX310X_MODE1_IRQSEL_BIT,
        .rev_id_val = MAX3107_REV_ID,
        .rev_id_reg = MAX310X_REVID_REG,
-       .power  = max310x_power,
+       .power_reg = MAX310X_MODE1_REG,
+       .power_bit = MAX310X_MODE1_FORCESLEEP_BIT,
        .slave_addr     = {
                .min = 0x2c,
                .max = 0x2f,
@@ -413,7 +407,8 @@ static const struct max310x_devtype max3108_devtype = {
        .mode1  = MAX310X_MODE1_AUTOSLEEP_BIT,
        .rev_id_val = 0, /* Unsupported. */
        .rev_id_reg = 0, /* Irrelevant when rev_id_val is not defined. */
-       .power  = max310x_power,
+       .power_reg = MAX310X_MODE1_REG,
+       .power_bit = MAX310X_MODE1_FORCESLEEP_BIT,
        .slave_addr     = {
                .min = 0x60,
                .max = 0x6f,
@@ -426,7 +421,8 @@ static const struct max310x_devtype max3109_devtype = {
        .mode1  = MAX310X_MODE1_AUTOSLEEP_BIT,
        .rev_id_val = MAX3109_REV_ID,
        .rev_id_reg = MAX310X_REVID_EXTREG,
-       .power  = max310x_power,
+       .power_reg = MAX310X_MODE1_REG,
+       .power_bit = MAX310X_MODE1_FORCESLEEP_BIT,
        .slave_addr     = {
                .min = 0x60,
                .max = 0x6f,
@@ -439,7 +435,8 @@ static const struct max310x_devtype max14830_devtype = {
        .mode1  = MAX310X_MODE1_IRQSEL_BIT,
        .rev_id_val = MAX14830_REV_ID,
        .rev_id_reg = MAX310X_REVID_EXTREG,
-       .power  = max14830_power,
+       .power_reg = MAX310X_BRGCFG_REG,
+       .power_bit = MAX14830_BRGCFG_CLKDIS_BIT,
        .slave_addr     = {
                .min = 0x60,
                .max = 0x6f,
@@ -1025,10 +1022,9 @@ static int max310x_rs485_config(struct uart_port *port, struct ktermios *termios
 
 static int max310x_startup(struct uart_port *port)
 {
-       struct max310x_port *s = dev_get_drvdata(port->dev);
        unsigned int val;
 
-       s->devtype->power(port, 1);
+       max310x_power(port, 1);
 
        /* Configure MODE1 register */
        max310x_port_update(port, MAX310X_MODE1_REG,
@@ -1073,12 +1069,10 @@ static int max310x_startup(struct uart_port *port)
 
 static void max310x_shutdown(struct uart_port *port)
 {
-       struct max310x_port *s = dev_get_drvdata(port->dev);
-
        /* Disable all interrupts */
        max310x_port_write(port, MAX310X_IRQEN_REG, 0);
 
-       s->devtype->power(port, 0);
+       max310x_power(port, 0);
 }
 
 static const char *max310x_type(struct uart_port *port)
@@ -1140,7 +1134,7 @@ static int __maybe_unused max310x_suspend(struct device *dev)
 
        for (i = 0; i < s->devtype->nr; i++) {
                uart_suspend_port(&max310x_uart, &s->p[i].port);
-               s->devtype->power(&s->p[i].port, 0);
+               max310x_power(&s->p[i].port, 0);
        }
 
        return 0;
@@ -1152,7 +1146,7 @@ static int __maybe_unused max310x_resume(struct device *dev)
        int i;
 
        for (i = 0; i < s->devtype->nr; i++) {
-               s->devtype->power(&s->p[i].port, 1);
+               max310x_power(&s->p[i].port, 1);
                uart_resume_port(&max310x_uart, &s->p[i].port);
        }
 
@@ -1367,7 +1361,7 @@ static int max310x_probe(struct device *dev, const struct max310x_devtype *devty
                set_bit(line, max310x_lines);
 
                /* Go to suspend mode */
-               devtype->power(&s->p[i].port, 0);
+               max310x_power(&s->p[i].port, 0);
        }
 
 #ifdef CONFIG_GPIOLIB
@@ -1421,7 +1415,7 @@ static void max310x_remove(struct device *dev)
                if (test_and_clear_bit(s->p[i].port.line, max310x_lines))
                        uart_remove_one_port(&max310x_uart, &s->p[i].port);
 
-               s->devtype->power(&s->p[i].port, 0);
+               max310x_power(&s->p[i].port, 0);
        }
 
        clk_disable_unprepare(s->clk);