| Message ID | 1543653585-108277-1-git-send-email-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | a7325a6ca45f6a53ad8f639b7b69f22961ad3757 |
| Headers | show |
| Series | [-next] coresight: stm: remove set but not used variable 'res_size' | expand |
On Sat, Dec 01, 2018 at 08:39:45AM +0000, YueHaibing wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/hwtracing/coresight/coresight-stm.c: In function 'stm_probe': > drivers/hwtracing/coresight/coresight-stm.c:796:9: warning: > variable 'res_size' set but not used [-Wunused-but-set-variable] > > It never used since introduction in commit > 237483aa5cf4 ("coresight: stm: adding driver for CoreSight STM component") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> FWIW, Tested-by: Leo Yan <leo.yan@linaro.org> > --- > drivers/hwtracing/coresight/coresight-stm.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index ef339ff..f07825d 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -793,7 +793,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) > struct stm_drvdata *drvdata; > struct resource *res = &adev->res; > struct resource ch_res; > - size_t res_size, bitmap_size; > + size_t bitmap_size; > struct coresight_desc desc = { 0 }; > struct device_node *np = adev->dev.of_node; > > @@ -833,15 +833,11 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) > > drvdata->write_bytes = stm_fundamental_data_size(drvdata); > > - if (boot_nr_channel) { > + if (boot_nr_channel) > drvdata->numsp = boot_nr_channel; > - res_size = min((resource_size_t)(boot_nr_channel * > - BYTES_PER_CHANNEL), resource_size(res)); > - } else { > + else > drvdata->numsp = stm_num_stimulus_port(drvdata); > - res_size = min((resource_size_t)(drvdata->numsp * > - BYTES_PER_CHANNEL), resource_size(res)); > - } > + > bitmap_size = BITS_TO_LONGS(drvdata->numsp) * sizeof(long); > > guaranteed = devm_kzalloc(dev, bitmap_size, GFP_KERNEL); > > >
On Sat, 1 Dec 2018 at 01:31, YueHaibing <yuehaibing@huawei.com> wrote: > > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/hwtracing/coresight/coresight-stm.c: In function 'stm_probe': > drivers/hwtracing/coresight/coresight-stm.c:796:9: warning: > variable 'res_size' set but not used [-Wunused-but-set-variable] > > It never used since introduction in commit > 237483aa5cf4 ("coresight: stm: adding driver for CoreSight STM component") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied - thanks, Mathieu > --- > drivers/hwtracing/coresight/coresight-stm.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index ef339ff..f07825d 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -793,7 +793,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) > struct stm_drvdata *drvdata; > struct resource *res = &adev->res; > struct resource ch_res; > - size_t res_size, bitmap_size; > + size_t bitmap_size; > struct coresight_desc desc = { 0 }; > struct device_node *np = adev->dev.of_node; > > @@ -833,15 +833,11 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) > > drvdata->write_bytes = stm_fundamental_data_size(drvdata); > > - if (boot_nr_channel) { > + if (boot_nr_channel) > drvdata->numsp = boot_nr_channel; > - res_size = min((resource_size_t)(boot_nr_channel * > - BYTES_PER_CHANNEL), resource_size(res)); > - } else { > + else > drvdata->numsp = stm_num_stimulus_port(drvdata); > - res_size = min((resource_size_t)(drvdata->numsp * > - BYTES_PER_CHANNEL), resource_size(res)); > - } > + > bitmap_size = BITS_TO_LONGS(drvdata->numsp) * sizeof(long); > > guaranteed = devm_kzalloc(dev, bitmap_size, GFP_KERNEL); > > >
diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index ef339ff..f07825d 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -793,7 +793,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) struct stm_drvdata *drvdata; struct resource *res = &adev->res; struct resource ch_res; - size_t res_size, bitmap_size; + size_t bitmap_size; struct coresight_desc desc = { 0 }; struct device_node *np = adev->dev.of_node; @@ -833,15 +833,11 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) drvdata->write_bytes = stm_fundamental_data_size(drvdata); - if (boot_nr_channel) { + if (boot_nr_channel) drvdata->numsp = boot_nr_channel; - res_size = min((resource_size_t)(boot_nr_channel * - BYTES_PER_CHANNEL), resource_size(res)); - } else { + else drvdata->numsp = stm_num_stimulus_port(drvdata); - res_size = min((resource_size_t)(drvdata->numsp * - BYTES_PER_CHANNEL), resource_size(res)); - } + bitmap_size = BITS_TO_LONGS(drvdata->numsp) * sizeof(long); guaranteed = devm_kzalloc(dev, bitmap_size, GFP_KERNEL);
Fixes gcc '-Wunused-but-set-variable' warning: drivers/hwtracing/coresight/coresight-stm.c: In function 'stm_probe': drivers/hwtracing/coresight/coresight-stm.c:796:9: warning: variable 'res_size' set but not used [-Wunused-but-set-variable] It never used since introduction in commit 237483aa5cf4 ("coresight: stm: adding driver for CoreSight STM component") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/hwtracing/coresight/coresight-stm.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)