From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH v2 2/6] i2c: designware-pci: Convert to use dev_err_probe()
Date: Mon, 13 Dec 2021 20:00:30 +0200 [thread overview]
Message-ID: <20211213180034.30929-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20211213180034.30929-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>
---
v2: no changes
drivers/i2c/busses/i2c-designware-pcidrv.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
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)
--
2.33.0
next prev parent reply other threads:[~2021-12-13 18:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 18:00 [PATCH v2 1/6] i2c: designware-pci: Use temporary variable for struct device Andy Shevchenko
2021-12-13 18:00 ` Andy Shevchenko [this message]
2021-12-13 18:00 ` [PATCH v2 3/6] i2c: designware-pci: use __maybe_unused for PM functions Andy Shevchenko
2021-12-13 18:00 ` [PATCH v2 4/6] i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters Andy Shevchenko
2021-12-15 7:55 ` Jarkko Nikula
2021-12-15 13:51 ` Andy Shevchenko
2021-12-15 14:21 ` Jarkko Nikula
2021-12-13 18:00 ` [PATCH v2 5/6] i2c: designware-pci: Group MODULE_*() macros Andy Shevchenko
2021-12-13 18:00 ` [PATCH v2 6/6] i2c: designware-pci: Add a note about struct dw_scl_sda_cfg usage Andy Shevchenko
2021-12-15 7:51 ` [PATCH v2 1/6] i2c: designware-pci: Use temporary variable for struct device Jarkko Nikula
2021-12-15 13:48 ` Andy Shevchenko
2021-12-15 14:15 ` Jarkko Nikula
2021-12-15 13:58 ` Andy Shevchenko
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=20211213180034.30929-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.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 \
/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.