From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Wolfram Sang <wsa@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Ajay Gupta <ajayg@nvidia.com>
Subject: [PATCH v1 04/11] i2c: designware-pci: Convert to use dev_err_probe()
Date: Tue, 7 Dec 2021 21:21:52 +0200 [thread overview]
Message-ID: <20211207192159.41383-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20211207192159.41383-1-andriy.shevchenko@linux.intel.com>
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>
---
drivers/i2c/busses/i2c-designware-pcidrv.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index f91b352f448a..e6b4b1a468da 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -223,28 +223,20 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
struct dw_scl_sda_cfg *cfg;
struct dw_i2c_dev *i_dev;
- if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) {
- dev_err(dev, "%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(dev, -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(dev, "Failed to enable I2C PCI device (%d)\n",
- r);
- return r;
- }
+ if (r)
+ return dev_err_probe(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(dev, "I/O memory remapping failed\n");
- return r;
- }
+ if (r)
+ return dev_err_probe(dev, r, "I/O memory remapping failed\n");
i_dev = devm_kzalloc(dev, sizeof(*i_dev), GFP_KERNEL);
if (!i_dev)
--
2.33.0
next prev parent reply other threads:[~2021-12-07 19:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 19:21 [PATCH v1 01/11] i2c: Introduce common module to instantiate CCGx UCSI Andy Shevchenko
2021-12-07 19:21 ` [PATCH v1 02/11] i2c: designware-pci: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
2021-12-07 19:21 ` [PATCH v1 03/11] i2c: designware-pci: Use temporary variable for struct device Andy Shevchenko
2021-12-08 12:35 ` Jarkko Nikula
2021-12-07 19:21 ` Andy Shevchenko [this message]
2021-12-08 12:21 ` [PATCH v1 04/11] i2c: designware-pci: Convert to use dev_err_probe() Jarkko Nikula
2021-12-07 19:21 ` [PATCH v1 05/11] i2c: designware-pci: use __maybe_unused for PM functions Andy Shevchenko
2021-12-08 12:31 ` Jarkko Nikula
2021-12-07 19:21 ` [PATCH v1 06/11] i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters Andy Shevchenko
2021-12-08 12:29 ` Jarkko Nikula
2021-12-07 19:21 ` [PATCH v1 07/11] i2c: designware-pci: Group MODULE_*() macros Andy Shevchenko
2021-12-08 12:30 ` Jarkko Nikula
2021-12-07 19:21 ` [PATCH v1 08/11] i2c: designware-pci: Add a note about struct dw_scl_sda_cfg usage Andy Shevchenko
2021-12-08 12:29 ` Jarkko Nikula
2021-12-07 19:21 ` [PATCH v1 09/11] i2c: nvidia-gpu: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
2021-12-07 19:21 ` [PATCH v1 10/11] i2c: nvidia-gpu: Use temporary variable for struct device Andy Shevchenko
2021-12-07 19:21 ` [PATCH v1 11/11] i2c: nvidia-gpu: Convert to use dev_err_probe() Andy Shevchenko
2021-12-08 12:29 ` [PATCH v1 01/11] i2c: Introduce common module to instantiate CCGx UCSI Jarkko Nikula
2021-12-13 18:00 ` Andy Shevchenko
2021-12-15 13:50 ` Shah, Nehal-bakulchandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211207192159.41383-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=ajayg@nvidia.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.