i2c: i801: Cosmetic improvements

- Use pci_err et al instead of dev_err to simplify the code
- use format %pr to print resource

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/6676001a-a584-46e2-a98e-17163d82c218@gmail.com

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 171d29d2770e379fa839a72a2107a90b7c33a70a..a3d79a5ab570b1b401813f29acdcd2944fc6f629 100644 (file)
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -412,16 +412,14 @@ static int i801_check_post(struct i801_priv *priv, int status)
 
                /* Check if it worked */
                status = inb_p(SMBHSTSTS(priv));
-               if ((status & SMBHSTSTS_HOST_BUSY) ||
-                   !(status & SMBHSTSTS_FAILED))
-                       dev_dbg(&priv->pci_dev->dev,
-                               "Failed terminating the transaction\n");
+               if ((status & SMBHSTSTS_HOST_BUSY) || !(status & SMBHSTSTS_FAILED))
+                       pci_dbg(priv->pci_dev, "Failed terminating the transaction\n");
                return -ETIMEDOUT;
        }
 
        if (status & SMBHSTSTS_FAILED) {
                result = -EIO;
-               dev_err(&priv->pci_dev->dev, "Transaction failed\n");
+               pci_err(priv->pci_dev, "Transaction failed\n");
        }
        if (status & SMBHSTSTS_DEV_ERR) {
                /*
@@ -449,7 +447,7 @@ static int i801_check_post(struct i801_priv *priv, int status)
        }
        if (status & SMBHSTSTS_BUS_ERR) {
                result = -EAGAIN;
-               dev_dbg(&priv->pci_dev->dev, "Lost arbitration\n");
+               pci_dbg(priv->pci_dev, "Lost arbitration\n");
        }
 
        return result;
@@ -578,8 +576,7 @@ static void i801_isr_byte_done(struct i801_priv *priv)
                if (priv->count < priv->len)
                        priv->data[priv->count++] = inb(SMBBLKDAT(priv));
                else
-                       dev_dbg(&priv->pci_dev->dev,
-                               "Discarding extra byte on block read\n");
+                       pci_dbg(priv->pci_dev, "Discarding extra byte on block read\n");
 
                /* Set LAST_BYTE for last byte of read transaction */
                if (priv->count == priv->len - 1)
@@ -1438,7 +1435,7 @@ static void i801_add_tco(struct i801_priv *priv)
                priv->tco_pdev = i801_add_tco_spt(pci_dev, tco_res);
 
        if (IS_ERR(priv->tco_pdev))
-               dev_warn(&pci_dev->dev, "failed to create iTCO device\n");
+               pci_warn(pci_dev, "failed to create iTCO device\n");
 }
 
 #ifdef CONFIG_ACPI
@@ -1467,8 +1464,8 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,
        if (!priv->acpi_reserved && i801_acpi_is_smbus_ioport(priv, address)) {
                priv->acpi_reserved = true;
 
-               dev_warn(&pdev->dev, "BIOS is accessing SMBus registers\n");
-               dev_warn(&pdev->dev, "Driver SMBus register access inhibited\n");
+               pci_warn(pdev, "BIOS is accessing SMBus registers\n");
+               pci_warn(pdev, "Driver SMBus register access inhibited\n");
 
                /*
                 * BIOS is accessing the host controller so prevent it from
@@ -1549,8 +1546,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
        /* Disable features on user request */
        for (i = 0; i < ARRAY_SIZE(i801_feature_names); i++) {
                if (priv->features & disable_features & (1 << i))
-                       dev_notice(&dev->dev, "%s disabled by user\n",
-                                  i801_feature_names[i]);
+                       pci_notice(dev, "%s disabled by user\n", i801_feature_names[i]);
        }
        priv->features &= ~disable_features;
 
@@ -1564,16 +1560,14 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
         */
        err = pci_enable_device(dev);
        if (err) {
-               dev_err(&dev->dev, "Failed to enable SMBus PCI device (%d)\n",
-                       err);
+               pci_err(dev, "Failed to enable SMBus PCI device (%d)\n", err);
                return err;
        }
 
        /* Determine the address of the SMBus area */
        priv->smba = pci_resource_start(dev, SMBBAR);
        if (!priv->smba) {
-               dev_err(&dev->dev,
-                       "SMBus base address uninitialized, upgrade BIOS\n");
+               pci_err(dev, "SMBus base address uninitialized, upgrade BIOS\n");
                return -ENODEV;
        }
 
@@ -1582,26 +1576,24 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
        err = pcim_iomap_regions(dev, 1 << SMBBAR, DRV_NAME);
        if (err) {
-               dev_err(&dev->dev,
-                       "Failed to request SMBus region 0x%lx-0x%Lx\n",
-                       priv->smba,
-                       (unsigned long long)pci_resource_end(dev, SMBBAR));
+               pci_err(dev, "Failed to request SMBus region %pr\n",
+                       pci_resource_n(dev, SMBBAR));
                i801_acpi_remove(priv);
                return err;
        }
 
-       pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &priv->original_hstcfg);
+       pci_read_config_byte(dev, SMBHSTCFG, &priv->original_hstcfg);
        i801_setup_hstcfg(priv);
        if (!(priv->original_hstcfg & SMBHSTCFG_HST_EN))
-               dev_info(&dev->dev, "Enabling SMBus device\n");
+               pci_info(dev, "Enabling SMBus device\n");
 
        if (priv->original_hstcfg & SMBHSTCFG_SMB_SMI_EN) {
-               dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n");
+               pci_dbg(dev, "SMBus using interrupt SMI#\n");
                /* Disable SMBus interrupt feature if SMBus using SMI# */
                priv->features &= ~FEATURE_IRQ;
        }
        if (priv->original_hstcfg & SMBHSTCFG_SPD_WD)
-               dev_info(&dev->dev, "SPD Write Disable is set\n");
+               pci_info(dev, "SPD Write Disable is set\n");
 
        /* Clear special mode bits */
        if (priv->features & (FEATURE_SMBUS_PEC | FEATURE_BLOCK_BUFFER))
@@ -1620,7 +1612,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
                /* Complain if an interrupt is already pending */
                pci_read_config_word(priv->pci_dev, PCI_STATUS, &pcists);
                if (pcists & PCI_STATUS_INTERRUPT)
-                       dev_warn(&dev->dev, "An interrupt is pending!\n");
+                       pci_warn(dev, "An interrupt is pending!\n");
        }
 
        if (priv->features & FEATURE_IRQ) {
@@ -1629,12 +1621,11 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
                err = devm_request_irq(&dev->dev, dev->irq, i801_isr,
                                       IRQF_SHARED, DRV_NAME, priv);
                if (err) {
-                       dev_err(&dev->dev, "Failed to allocate irq %d: %d\n",
-                               dev->irq, err);
+                       pci_err(dev, "Failed to allocate irq %d: %d\n", dev->irq, err);
                        priv->features &= ~FEATURE_IRQ;
                }
        }
-       dev_info(&dev->dev, "SMBus using %s\n",
+       pci_info(dev, "SMBus using %s\n",
                 priv->features & FEATURE_IRQ ? "PCI interrupt" : "polling");
 
        /* Host notification uses an interrupt */