mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Mario Limonciello <mario.limonciello@amd.com>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Wolfram Sang <wsa@kernel.org>, Andi Shyti <andi.shyti@kernel.org>,
	linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
	Jan Dabros <jsd@semihalf.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Serge Semin <fancer.lancer@gmail.com>
Subject: [PATCH v5 03/24] i2c: designware: Let PCI core to take care about interrupt vectors
Date: Thu,  7 Dec 2023 16:13:43 +0200	[thread overview]
Message-ID: <20231207141653.2785124-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com>

PCI core, after pcim_enable_device(), takes care about the allocated
IRQ vectors, no need to do it explicitly and break the cleaning up
order.

Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Link: https://lore.kernel.org/r/20231120144641.1660574-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/i2c/busses/i2c-designware-pcidrv.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index 61d7a27aa070..e67956845c19 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -295,10 +295,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);
@@ -307,10 +305,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);
 
@@ -330,10 +326,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;
-	}
 
 	if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
 		dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node);
@@ -359,8 +353,6 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev)
 	pm_runtime_get_noresume(&pdev->dev);
 
 	i2c_del_adapter(&dev->adapter);
-	devm_free_irq(&pdev->dev, dev->irq, dev);
-	pci_free_irq_vectors(pdev);
 }
 
 static const struct pci_device_id i2_designware_pci_ids[] = {
-- 
2.43.0.rc1.1.gbec44491f096


  parent reply	other threads:[~2023-12-07 14:17 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-07 14:13 [PATCH v5 00/24] i2c: designware: code consolidation & cleanups Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 01/24] i2c: designware: Fix PM calls order in dw_i2c_plat_probe() Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 02/24] i2c: designware: Fix reset call " Andy Shevchenko
2023-12-07 14:13 ` Andy Shevchenko [this message]
2023-12-07 14:13 ` [PATCH v5 04/24] i2c: designware: Fix lock probe " Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 05/24] i2c: designware: Replace a while-loop by for-loop Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 06/24] i2c: designware: Save pointer to semaphore callbacks instead of index Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 07/24] i2c: designware: Add missing 'c' into PCI IDs variable name Andy Shevchenko
2023-12-09  1:12   ` Andi Shyti
2023-12-07 14:13 ` [PATCH v5 08/24] i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE() Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 09/24] i2c: designware: Unify terminator in device ID tables Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 10/24] i2c: designware: Always provide " Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 11/24] i2c: designware: Drop return value from i2c_dw_acpi_configure() Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 12/24] i2c: designware: Drop return value from dw_i2c_of_configure() Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 13/24] i2c: designware: Rename dw_i2c_of_configure() -> i2c_dw_of_configure() Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 14/24] i2c: designware: Consolidate firmware parsing and configuring code Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 15/24] i2c: designware: Unify the firmware type checks Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 16/24] i2c: designware: Move exports to I2C_DW namespaces Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 17/24] i2c: designware: Remove ->disable() callback Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 18/24] i2c: designware: Consolidate PM ops Andy Shevchenko
2023-12-07 14:13 ` [PATCH v5 19/24] i2c: designware: Uninline i2c_dw_probe() Andy Shevchenko
2023-12-07 14:14 ` [PATCH v5 20/24] i2c: designware: Propagate firmware node Andy Shevchenko
2023-12-07 14:14 ` [PATCH v5 21/24] i2c: designware: Use pci_get_drvdata() Andy Shevchenko
2023-12-07 14:14 ` [PATCH v5 22/24] i2c: designware: Use temporary variable for struct device Andy Shevchenko
2023-12-07 14:14 ` [PATCH v5 23/24] i2c: designware: Get rid of redundant 'else' Andy Shevchenko
2023-12-07 14:14 ` [PATCH v5 24/24] i2c: designware: Fix spelling and other issues in the comments Andy Shevchenko
2023-12-09  1:14   ` Andi Shyti
2023-12-11 13:10     ` Andy Shevchenko
2023-12-18 15:06 ` [PATCH v5 00/24] i2c: designware: code consolidation & cleanups Andy Shevchenko
2023-12-19 10:23   ` Wolfram Sang
2023-12-19 14:13     ` Andy Shevchenko
2024-01-05  9:54     ` Jarkko Nikula
2024-01-06 15:57       ` Andy Shevchenko
2024-01-06 19:43         ` Wolfram Sang

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=20231207141653.2785124-4-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=andi.shyti@kernel.org \
    --cc=fancer.lancer@gmail.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=jarkko.nikula@linux.intel.com \
    --cc=jsd@semihalf.com \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mario.limonciello@amd.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=p.zabel@pengutronix.de \
    --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

all inboxes | Powered by JetHome®