| Message ID | 20190915193401.27426-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | bdde4718aba368c33705ccff8f3e29586d41b69b |
| Headers | show |
| Series | iommu/arm-smmu: Axe a useless test in 'arm_smmu_master_alloc_smes()' | expand |
On 15/09/2019 20:34, Christophe JAILLET wrote: > 'ommu_group_get_for_dev()' never returns NULL, so this test can be removed. Nit: typo in the function name. Otherwise, there definitely used to be some path where a NULL return could leak out, so I would have had that in mind at the time I wrote this, but apparently I never noticed that that had already been cleaned up by the time this got merged. Reviewed-by: Robin Murphy <robin.murphy@arm.com> Thanks, Robin. > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/iommu/arm-smmu.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index c3ef0cc8f764..6fae8cdbe985 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -1038,8 +1038,6 @@ static int arm_smmu_master_alloc_smes(struct device *dev) > } > > group = iommu_group_get_for_dev(dev); > - if (!group) > - group = ERR_PTR(-ENOMEM); > if (IS_ERR(group)) { > ret = PTR_ERR(group); > goto out_err; >
Le 16/09/2019 à 12:46, Robin Murphy a écrit : > On 15/09/2019 20:34, Christophe JAILLET wrote: >> 'ommu_group_get_for_dev()' never returns NULL, so this test can be >> removed. > > Nit: typo in the function name. > > Otherwise, there definitely used to be some path where a NULL return > could leak out, so I would have had that in mind at the time I wrote > this, but apparently I never noticed that that had already been > cleaned up by the time this got merged. > Hi, Maybe fixed by 72dcac633475 ("iommu: Warn once when device_group callback returns NULL") CJ > Reviewed-by: Robin Murphy <robin.murphy@arm.com> > > Thanks, > Robin. > >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> >> --- >> drivers/iommu/arm-smmu.c | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c >> index c3ef0cc8f764..6fae8cdbe985 100644 >> --- a/drivers/iommu/arm-smmu.c >> +++ b/drivers/iommu/arm-smmu.c >> @@ -1038,8 +1038,6 @@ static int arm_smmu_master_alloc_smes(struct >> device *dev) >> } >> group = iommu_group_get_for_dev(dev); >> - if (!group) >> - group = ERR_PTR(-ENOMEM); >> if (IS_ERR(group)) { >> ret = PTR_ERR(group); >> goto out_err; >> >
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index c3ef0cc8f764..6fae8cdbe985 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1038,8 +1038,6 @@ static int arm_smmu_master_alloc_smes(struct device *dev) } group = iommu_group_get_for_dev(dev); - if (!group) - group = ERR_PTR(-ENOMEM); if (IS_ERR(group)) { ret = PTR_ERR(group); goto out_err;
'ommu_group_get_for_dev()' never returns NULL, so this test can be removed. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/iommu/arm-smmu.c | 2 -- 1 file changed, 2 deletions(-)