* [PATCH v2] staging: rts5208: rtsx: Replace depracated MSI API
@ 2020-07-18 15:40 ` Suraj Upadhyay
0 siblings, 0 replies; 6+ messages in thread
From: Suraj Upadhyay @ 2020-07-18 15:40 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 956 bytes --]
Replace depracated pci_enable_msi with pci_alloc_irq_vectors.
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
---
drivers/staging/rts5208/rtsx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index e28e162d004e..b39d3f8b54df 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
pci_set_master(pci);
if (chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
chip->msi_en = 0;
}
@@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
if (dev->chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
dev->chip->msi_en = 0;
}
--
2.17.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2] staging: rts5208: rtsx: Replace depracated MSI API
@ 2020-07-18 15:40 ` Suraj Upadhyay
0 siblings, 0 replies; 6+ messages in thread
From: Suraj Upadhyay @ 2020-07-18 15:40 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 956 bytes --]
Replace depracated pci_enable_msi with pci_alloc_irq_vectors.
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
---
drivers/staging/rts5208/rtsx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index e28e162d004e..b39d3f8b54df 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
pci_set_master(pci);
if (chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
chip->msi_en = 0;
}
@@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
if (dev->chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
dev->chip->msi_en = 0;
}
--
2.17.1
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 169 bytes --]
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] staging: rts5208: rtsx: Replace depracated MSI API
2020-07-18 15:40 ` Suraj Upadhyay
@ 2020-07-19 4:34 ` Suraj Upadhyay
-1 siblings, 0 replies; 6+ messages in thread
From: Suraj Upadhyay @ 2020-07-19 4:34 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel
On Sat, Jul 18, 2020 at 09:10:30PM +0530, Suraj Upadhyay wrote:
> Replace depracated pci_enable_msi with pci_alloc_irq_vectors.
>
> Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
> ---
> drivers/staging/rts5208/rtsx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Hii, don't merge this patch.
It is still incomplete.
It doesn't replace pci_disable_msi.
I hope this didn't cause any annoyances.
Thanks,
Suraj Upadhyay.
> diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
> index e28e162d004e..b39d3f8b54df 100644
> --- a/drivers/staging/rts5208/rtsx.c
> +++ b/drivers/staging/rts5208/rtsx.c
> @@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
> pci_set_master(pci);
>
> if (chip->msi_en) {
> - if (pci_enable_msi(pci) < 0)
> + if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
> chip->msi_en = 0;
> }
>
> @@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
> dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
>
> if (dev->chip->msi_en) {
> - if (pci_enable_msi(pci) < 0)
> + if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
> dev->chip->msi_en = 0;
> }
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] staging: rts5208: rtsx: Replace depracated MSI API
@ 2020-07-19 4:34 ` Suraj Upadhyay
0 siblings, 0 replies; 6+ messages in thread
From: Suraj Upadhyay @ 2020-07-19 4:34 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel
On Sat, Jul 18, 2020 at 09:10:30PM +0530, Suraj Upadhyay wrote:
> Replace depracated pci_enable_msi with pci_alloc_irq_vectors.
>
> Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
> ---
> drivers/staging/rts5208/rtsx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Hii, don't merge this patch.
It is still incomplete.
It doesn't replace pci_disable_msi.
I hope this didn't cause any annoyances.
Thanks,
Suraj Upadhyay.
> diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
> index e28e162d004e..b39d3f8b54df 100644
> --- a/drivers/staging/rts5208/rtsx.c
> +++ b/drivers/staging/rts5208/rtsx.c
> @@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
> pci_set_master(pci);
>
> if (chip->msi_en) {
> - if (pci_enable_msi(pci) < 0)
> + if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
> chip->msi_en = 0;
> }
>
> @@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
> dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
>
> if (dev->chip->msi_en) {
> - if (pci_enable_msi(pci) < 0)
> + if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
> dev->chip->msi_en = 0;
> }
>
> --
> 2.17.1
>
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] staging: rts5208: rtsx: Replace depracated MSI API
@ 2020-07-19 14:34 ` Suraj Upadhyay
0 siblings, 0 replies; 6+ messages in thread
From: Suraj Upadhyay @ 2020-07-19 14:34 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2064 bytes --]
Replace depracated MSI IRQ enablers and disablers
with pci_alloc_irq_vectors and pci_free_irq_vectors respectively.
Compile tested.
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
---
Changes:
v2: Replace MSI IRQ disablers too.
---
drivers/staging/rts5208/rtsx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index e28e162d004e..898add4d1fc8 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -283,7 +283,7 @@ static int __maybe_unused rtsx_suspend(struct device *dev_d)
}
if (chip->msi_en)
- pci_disable_msi(pci);
+ pci_free_irq_vectors(pci);
device_wakeup_enable(dev_d);
@@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
pci_set_master(pci);
if (chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
chip->msi_en = 0;
}
@@ -347,7 +347,7 @@ static void rtsx_shutdown(struct pci_dev *pci)
}
if (chip->msi_en)
- pci_disable_msi(pci);
+ pci_free_irq_vectors(pci);
pci_disable_device(pci);
}
@@ -594,7 +594,7 @@ static void rtsx_release_resources(struct rtsx_dev *dev)
if (dev->irq > 0)
free_irq(dev->irq, (void *)dev);
if (dev->chip->msi_en)
- pci_disable_msi(dev->pci);
+ pci_free_irq_vectors(dev->pci);
if (dev->remap_addr)
iounmap(dev->remap_addr);
@@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
if (dev->chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
dev->chip->msi_en = 0;
}
@@ -952,7 +952,7 @@ static int rtsx_probe(struct pci_dev *pci,
dev->chip->host_cmds_ptr = NULL;
dev->chip->host_sg_tbl_ptr = NULL;
if (dev->chip->msi_en)
- pci_disable_msi(dev->pci);
+ pci_free_irq_vectors(dev->pci);
dma_alloc_fail:
iounmap(dev->remap_addr);
ioremap_fail:
--
2.17.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2] staging: rts5208: rtsx: Replace depracated MSI API
@ 2020-07-19 14:34 ` Suraj Upadhyay
0 siblings, 0 replies; 6+ messages in thread
From: Suraj Upadhyay @ 2020-07-19 14:34 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 2064 bytes --]
Replace depracated MSI IRQ enablers and disablers
with pci_alloc_irq_vectors and pci_free_irq_vectors respectively.
Compile tested.
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
---
Changes:
v2: Replace MSI IRQ disablers too.
---
drivers/staging/rts5208/rtsx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index e28e162d004e..898add4d1fc8 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -283,7 +283,7 @@ static int __maybe_unused rtsx_suspend(struct device *dev_d)
}
if (chip->msi_en)
- pci_disable_msi(pci);
+ pci_free_irq_vectors(pci);
device_wakeup_enable(dev_d);
@@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
pci_set_master(pci);
if (chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
chip->msi_en = 0;
}
@@ -347,7 +347,7 @@ static void rtsx_shutdown(struct pci_dev *pci)
}
if (chip->msi_en)
- pci_disable_msi(pci);
+ pci_free_irq_vectors(pci);
pci_disable_device(pci);
}
@@ -594,7 +594,7 @@ static void rtsx_release_resources(struct rtsx_dev *dev)
if (dev->irq > 0)
free_irq(dev->irq, (void *)dev);
if (dev->chip->msi_en)
- pci_disable_msi(dev->pci);
+ pci_free_irq_vectors(dev->pci);
if (dev->remap_addr)
iounmap(dev->remap_addr);
@@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
if (dev->chip->msi_en) {
- if (pci_enable_msi(pci) < 0)
+ if (pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) < 0)
dev->chip->msi_en = 0;
}
@@ -952,7 +952,7 @@ static int rtsx_probe(struct pci_dev *pci,
dev->chip->host_cmds_ptr = NULL;
dev->chip->host_sg_tbl_ptr = NULL;
if (dev->chip->msi_en)
- pci_disable_msi(dev->pci);
+ pci_free_irq_vectors(dev->pci);
dma_alloc_fail:
iounmap(dev->remap_addr);
ioremap_fail:
--
2.17.1
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 169 bytes --]
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-19 14:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-18 15:40 [PATCH v2] staging: rts5208: rtsx: Replace depracated MSI API Suraj Upadhyay
2020-07-18 15:40 ` Suraj Upadhyay
2020-07-19 4:34 ` Suraj Upadhyay
2020-07-19 4:34 ` Suraj Upadhyay
2020-07-19 14:34 Suraj Upadhyay
2020-07-19 14:34 ` Suraj Upadhyay
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.