Commit 2759181d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: designware-pci: Convert to use dev_err_probe() 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 0897f173

drivers/i2c/busses/i2c-designware-pcidrv.c

+10 −14
Original line number Diff line number Diff line
@@ -246,28 +246,24 @@ 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(&pdev->dev, "%s: invalid driver data %ld\n", __func__,

	if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers))

		return dev_err_probe(&pdev->dev, -EINVAL,

				     "Invalid driver data %ld\n",

				     id->driver_data);

		return -EINVAL;

	}



	controller = &dw_pci_controllers[id->driver_data];



	r = pcim_enable_device(pdev);

	if (r) {

		dev_err(&pdev->dev, "Failed to enable I2C PCI device (%d)\n",

			r);

		return r;

	}

	if (r)

		return dev_err_probe(&pdev->dev, 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(&pdev->dev, "I/O memory remapping failed\n");

		return r;

	}

	if (r)

		return dev_err_probe(&pdev->dev, r,

				     "I/O memory remapping failed\n");



	dev = devm_kzalloc(&pdev->dev, sizeof(struct dw_i2c_dev), GFP_KERNEL);

	if (!dev)