| Message ID | 20220630200058.1883506-3-dmitry.osipenko@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | DRM-SHMEM fixes | expand |
On Thu, Jun 30, 2022 at 11:00:58PM +0300, Dmitry Osipenko wrote: > drm_gem_shmem_get_sg_table() never returns NULL on error, but a ERR_PTR. > Correct the doc comment which says that it returns NULL on error. > > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 904fc893c905..0b526657fbea 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -663,7 +663,8 @@ EXPORT_SYMBOL(drm_gem_shmem_print_info); > * drm_gem_shmem_get_pages_sgt() instead. > * > * Returns: > - * A pointer to the scatter/gather table of pinned pages or NULL on failure. > + * A pointer to the scatter/gather table of pinned pages or an ERR_PTR()-encoded > + * error code on failure. There was a conflict here because another patch adjusted this already, but I fixed it up and merged this to drm-misc-next. Thanks, Daniel > */ > struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem) > { > @@ -689,7 +690,8 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_get_sg_table); > * drm_gem_shmem_get_sg_table() should not be directly called by drivers. > * > * Returns: > - * A pointer to the scatter/gather table of pinned pages or errno on failure. > + * A pointer to the scatter/gather table of pinned pages or an ERR_PTR()-encoded > + * error code on failure. > */ > struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem) > { > -- > 2.36.1 >
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 904fc893c905..0b526657fbea 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -663,7 +663,8 @@ EXPORT_SYMBOL(drm_gem_shmem_print_info); * drm_gem_shmem_get_pages_sgt() instead. * * Returns: - * A pointer to the scatter/gather table of pinned pages or NULL on failure. + * A pointer to the scatter/gather table of pinned pages or an ERR_PTR()-encoded + * error code on failure. */ struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem) { @@ -689,7 +690,8 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_get_sg_table); * drm_gem_shmem_get_sg_table() should not be directly called by drivers. * * Returns: - * A pointer to the scatter/gather table of pinned pages or errno on failure. + * A pointer to the scatter/gather table of pinned pages or an ERR_PTR()-encoded + * error code on failure. */ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem) {