| Message ID | e7c6d5349f4cdc002d6327c557e8c65a90e3447a.1637140900.git.mchehab+huawei@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: atomisp: reduce the gap for ISP2401 | expand |
On Wed, Nov 17, 2021 at 09:25:28AM +0000, Mauro Carvalho Chehab wrote: > .../media/atomisp/pci/sh_css_metrics.c | 25 ------------------- > 1 file changed, 25 deletions(-) > > diff --git a/drivers/staging/media/atomisp/pci/sh_css_metrics.c b/drivers/staging/media/atomisp/pci/sh_css_metrics.c > index 9744bbebe1bc..8ded6cdd1575 100644 > --- a/drivers/staging/media/atomisp/pci/sh_css_metrics.c > +++ b/drivers/staging/media/atomisp/pci/sh_css_metrics.c > @@ -123,40 +123,15 @@ sh_css_metrics_sample_pcs(void) > unsigned int pc; > unsigned int msink; > > -#if SUSPEND > - unsigned int sc = 0; > - unsigned int stopped_sc = 0; > - unsigned int resume_sc = 0; > -#endif > > -#if MULTIPLE_PCS > - int i; > - unsigned int pc_tab[NOF_PCS]; > - > - for (i = 0; i < NOF_PCS; i++) > - pc_tab[i] = 0; > -#endif > > if (!pc_histogram_enabled) > return; There are three blank lines in a row now. Checkpatch is not smart enough to spot this until you re-run it with the -f file mode after applying the patch. This is an easy mistake to make and you did it a couple times in yesterday's patchset as well. No big deal. Could you re-run checkpatch.pl at the end and clean it up afterwards? regards, dan carpenter
diff --git a/drivers/staging/media/atomisp/pci/sh_css_metrics.c b/drivers/staging/media/atomisp/pci/sh_css_metrics.c index 9744bbebe1bc..8ded6cdd1575 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_metrics.c +++ b/drivers/staging/media/atomisp/pci/sh_css_metrics.c @@ -123,40 +123,15 @@ sh_css_metrics_sample_pcs(void) unsigned int pc; unsigned int msink; -#if SUSPEND - unsigned int sc = 0; - unsigned int stopped_sc = 0; - unsigned int resume_sc = 0; -#endif -#if MULTIPLE_PCS - int i; - unsigned int pc_tab[NOF_PCS]; - - for (i = 0; i < NOF_PCS; i++) - pc_tab[i] = 0; -#endif if (!pc_histogram_enabled) return; if (isp_histogram) { -#if SUSPEND - /* STOP the ISP */ - isp_ctrl_store(ISP0_ID, ISP_SC_REG, STOP_MASK); -#endif msink = isp_ctrl_load(ISP0_ID, ISP_CTRL_SINK_REG); -#if MULTIPLE_PCS - for (i = 0; i < NOF_PCS; i++) - pc_tab[i] = isp_ctrl_load(ISP0_ID, ISP_PC_REG); -#else pc = isp_ctrl_load(ISP0_ID, ISP_PC_REG); -#endif -#if SUSPEND - /* RESUME the ISP */ - isp_ctrl_store(ISP0_ID, ISP_SC_REG, RESUME_MASK); -#endif isp_histogram->msink[pc] &= msink; stall = (msink != 0x7FF);
There are two #ifdefs there which aren't defined anywhere. So, just drop the dead code. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/13] at: https://lore.kernel.org/all/cover.1637140900.git.mchehab+huawei@kernel.org/ .../media/atomisp/pci/sh_css_metrics.c | 25 ------------------- 1 file changed, 25 deletions(-)