diff mbox series

[v2,2/6] i2c: designware-pci: Convert to use dev_err_probe()

Message ID 20211213180034.30929-2-andriy.shevchenko@linux.intel.com
State New
Headers show
Series [v2,1/6] i2c: designware-pci: Use temporary variable for struct device | expand

Commit Message

Andy Shevchenko Dec. 13, 2021, 6 p.m. UTC
It's fine to call dev_err_probe() in ->probe() when error code is known.
Convert the driver to use dev_err_probe().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: no changes
 drivers/i2c/busses/i2c-designware-pcidrv.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index 5f76010f7dfd..85860902c496 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -242,26 +242,20 @@  static int i2c_dw_pci_probe(struct pci_dev *pdev,
 	struct dw_pci_controller *controller;
 	struct dw_scl_sda_cfg *cfg;
 
-	if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) {
-		dev_err(d, "%s: invalid driver data %ld\n", __func__, id->driver_data);
-		return -EINVAL;
-	}
+	if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers))
+		return dev_err_probe(d, -EINVAL, "invalid driver data %ld\n", id->driver_data);
 
 	controller = &dw_pci_controllers[id->driver_data];
 
 	r = pcim_enable_device(pdev);
-	if (r) {
-		dev_err(d, "Failed to enable I2C PCI device (%d)\n", r);
-		return r;
-	}
+	if (r)
+		return dev_err_probe(d, r, "Failed to enable I2C PCI device\n");
 
 	pci_set_master(pdev);
 
 	r = pcim_iomap_regions(pdev, 1 << 0, pci_name(pdev));
-	if (r) {
-		dev_err(d, "I/O memory remapping failed\n");
-		return r;
-	}
+	if (r)
+		return dev_err_probe(d, r, "I/O memory remapping failed\n");
 
 	dev = devm_kzalloc(d, sizeof(*dev), GFP_KERNEL);
 	if (!dev)