| Message ID | 20191019071840.16877-1-wambui@karuga.xyz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: remove unnecessary return variable | expand |
On Sat, Oct 19, 2019 at 09:04:31PM +0200, Julia Lawall wrote: > > > On Sat, 19 Oct 2019, Wambui Karuga wrote: > > > From: Wambui Karuga <wambui.karugax@gmail.com> > > > > Remove unnecessary variable `ret` in drm_dp_atomic_find_vcpi_slots() > > only used to hold the function return value and have the function > > return the value directly. > > This patch applies for me, but with a huge offset. What tree are you > using? For drm patches best practices is to base patches either on linux-next or the drm-tip tree we have here: https://cgit.freedesktop.org/drm-tip drm moves quickly, so need to be on top of the latest version. > Also, Greg won't apply this, because it's not targeting staging. Is this > for a specific outreachy project? Yup it's for dri-devel, just applied it. Thanks for the patch, nice cleanup! Cheers, Daniel > > julia > > > > Issue found by coccinelle: > > @@ > > local idexpression ret; > > expression e; > > @@ > > > > -ret = > > +return > > e; > > -return ret; > > > > Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com> > > --- > > drivers/gpu/drm/drm_dp_mst_topology.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > > index 9cccc5e63309..b854a422a523 100644 > > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > > @@ -3540,7 +3540,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, > > { > > struct drm_dp_mst_topology_state *topology_state; > > struct drm_dp_vcpi_allocation *pos, *vcpi = NULL; > > - int prev_slots, req_slots, ret; > > + int prev_slots, req_slots; > > > > topology_state = drm_atomic_get_mst_topology_state(state, mgr); > > if (IS_ERR(topology_state)) > > @@ -3587,8 +3587,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, > > } > > vcpi->vcpi = req_slots; > > > > - ret = req_slots; > > - return ret; > > + return req_slots; > > } > > EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots); > > > > -- > > 2.23.0 > > > > -- > > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191019071840.16877-1-wambui%40karuga.xyz. > >
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 9cccc5e63309..b854a422a523 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3540,7 +3540,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, { struct drm_dp_mst_topology_state *topology_state; struct drm_dp_vcpi_allocation *pos, *vcpi = NULL; - int prev_slots, req_slots, ret; + int prev_slots, req_slots; topology_state = drm_atomic_get_mst_topology_state(state, mgr); if (IS_ERR(topology_state)) @@ -3587,8 +3587,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, } vcpi->vcpi = req_slots; - ret = req_slots; - return ret; + return req_slots; } EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);