[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241015185124.64726-12-pstanner@redhat.com>
Date: Tue, 15 Oct 2024 20:51:21 +0200
From: Philipp Stanner <pstanner@...hat.com>
To: Damien Le Moal <dlemoal@...nel.org>,
Niklas Cassel <cassel@...nel.org>,
Sergey Shtylyov <s.shtylyov@....ru>,
Basavaraj Natikar <basavaraj.natikar@....com>,
Jiri Kosina <jikos@...nel.org>,
Benjamin Tissoires <bentiss@...nel.org>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Alex Dubov <oakad@...oo.com>,
Sudarsana Kalluru <skalluru@...vell.com>,
Manish Chopra <manishc@...vell.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Rasesh Mody <rmody@...vell.com>,
GR-Linux-NIC-Dev@...vell.com,
Igor Mitsyanko <imitsyanko@...ntenna.com>,
Sergey Matyukevich <geomatsi@...il.com>,
Kalle Valo <kvalo@...nel.org>,
Sanjay R Mehta <sanju.mehta@....com>,
Shyam Sundar S K <Shyam-sundar.S-k@....com>,
Jon Mason <jdmason@...zu.us>,
Dave Jiang <dave.jiang@...el.com>,
Allen Hubbe <allenbh@...il.com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Alex Williamson <alex.williamson@...hat.com>,
Juergen Gross <jgross@...e.com>,
Stefano Stabellini <sstabellini@...nel.org>,
Oleksandr Tyshchenko <oleksandr_tyshchenko@...m.com>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Chen Ni <nichen@...as.ac.cn>,
Mario Limonciello <mario.limonciello@....com>,
Philipp Stanner <pstanner@...hat.com>,
Ricky Wu <ricky_wu@...ltek.com>,
Al Viro <viro@...iv.linux.org.uk>,
Breno Leitao <leitao@...ian.org>,
Kevin Tian <kevin.tian@...el.com>,
Thomas Gleixner <tglx@...utronix.de>,
Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Mostafa Saleh <smostafa@...gle.com>,
Jason Gunthorpe <jgg@...pe.ca>,
Yi Liu <yi.l.liu@...el.com>,
Christian Brauner <brauner@...nel.org>,
Ankit Agrawal <ankita@...dia.com>,
Eric Auger <eric.auger@...hat.com>,
Reinette Chatre <reinette.chatre@...el.com>,
Ye Bin <yebin10@...wei.com>,
Marek Marczykowski-Górecki <marmarek@...isiblethingslab.com>,
Pierre-Louis Bossart <pierre-louis.bossart@...ux.dev>,
Peter Ujfalusi <peter.ujfalusi@...ux.intel.com>,
Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Kai Vehmanen <kai.vehmanen@...ux.intel.com>,
Rui Salvaterra <rsalvaterra@...il.com>
Cc: linux-ide@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-input@...r.kernel.org,
netdev@...r.kernel.org,
linux-wireless@...r.kernel.org,
ntb@...ts.linux.dev,
linux-pci@...r.kernel.org,
kvm@...r.kernel.org,
xen-devel@...ts.xenproject.org,
linux-sound@...r.kernel.org,
Basavaraj Natikar <Basavaraj.Natikar@....com>
Subject: [PATCH 11/13] HID: amd_sfh: Use always-managed version of pcim_intx()
pci_intx() is a hybrid function which can sometimes be managed through
devres. To remove this hybrid nature from pci_intx(), it is necessary to
port users to either an always-managed or a never-managed version.
All users of amd_mp2_pci_remove(), where pci_intx() is used, call
pcim_enable_device(), which is why the driver needs the always-managed
version.
Replace pci_intx() with pcim_intx().
Signed-off-by: Philipp Stanner <pstanner@...hat.com>
Acked-by: Basavaraj Natikar <Basavaraj.Natikar@....com>
---
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 4 ++--
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index 0c28ca349bcd..48cfd0c58241 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -122,7 +122,7 @@ int amd_sfh_irq_init_v2(struct amd_mp2_dev *privdata)
{
int rc;
- pci_intx(privdata->pdev, true);
+ pcim_intx(privdata->pdev, true);
rc = devm_request_irq(&privdata->pdev->dev, privdata->pdev->irq,
amd_sfh_irq_handler, 0, DRIVER_NAME, privdata);
@@ -248,7 +248,7 @@ static void amd_mp2_pci_remove(void *privdata)
struct amd_mp2_dev *mp2 = privdata;
amd_sfh_hid_client_deinit(privdata);
mp2->mp2_ops->stop_all(mp2);
- pci_intx(mp2->pdev, false);
+ pcim_intx(mp2->pdev, false);
amd_sfh_clear_intr(mp2);
}
diff --git a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
index db36d87d5634..ec9feb8e023b 100644
--- a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
+++ b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
@@ -289,7 +289,7 @@ static void amd_mp2_pci_remove(void *privdata)
sfh_deinit_emp2();
amd_sfh_hid_client_deinit(privdata);
mp2->mp2_ops->stop_all(mp2);
- pci_intx(mp2->pdev, false);
+ pcim_intx(mp2->pdev, false);
amd_sfh_clear_intr(mp2);
}
--
2.47.0
Powered by blists - more mailing lists