From: Dan Carpenter <dan.carpenter@oracle.com>
To: Suraj Upadhyay <usuraj35@gmail.com>
Cc: mchehab@kernel.org, sakari.ailus@linux.intel.com,
gregkh@linuxfoundation.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org
Subject: Re: [PATCH v2] staging: media: atomisp: Replace depracated MSI APIs
Date: Mon, 20 Jul 2020 11:40:58 +0300 [thread overview]
Message-ID: <20200720084058.GG2549@kadam> (raw)
In-Reply-To: <20200719142623.GA31565@blackclown>
On Sun, Jul 19, 2020 at 07:56:23PM +0530, Suraj Upadhyay wrote:
> Replace depracated MSI IRQ enabler and disabler
> with pci_alloc_irq_vectors and pci_free_irq_vectors respectively.
> And as a result handle the returned error as appropriate.
> Compile tested.
>
> Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
> ---
> Change:
> v2: Replace the MSI IRQ disabler too.
> ---
> drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> index d36809a0182c..a5dea5521b36 100644
> --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> @@ -1735,8 +1735,8 @@ static int atomisp_pci_probe(struct pci_dev *dev,
> pci_set_master(dev);
> pci_set_drvdata(dev, isp);
>
> - err = pci_enable_msi(dev);
> - if (err) {
> + err = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI);
> + if (err < 0) {
> dev_err(&dev->dev, "Failed to enable msi (%d)\n", err);
> goto enable_msi_fail;
> }
> @@ -1857,7 +1857,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
> initialize_modules_fail:
> cpu_latency_qos_remove_request(&isp->pm_qos);
> atomisp_msi_irq_uninit(isp, dev);
> - pci_disable_msi(dev);
> + pci_free_irq_vectors(dev);
Actually, my initial complaint was that I was just looking for to see if
the remove function was updated... It turns out the remove function
never freed the IRQs to begin with so it was buggy from square one.
Anyway, the remove function should call pci_free_irq_vectors(). We may
as well fix it now that we have seen the bug.
regards,
dan carpenter
prev parent reply other threads:[~2020-07-20 8:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-19 14:26 [PATCH v2] staging: media: atomisp: Replace depracated MSI APIs Suraj Upadhyay
2020-07-20 8:34 ` Dan Carpenter
2020-07-20 8:40 ` Dan Carpenter [this message]
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=20200720084058.GG2549@kadam \
--to=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=usuraj35@gmail.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 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).