From: Wolfram Sang <wsa@the-dreams.de>
To: Chuhong Yuan <hslester96@gmail.com>, Jan Glauber <jglauber@cavium.com>
Cc: David Daney <david.daney@cavium.com>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] i2c: thunderx: Add missed pci_release_regions
Date: Fri, 29 May 2020 13:01:02 +0200 [thread overview]
Message-ID: <20200529110102.GD3417@ninjato> (raw)
In-Reply-To: <20200322160040.GD1091@ninjato>
[-- Attachment #1: Type: text/plain, Size: 2853 bytes --]
On Sun, Mar 22, 2020 at 05:00:40PM +0100, Wolfram Sang wrote:
> On Fri, Dec 06, 2019 at 03:53:49PM +0800, Chuhong Yuan wrote:
> > The driver forgets to call pci_release_regions() in probe failure
> > and remove.
> > Add the missed calls to fix it.
> >
> > Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
>
> Jan, any comment to this patch?
Jan, are you still there?
>
> Chuhong Yang, please make sure you have a proper To-Header next time!
>
> > ---
> > drivers/i2c/busses/i2c-thunderx-pcidrv.c | 19 ++++++++++++-------
> > 1 file changed, 12 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
> > index 19f8eec38717..31f7e254e99f 100644
> > --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c
> > +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
> > @@ -172,8 +172,10 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
> > return ret;
> >
> > i2c->twsi_base = pcim_iomap(pdev, 0, pci_resource_len(pdev, 0));
> > - if (!i2c->twsi_base)
> > - return -EINVAL;
> > + if (!i2c->twsi_base) {
> > + ret = -EINVAL;
> > + goto error_release_regions;
> > + }
> >
> > thunder_i2c_clock_enable(dev, i2c);
> > ret = device_property_read_u32(dev, "clock-frequency", &i2c->twsi_freq);
> > @@ -189,16 +191,16 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
> >
> > ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX);
> > if (ret < 0)
> > - goto error;
> > + goto error_disable_clock;
> >
> > ret = devm_request_irq(dev, pci_irq_vector(pdev, 0), octeon_i2c_isr, 0,
> > DRV_NAME, i2c);
> > if (ret)
> > - goto error;
> > + goto error_disable_clock;
> >
> > ret = octeon_i2c_init_lowlevel(i2c);
> > if (ret)
> > - goto error;
> > + goto error_disable_clock;
> >
> > octeon_i2c_set_clock(i2c);
> >
> > @@ -214,7 +216,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
> >
> > ret = i2c_add_adapter(&i2c->adap);
> > if (ret)
> > - goto error;
> > + goto error_disable_clock;
> >
> > dev_info(i2c->dev, "Probed. Set system clock to %u\n", i2c->sys_freq);
> >
> > @@ -224,8 +226,10 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
> >
> > return 0;
> >
> > -error:
> > +error_disable_clock:
> > thunder_i2c_clock_disable(dev, i2c->clk);
> > +error_release_regions:
> > + pci_release_regions(pdev);
> > return ret;
> > }
> >
> > @@ -236,6 +240,7 @@ static void thunder_i2c_remove_pci(struct pci_dev *pdev)
> > thunder_i2c_smbus_remove(i2c);
> > thunder_i2c_clock_disable(&pdev->dev, i2c->clk);
> > i2c_del_adapter(&i2c->adap);
> > + pci_release_regions(pdev);
> > }
> >
> > static const struct pci_device_id thunder_i2c_pci_id_table[] = {
> > --
> > 2.24.0
> >
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2020-05-29 11:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 7:53 [PATCH] i2c: thunderx: Add missed pci_release_regions Chuhong Yuan
2020-03-22 16:00 ` Wolfram Sang
2020-05-29 11:01 ` Wolfram Sang [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=20200529110102.GD3417@ninjato \
--to=wsa@the-dreams.de \
--cc=david.daney@cavium.com \
--cc=hslester96@gmail.com \
--cc=jglauber@cavium.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.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).