| Message ID | 20220912154046.12900-8-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm: probe deferral fixes | expand |
On 12/09/2022 18:40, Johan Hovold wrote: > Drop the overly defensive modeset sanity checks of function parameters > which have already been checked or used by the callers. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Again, please split into dp and dsi patches. After that: Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/dp/dp_display.c | 7 +------ > drivers/gpu/drm/msm/dsi/dsi.c | 7 +------ > 2 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > index 393af1ea9ed8..8ad28bf81abe 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -1597,15 +1597,10 @@ static int dp_display_get_next_bridge(struct msm_dp *dp) > int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev, > struct drm_encoder *encoder) > { > - struct msm_drm_private *priv; > + struct msm_drm_private *priv = dev->dev_private; > struct dp_display_private *dp_priv; > int ret; > > - if (WARN_ON(!encoder) || WARN_ON(!dp_display) || WARN_ON(!dev)) > - return -EINVAL; > - > - priv = dev->dev_private; > - > if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { > DRM_DEV_ERROR(dev->dev, "too many bridges\n"); > return -ENOSPC; > diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c > index 8a95c744972a..31fdee2052be 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.c > +++ b/drivers/gpu/drm/msm/dsi/dsi.c > @@ -211,14 +211,9 @@ void __exit msm_dsi_unregister(void) > int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, > struct drm_encoder *encoder) > { > - struct msm_drm_private *priv; > + struct msm_drm_private *priv = dev->dev_private; > int ret; > > - if (WARN_ON(!encoder) || WARN_ON(!msm_dsi) || WARN_ON(!dev)) > - return -EINVAL; > - > - priv = dev->dev_private; > - > if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { > DRM_DEV_ERROR(dev->dev, "too many bridges\n"); > return -ENOSPC;
On Mon, Sep 12, 2022 at 09:06:28PM +0300, Dmitry Baryshkov wrote: > On 12/09/2022 18:40, Johan Hovold wrote: > > Drop the overly defensive modeset sanity checks of function parameters > > which have already been checked or used by the callers. > > > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > > Again, please split into dp and dsi patches. After that: Sure, if you prefer. But without the stable-tree argument I think there's little point in splitting. > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > > --- > > drivers/gpu/drm/msm/dp/dp_display.c | 7 +------ > > drivers/gpu/drm/msm/dsi/dsi.c | 7 +------ > > 2 files changed, 2 insertions(+), 12 deletions(-) Johan
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 393af1ea9ed8..8ad28bf81abe 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1597,15 +1597,10 @@ static int dp_display_get_next_bridge(struct msm_dp *dp) int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev, struct drm_encoder *encoder) { - struct msm_drm_private *priv; + struct msm_drm_private *priv = dev->dev_private; struct dp_display_private *dp_priv; int ret; - if (WARN_ON(!encoder) || WARN_ON(!dp_display) || WARN_ON(!dev)) - return -EINVAL; - - priv = dev->dev_private; - if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { DRM_DEV_ERROR(dev->dev, "too many bridges\n"); return -ENOSPC; diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 8a95c744972a..31fdee2052be 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -211,14 +211,9 @@ void __exit msm_dsi_unregister(void) int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, struct drm_encoder *encoder) { - struct msm_drm_private *priv; + struct msm_drm_private *priv = dev->dev_private; int ret; - if (WARN_ON(!encoder) || WARN_ON(!msm_dsi) || WARN_ON(!dev)) - return -EINVAL; - - priv = dev->dev_private; - if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { DRM_DEV_ERROR(dev->dev, "too many bridges\n"); return -ENOSPC;
Drop the overly defensive modeset sanity checks of function parameters which have already been checked or used by the callers. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/gpu/drm/msm/dp/dp_display.c | 7 +------ drivers/gpu/drm/msm/dsi/dsi.c | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-)