serial: 8250_exar: Extract cti_board_init_osc_freq() helper

Extract cti_board_init_osc_freq() helper to avoid code duplication.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Parker Newman <pnewman@connecttech.com>
Link: https://lore.kernel.org/r/20240503171917.2921250-7-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index ac373cde7e39b8203dfb4d319a070d151e117b4e..956323e2de4a067eb8ddf71d3861af8f57a7be5e 100644 (file)
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -695,7 +695,6 @@ static int cti_read_osc_freq(struct exar8250 *priv, u8 eeprom_offset)
 {
        u16 lower_word;
        u16 upper_word;
-       int osc_freq;
 
        lower_word = exar_ee_read(priv, eeprom_offset);
        // Check if EEPROM word was blank
@@ -706,10 +705,8 @@ static int cti_read_osc_freq(struct exar8250 *priv, u8 eeprom_offset)
        if (upper_word == 0xFFFF)
                return -EIO;
 
-       osc_freq = FIELD_PREP(CTI_EE_MASK_OSC_FREQ_LOWER, lower_word) |
-               FIELD_PREP(CTI_EE_MASK_OSC_FREQ_UPPER, upper_word);
-
-       return osc_freq;
+       return FIELD_PREP(CTI_EE_MASK_OSC_FREQ_LOWER, lower_word) |
+              FIELD_PREP(CTI_EE_MASK_OSC_FREQ_UPPER, upper_word);
 }
 
 /**
@@ -890,6 +887,19 @@ static int cti_rs485_config_mpio_tristate(struct uart_port *port,
        return cti_tristate_disable(priv, port->port_id);
 }
 
+static void cti_board_init_osc_freq(struct exar8250 *priv, struct pci_dev *pcidev, u8 eeprom_offset)
+{
+       int osc_freq;
+
+       osc_freq = cti_read_osc_freq(priv, eeprom_offset);
+       if (osc_freq <= 0) {
+               dev_warn(&pcidev->dev, "failed to read OSC freq from EEPROM, using default\n");
+               osc_freq = CTI_DEFAULT_PCI_OSC_FREQ;
+       }
+
+       priv->osc_freq = osc_freq;
+}
+
 static int cti_port_setup_common(struct exar8250 *priv,
                                struct pci_dev *pcidev,
                                int idx, unsigned int offset,
@@ -1095,19 +1105,9 @@ static int cti_board_init_xr17v35x(struct exar8250 *priv,
        return 0;
 }
 
-static int cti_board_init_xr17v25x(struct exar8250 *priv,
-                               struct pci_dev *pcidev)
+static int cti_board_init_xr17v25x(struct exar8250 *priv, struct pci_dev *pcidev)
 {
-       int osc_freq;
-
-       osc_freq = cti_read_osc_freq(priv, CTI_EE_OFF_XR17V25X_OSC_FREQ);
-       if (osc_freq < 0) {
-               dev_warn(&pcidev->dev,
-                       "failed to read osc freq from EEPROM, using default\n");
-               osc_freq = CTI_DEFAULT_PCI_OSC_FREQ;
-       }
-
-       priv->osc_freq = osc_freq;
+       cti_board_init_osc_freq(priv, pcidev, CTI_EE_OFF_XR17V25X_OSC_FREQ);
 
        /* enable interrupts on cards that need the "PLX fix" */
        switch (pcidev->subsystem_device) {
@@ -1123,19 +1123,9 @@ static int cti_board_init_xr17v25x(struct exar8250 *priv,
        return 0;
 }
 
-static int cti_board_init_xr17c15x(struct exar8250 *priv,
-                               struct pci_dev *pcidev)
+static int cti_board_init_xr17c15x(struct exar8250 *priv, struct pci_dev *pcidev)
 {
-       int osc_freq;
-
-       osc_freq = cti_read_osc_freq(priv, CTI_EE_OFF_XR17C15X_OSC_FREQ);
-       if (osc_freq <= 0) {
-               dev_warn(&pcidev->dev,
-                       "failed to read osc freq from EEPROM, using default\n");
-               osc_freq = CTI_DEFAULT_PCI_OSC_FREQ;
-       }
-
-       priv->osc_freq = osc_freq;
+       cti_board_init_osc_freq(priv, pcidev, CTI_EE_OFF_XR17C15X_OSC_FREQ);
 
        /* enable interrupts on cards that need the "PLX fix" */
        switch (pcidev->subsystem_device) {