lkml.org 
[lkml]   [2014]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v3] PCI: tegra: add missing cleanup in error path and teardown_irq
    On Tue, Jul 29, 2014 at 09:33:30AM +0800, Jisheng Zhang wrote:
    > We should call tegra_msi_free() to free the MSI bit if
    > irq_create_mapping() fails. And we need to dispose the IRQ mapping
    > during IRQ teardown.
    >
    > Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
    > ---
    > drivers/pci/host/pci-tegra.c | 8 ++++++--
    > 1 file changed, 6 insertions(+), 2 deletions(-)
    >
    > diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
    > index 083cf37..4ccc418 100644
    > --- a/drivers/pci/host/pci-tegra.c
    > +++ b/drivers/pci/host/pci-tegra.c
    > @@ -1203,8 +1203,10 @@ static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev,
    > return hwirq;
    >
    > irq = irq_create_mapping(msi->domain, hwirq);
    > - if (!irq)
    > + if (!irq) {
    > + tegra_msi_free(msi, hwirq);
    > return -EINVAL;
    > + }
    >
    > irq_set_msi_desc(irq, desc);
    >
    > @@ -1222,8 +1224,10 @@ static void tegra_msi_teardown_irq(struct msi_chip *chip, unsigned int irq)
    > {
    > struct tegra_msi *msi = to_tegra_msi(chip);
    > struct irq_data *d = irq_get_irq_data(irq);
    > + unsigned long hwirq = d->hwirq;

    There seems to be an inconsistency regarding the data type of hwirq. The
    irq_data structure uses unsigned long, but irqd_to_hwirq() function
    returns irq_hw_number_t. Perhaps it would be best to use this instead:

    irq_hw_number_t hwirq = irqd_to_hwirq(d);

    But I don't have a strong preference for either way, so with or without
    that change:

    Reviewed-by: Thierry Reding <treding@nvidia.com>
    Acked-by: Thierry Reding <treding@nvidia.com>
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2014-07-29 13:21    [W:3.359 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site