| Message ID | 20240511150816.326846-1-sui.jingfeng@linux.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/bridge: imx: Remove redundant checks on existence of bridge->encoder | expand |
Hi Sui, Thank you for the patch. On Sat, May 11, 2024 at 11:08:16PM +0800, Sui Jingfeng wrote: > The check on the existence of bridge->encoder on the implementation layer > of drm bridge driver is not necessary, as it has already been done in the > drm_bridge_attach() function. It is guaranteed that the .encoder member > of the drm_bridge instance is not NULL when various imx_xxx_bridge_attach() > function gets called. > > Remove the redundant checking codes "if (!bridge->encoder) { ... }". > > Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 5 ----- > drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 ----- > drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 5 ----- > drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 5 ----- > 4 files changed, 20 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c > index 6967325cd8ee..9b5bebbe357d 100644 > --- a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c > +++ b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c > @@ -116,11 +116,6 @@ int ldb_bridge_attach_helper(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(ldb->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > ldb_ch->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > index d0868a6ac6c9..e6dbbdc87ce2 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > @@ -119,11 +119,6 @@ static int imx8qxp_pc_bridge_attach(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(pc->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > ch->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c > index ed8b7a4e0e11..1d11cc1df43c 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c > @@ -138,11 +138,6 @@ static int imx8qxp_pixel_link_bridge_attach(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(pl->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > pl->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c > index 4a886cb808ca..fb7cf4369bb8 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c > @@ -58,11 +58,6 @@ static int imx8qxp_pxl2dpi_bridge_attach(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(p2d->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > p2d->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR);
On 5/11/24 23:08, Sui Jingfeng wrote: > The check on the existence of bridge->encoder on the implementation layer > of drm bridge driver is not necessary, as it has already been done in the > drm_bridge_attach() function. It is guaranteed that the .encoder member > of the drm_bridge instance is not NULL when various imx_xxx_bridge_attach() > function gets called. Nit: ldb_bridge_attach_helper() doesn't follow the fashion of imx_xxx_bridge_attach(), not even the other bridge attach functions touched by this patch do. Maybe, reword as "when various i.MX specific bridge attach functions are called." Regards, Liu Ying > > Remove the redundant checking codes "if (!bridge->encoder) { ... }". > > Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev> > --- > drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 5 ----- > drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 ----- > drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 5 ----- > drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 5 ----- > 4 files changed, 20 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c > index 6967325cd8ee..9b5bebbe357d 100644 > --- a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c > +++ b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c > @@ -116,11 +116,6 @@ int ldb_bridge_attach_helper(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(ldb->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > ldb_ch->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > index d0868a6ac6c9..e6dbbdc87ce2 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > @@ -119,11 +119,6 @@ static int imx8qxp_pc_bridge_attach(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(pc->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > ch->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c > index ed8b7a4e0e11..1d11cc1df43c 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c > @@ -138,11 +138,6 @@ static int imx8qxp_pixel_link_bridge_attach(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(pl->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > pl->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c > index 4a886cb808ca..fb7cf4369bb8 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c > @@ -58,11 +58,6 @@ static int imx8qxp_pxl2dpi_bridge_attach(struct drm_bridge *bridge, > return -EINVAL; > } > > - if (!bridge->encoder) { > - DRM_DEV_ERROR(p2d->dev, "missing encoder\n"); > - return -ENODEV; > - } > - > return drm_bridge_attach(bridge->encoder, > p2d->next_bridge, bridge, > DRM_BRIDGE_ATTACH_NO_CONNECTOR);
Hi, On 5/13/24 13:56, Liu Ying wrote: > On 5/11/24 23:08, Sui Jingfeng wrote: >> The check on the existence of bridge->encoder on the implementation layer >> of drm bridge driver is not necessary, as it has already been done in the >> drm_bridge_attach() function. It is guaranteed that the .encoder member >> of the drm_bridge instance is not NULL when various imx_xxx_bridge_attach() >> function gets called. > > Nit: > ldb_bridge_attach_helper() doesn't follow the fashion of > imx_xxx_bridge_attach(), not even the other bridge attach > functions touched by this patch do. Right, my bad. But personally, I think rename it as ldb_bridge_attach() should enough to express the meaning. :-) Maybe, reword as > "when various i.MX specific bridge attach functions are > called." > OK, fine. I will correct the commit message at the next version, so happy being reviewed. Thanks. > Regards, > Liu Ying >
diff --git a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c index 6967325cd8ee..9b5bebbe357d 100644 --- a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c +++ b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c @@ -116,11 +116,6 @@ int ldb_bridge_attach_helper(struct drm_bridge *bridge, return -EINVAL; } - if (!bridge->encoder) { - DRM_DEV_ERROR(ldb->dev, "missing encoder\n"); - return -ENODEV; - } - return drm_bridge_attach(bridge->encoder, ldb_ch->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c index d0868a6ac6c9..e6dbbdc87ce2 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c @@ -119,11 +119,6 @@ static int imx8qxp_pc_bridge_attach(struct drm_bridge *bridge, return -EINVAL; } - if (!bridge->encoder) { - DRM_DEV_ERROR(pc->dev, "missing encoder\n"); - return -ENODEV; - } - return drm_bridge_attach(bridge->encoder, ch->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c index ed8b7a4e0e11..1d11cc1df43c 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c @@ -138,11 +138,6 @@ static int imx8qxp_pixel_link_bridge_attach(struct drm_bridge *bridge, return -EINVAL; } - if (!bridge->encoder) { - DRM_DEV_ERROR(pl->dev, "missing encoder\n"); - return -ENODEV; - } - return drm_bridge_attach(bridge->encoder, pl->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c index 4a886cb808ca..fb7cf4369bb8 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c @@ -58,11 +58,6 @@ static int imx8qxp_pxl2dpi_bridge_attach(struct drm_bridge *bridge, return -EINVAL; } - if (!bridge->encoder) { - DRM_DEV_ERROR(p2d->dev, "missing encoder\n"); - return -ENODEV; - } - return drm_bridge_attach(bridge->encoder, p2d->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
The check on the existence of bridge->encoder on the implementation layer of drm bridge driver is not necessary, as it has already been done in the drm_bridge_attach() function. It is guaranteed that the .encoder member of the drm_bridge instance is not NULL when various imx_xxx_bridge_attach() function gets called. Remove the redundant checking codes "if (!bridge->encoder) { ... }". Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev> --- drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 5 ----- drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 ----- drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 5 ----- drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 5 ----- 4 files changed, 20 deletions(-)