From: Dejin Zheng <zhengdejin5@gmail.com>
To: corbet@lwn.net, jarkko.nikula@linux.intel.com,
andriy.shevchenko@linux.intel.com,
mika.westerberg@linux.intel.com, rric@kernel.org,
bhelgaas@google.com, wsa@kernel.org, linux-doc@vger.kernel.org,
linux-i2c@vger.kernel.org, linux-pci@vger.kernel.org,
kw@linux.com
Cc: linux-kernel@vger.kernel.org, Dejin Zheng <zhengdejin5@gmail.com>
Subject: [PATCH v3 3/4] i2c: designware: Use the correct name of device-managed function
Date: Wed, 17 Feb 2021 00:02:48 +0800 [thread overview]
Message-ID: <20210216160249.749799-4-zhengdejin5@gmail.com> (raw)
In-Reply-To: <20210216160249.749799-1-zhengdejin5@gmail.com>
Use the new function pcim_alloc_irq_vectors() to allocate IRQ vectors,
the pcim_alloc_irq_vectors() function, an explicit device-managed version
of pci_alloc_irq_vectors(). If pcim_enable_device() has been called
before, then pci_alloc_irq_vectors() is actually a device-managed
function. It is used here as a device-managed function, So replace it
with pcim_alloc_irq_vectors(). At the same time, simplify the error
handling path.
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
---
v2 -> v3:
- simplify the error handling path.
v1 -> v2:
- Modify some commit messages.
drivers/i2c/busses/i2c-designware-pcidrv.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index 55c83a7a24f3..620b41e373b6 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -219,7 +219,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
if (!dev)
return -ENOMEM;
- r = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+ r = pcim_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
if (r < 0)
return r;
@@ -234,10 +234,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
if (controller->setup) {
r = controller->setup(pdev, controller);
- if (r) {
- pci_free_irq_vectors(pdev);
+ if (r)
return r;
- }
}
i2c_dw_adjust_bus_speed(dev);
@@ -246,10 +244,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
i2c_dw_acpi_configure(&pdev->dev);
r = i2c_dw_validate_speed(dev);
- if (r) {
- pci_free_irq_vectors(pdev);
+ if (r)
return r;
- }
i2c_dw_configure(dev);
@@ -269,10 +265,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
adap->nr = controller->bus_num;
r = i2c_dw_probe(dev);
- if (r) {
- pci_free_irq_vectors(pdev);
+ if (r)
return r;
- }
pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
pm_runtime_use_autosuspend(&pdev->dev);
@@ -292,7 +286,6 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev)
i2c_del_adapter(&dev->adapter);
devm_free_irq(&pdev->dev, dev->irq, dev);
- pci_free_irq_vectors(pdev);
}
/* work with hotplug and coldplug */
--
2.25.0
next prev parent reply other threads:[~2021-02-16 16:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 16:02 [PATCH v3 0/4] Introduce pcim_alloc_irq_vectors() Dejin Zheng
2021-02-16 16:02 ` [PATCH v3 1/4] PCI: " Dejin Zheng
2021-02-16 17:53 ` Krzysztof Wilczyński
2021-02-16 16:02 ` [PATCH v3 2/4] Documentation: devres: Add pcim_alloc_irq_vectors() Dejin Zheng
2021-02-16 17:10 ` Krzysztof Wilczyński
2021-02-17 10:50 ` Dejin Zheng
2021-02-17 13:44 ` Andy Shevchenko
2021-02-16 16:02 ` Dejin Zheng [this message]
2021-02-16 17:46 ` [PATCH v3 3/4] i2c: designware: Use the correct name of device-managed function Krzysztof Wilczyński
2021-02-17 11:40 ` Dejin Zheng
2021-02-17 13:47 ` Andy Shevchenko
2021-02-18 14:15 ` Dejin Zheng
2021-02-16 16:02 ` [PATCH v3 4/4] i2c: thunderx: " Dejin Zheng
2021-02-16 17:49 ` Krzysztof Wilczyński
2021-02-18 9:36 ` [PATCH v3 0/4] Introduce pcim_alloc_irq_vectors() Robert Richter
2021-02-18 14:01 ` Andy Shevchenko
2021-02-19 11:19 ` Robert Richter
2021-02-19 13:51 ` 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=20210216160249.749799-4-zhengdejin5@gmail.com \
--to=zhengdejin5@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=jarkko.nikula@linux.intel.com \
--cc=kw@linux.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rric@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).