| Message ID | 20191111111721.4145919-2-jean-philippe@linaro.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 34d1b0895dbd10713c73615d8f532e78509e12d9 |
| Headers | show |
| Series | [1/2] iommu/arm-smmu-v3: Don't display an error when IRQ lines are missing | expand |
On Mon, Nov 11, 2019 at 12:17:21PM +0100, Jean-Philippe Brucker wrote: > Since commit 7723f4c5ecdb ("driver core: platform: Add an error message > to platform_get_irq*()"), platform_get_irq() displays an error when the > IRQ isn't found. Remove the error print from the SMMU driver. Note the > slight change of behaviour: no message is printed if platform_get_irq() > returns -EPROBE_DEFER, which probably doesn't concern the SMMU. > > Fixes: 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()") > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > --- > drivers/iommu/arm-smmu.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 7c503a6bc585..6f676686752c 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -2062,10 +2062,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) > for (i = 0; i < num_irqs; ++i) { > int irq = platform_get_irq(pdev, i); > > - if (irq < 0) { > - dev_err(dev, "failed to get irq index %d\n", i); > + if (irq < 0) > return -ENODEV; > - } > smmu->irqs[i] = irq; > } Acked-by: Will Deacon <will@kernel.org> Thanks, Will
On 11/11/2019 11:17, Jean-Philippe Brucker wrote: > Since commit 7723f4c5ecdb ("driver core: platform: Add an error message > to platform_get_irq*()"), platform_get_irq() displays an error when the > IRQ isn't found. Remove the error print from the SMMU driver. Note the > slight change of behaviour: no message is printed if platform_get_irq() > returns -EPROBE_DEFER, which probably doesn't concern the SMMU. > > Fixes: 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()") > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > --- > drivers/iommu/arm-smmu.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 7c503a6bc585..6f676686752c 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -2062,10 +2062,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) > for (i = 0; i < num_irqs; ++i) { > int irq = platform_get_irq(pdev, i); > > - if (irq < 0) { > - dev_err(dev, "failed to get irq index %d\n", i); > + if (irq < 0) > return -ENODEV; It's a preexisting issue, but we should really "return irq" here. Robin. > - } > smmu->irqs[i] = irq; > } > >
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 7c503a6bc585..6f676686752c 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2062,10 +2062,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) for (i = 0; i < num_irqs; ++i) { int irq = platform_get_irq(pdev, i); - if (irq < 0) { - dev_err(dev, "failed to get irq index %d\n", i); + if (irq < 0) return -ENODEV; - } smmu->irqs[i] = irq; }
Since commit 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()"), platform_get_irq() displays an error when the IRQ isn't found. Remove the error print from the SMMU driver. Note the slight change of behaviour: no message is printed if platform_get_irq() returns -EPROBE_DEFER, which probably doesn't concern the SMMU. Fixes: 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()") Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> --- drivers/iommu/arm-smmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)