| Message ID | 20201128224114.1033617-24-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | drivers/video: W=1 warning fixes | expand |
Hi Am 28.11.20 um 23:41 schrieb Sam Ravnborg: > Fix a few W=1 warnings about unused assignments. > Drop the unused error code. > > v2: > - Subject updated (Lee) > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Qilong Zhang <zhangqilong3@huawei.com> > Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Lee Jones <lee.jones@linaro.org> > --- > drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 ++-- > drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c > index 726c190862d4..e6363a420933 100644 > --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c > +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c > @@ -679,7 +679,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, > struct hdmi_audio_format audio_format; > struct hdmi_audio_dma audio_dma; > struct hdmi_core_audio_config acore; > - int err, n, cts, channel_count; > + int n, cts, channel_count; > unsigned int fs_nr; > bool word_length_16b = false; > > @@ -741,7 +741,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, > return -EINVAL; > } > > - err = hdmi_compute_acr(pclk, fs_nr, &n, &cts); > + hdmi_compute_acr(pclk, fs_nr, &n, &cts); I'd rather return the error reported by hdmi_compute_acr() Best regards Thomas > > /* Audio clock regeneration settings */ > acore.n = n; > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c > index eda29d3032e1..cb63bc0e92ca 100644 > --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c > +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c > @@ -790,7 +790,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, > struct hdmi_audio_format audio_format; > struct hdmi_audio_dma audio_dma; > struct hdmi_core_audio_config core_cfg; > - int err, n, cts, channel_count; > + int n, cts, channel_count; > unsigned int fs_nr; > bool word_length_16b = false; > > @@ -833,7 +833,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, > return -EINVAL; > } > > - err = hdmi_compute_acr(pclk, fs_nr, &n, &cts); > + hdmi_compute_acr(pclk, fs_nr, &n, &cts); > core_cfg.n = n; > core_cfg.cts = cts; > >
On Tue, Dec 01, 2020 at 11:06:15AM +0100, Thomas Zimmermann wrote: > Hi > > Am 28.11.20 um 23:41 schrieb Sam Ravnborg: > > Fix a few W=1 warnings about unused assignments. > > Drop the unused error code. > > > > v2: > > - Subject updated (Lee) > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Cc: Qilong Zhang <zhangqilong3@huawei.com> > > Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de> > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > Cc: Lee Jones <lee.jones@linaro.org> > > --- > > drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 ++-- > > drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c > > index 726c190862d4..e6363a420933 100644 > > --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c > > +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c > > @@ -679,7 +679,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, > > struct hdmi_audio_format audio_format; > > struct hdmi_audio_dma audio_dma; > > struct hdmi_core_audio_config acore; > > - int err, n, cts, channel_count; > > + int n, cts, channel_count; > > unsigned int fs_nr; > > bool word_length_16b = false; > > @@ -741,7 +741,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, > > return -EINVAL; > > } > > - err = hdmi_compute_acr(pclk, fs_nr, &n, &cts); > > + hdmi_compute_acr(pclk, fs_nr, &n, &cts); > > I'd rather return the error reported by hdmi_compute_acr() The DRM version of the same driver does not bother, so I think we should avoid it here too. The better fix would be to sunset the omapfb driver - dunno how far we are from that. There is still a lot of patch chrunch on the omapdrm driver. Sam
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c index 726c190862d4..e6363a420933 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c @@ -679,7 +679,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, struct hdmi_audio_format audio_format; struct hdmi_audio_dma audio_dma; struct hdmi_core_audio_config acore; - int err, n, cts, channel_count; + int n, cts, channel_count; unsigned int fs_nr; bool word_length_16b = false; @@ -741,7 +741,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, return -EINVAL; } - err = hdmi_compute_acr(pclk, fs_nr, &n, &cts); + hdmi_compute_acr(pclk, fs_nr, &n, &cts); /* Audio clock regeneration settings */ acore.n = n; diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c index eda29d3032e1..cb63bc0e92ca 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c @@ -790,7 +790,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, struct hdmi_audio_format audio_format; struct hdmi_audio_dma audio_dma; struct hdmi_core_audio_config core_cfg; - int err, n, cts, channel_count; + int n, cts, channel_count; unsigned int fs_nr; bool word_length_16b = false; @@ -833,7 +833,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, return -EINVAL; } - err = hdmi_compute_acr(pclk, fs_nr, &n, &cts); + hdmi_compute_acr(pclk, fs_nr, &n, &cts); core_cfg.n = n; core_cfg.cts = cts;
Fix a few W=1 warnings about unused assignments. Drop the unused error code. v2: - Subject updated (Lee) Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Qilong Zhang <zhangqilong3@huawei.com> Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Lee Jones <lee.jones@linaro.org> --- drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 ++-- drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)