| Message ID | 20231020104405.53992-1-steven.price@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/panfrost: Remove incorrect IS_ERR() check | expand |
On 20.10.2023 11:44, Steven Price wrote: > sg_page_iter_page() doesn't return an error code, so the IS_ERR() check > is wrong and the error path will never be executed. This also allows > simplifying the code to remove the local variable 'page'. > > CC: Adrián Larumbe <adrian.larumbe@collabora.com> > Reported-by: Dan Carpenter <dan.carpenter@linaro.org> > Closes: https://lore.kernel.org/r/376713ff-9a4f-4ea3-b097-fb5efb685d95@moroto.mountain > Signed-off-by: Steven Price <steven.price@arm.com> Reviewed-by: Adrián Larumbe <adrian.larumbe@collabora.com> Tested-by: Adrián Larumbe <adrian.larumbe@collabora.com> > --- > drivers/gpu/drm/panfrost/panfrost_dump.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_dump.c b/drivers/gpu/drm/panfrost/panfrost_dump.c > index e7942ac449c6..47751302f1bc 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_dump.c > +++ b/drivers/gpu/drm/panfrost/panfrost_dump.c > @@ -220,16 +220,8 @@ void panfrost_core_dump(struct panfrost_job *job) > > iter.hdr->bomap.data[0] = bomap - bomap_start; > > - for_each_sgtable_page(bo->base.sgt, &page_iter, 0) { > - struct page *page = sg_page_iter_page(&page_iter); > - > - if (!IS_ERR(page)) { > - *bomap++ = page_to_phys(page); > - } else { > - dev_err(pfdev->dev, "Panfrost Dump: wrong page\n"); > - *bomap++ = 0; > - } > - } > + for_each_sgtable_page(bo->base.sgt, &page_iter, 0) > + *bomap++ = page_to_phys(sg_page_iter_page(&page_iter)); > > iter.hdr->bomap.iova = mapping->mmnode.start << PAGE_SHIFT; > > -- > 2.34.1
diff --git a/drivers/gpu/drm/panfrost/panfrost_dump.c b/drivers/gpu/drm/panfrost/panfrost_dump.c index e7942ac449c6..47751302f1bc 100644 --- a/drivers/gpu/drm/panfrost/panfrost_dump.c +++ b/drivers/gpu/drm/panfrost/panfrost_dump.c @@ -220,16 +220,8 @@ void panfrost_core_dump(struct panfrost_job *job) iter.hdr->bomap.data[0] = bomap - bomap_start; - for_each_sgtable_page(bo->base.sgt, &page_iter, 0) { - struct page *page = sg_page_iter_page(&page_iter); - - if (!IS_ERR(page)) { - *bomap++ = page_to_phys(page); - } else { - dev_err(pfdev->dev, "Panfrost Dump: wrong page\n"); - *bomap++ = 0; - } - } + for_each_sgtable_page(bo->base.sgt, &page_iter, 0) + *bomap++ = page_to_phys(sg_page_iter_page(&page_iter)); iter.hdr->bomap.iova = mapping->mmnode.start << PAGE_SHIFT;
sg_page_iter_page() doesn't return an error code, so the IS_ERR() check is wrong and the error path will never be executed. This also allows simplifying the code to remove the local variable 'page'. CC: Adrián Larumbe <adrian.larumbe@collabora.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/376713ff-9a4f-4ea3-b097-fb5efb685d95@moroto.mountain Signed-off-by: Steven Price <steven.price@arm.com> --- drivers/gpu/drm/panfrost/panfrost_dump.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)