2023-10-20 10:46:39

by Steven Price

Subject: [PATCH] drm/panfrost: Remove incorrect IS_ERR() check

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 <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
Closes: https://lore.kernel.org/r/[email protected]
Signed-off-by: Steven Price <[email protected]>
---
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

2023-10-21 18:45:50

by Adrián Larumbe

Subject: Re: [PATCH] drm/panfrost: Remove incorrect IS_ERR() check

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 <[email protected]>
> Reported-by: Dan Carpenter <[email protected]>
> Closes: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Steven Price <[email protected]>

Reviewed-by: Adrián Larumbe <[email protected]>
Tested-by: Adrián Larumbe <[email protected]>

> ---
> 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