| Message ID | 20190407024808.39821-1-cai@lca.pw (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c05f57fdc34a3d00c9ee28a35772e9d11b5ce100 |
| Headers | show |
| Series | powerpc/pseries/iommu: fix set but not used values | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (8c2ffd9174779014c3fe1f96d9dc3641d9175f00) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 44 lines checked |
On 4/7/2019 8:18 AM, Qian Cai wrote: > The commit b7d6bf4fdd47 ("powerpc/pseries/pci: Remove obsolete SW > invalidate") left 2 variables unused. > > arch/powerpc/platforms/pseries/iommu.c: In function 'tce_build_pSeries': > arch/powerpc/platforms/pseries/iommu.c:108:17: warning: variable 'tces' > set but not used [-Wunused-but-set-variable] > __be64 *tcep, *tces; > ^~~~ > arch/powerpc/platforms/pseries/iommu.c: In function 'tce_free_pSeries': > arch/powerpc/platforms/pseries/iommu.c:132:17: warning: variable 'tces' > set but not used [-Wunused-but-set-variable] > __be64 *tcep, *tces; > ^~~~ > > Also, the commit 68c0449ea16d ("powerpc/pseries/iommu: Use memory@ nodes > in max RAM address calculation") set "ranges" in > ddw_memory_hotplug_max() but never use it. > > arch/powerpc/platforms/pseries/iommu.c: In function > 'ddw_memory_hotplug_max': > arch/powerpc/platforms/pseries/iommu.c:948:7: warning: variable 'ranges' > set but not used [-Wunused-but-set-variable] > int ranges, n_mem_addr_cells, n_mem_size_cells, len; > ^~~~~~ > > Signed-off-by: Qian Cai <cai@lca.pw> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> Cheers, -Mukesh > --- > arch/powerpc/platforms/pseries/iommu.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c > index 36eb1ddbac69..03bbb299320e 100644 > --- a/arch/powerpc/platforms/pseries/iommu.c > +++ b/arch/powerpc/platforms/pseries/iommu.c > @@ -105,7 +105,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index, > unsigned long attrs) > { > u64 proto_tce; > - __be64 *tcep, *tces; > + __be64 *tcep; > u64 rpn; > > proto_tce = TCE_PCI_READ; // Read allowed > @@ -113,7 +113,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index, > if (direction != DMA_TO_DEVICE) > proto_tce |= TCE_PCI_WRITE; > > - tces = tcep = ((__be64 *)tbl->it_base) + index; > + tcep = ((__be64 *)tbl->it_base) + index; > > while (npages--) { > /* can't move this out since we might cross MEMBLOCK boundary */ > @@ -129,9 +129,9 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index, > > static void tce_free_pSeries(struct iommu_table *tbl, long index, long npages) > { > - __be64 *tcep, *tces; > + __be64 *tcep; > > - tces = tcep = ((__be64 *)tbl->it_base) + index; > + tcep = ((__be64 *)tbl->it_base) + index; > > while (npages--) > *(tcep++) = 0; > @@ -945,7 +945,7 @@ static phys_addr_t ddw_memory_hotplug_max(void) > > for_each_node_by_type(memory, "memory") { > unsigned long start, size; > - int ranges, n_mem_addr_cells, n_mem_size_cells, len; > + int n_mem_addr_cells, n_mem_size_cells, len; > const __be32 *memcell_buf; > > memcell_buf = of_get_property(memory, "reg", &len); > @@ -955,9 +955,6 @@ static phys_addr_t ddw_memory_hotplug_max(void) > n_mem_addr_cells = of_n_addr_cells(memory); > n_mem_size_cells = of_n_size_cells(memory); > > - /* ranges in cell */ > - ranges = (len >> 2) / (n_mem_addr_cells + n_mem_size_cells); > - > start = of_read_number(memcell_buf, n_mem_addr_cells); > memcell_buf += n_mem_addr_cells; > size = of_read_number(memcell_buf, n_mem_size_cells);
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 36eb1ddbac69..03bbb299320e 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -105,7 +105,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index, unsigned long attrs) { u64 proto_tce; - __be64 *tcep, *tces; + __be64 *tcep; u64 rpn; proto_tce = TCE_PCI_READ; // Read allowed @@ -113,7 +113,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index, if (direction != DMA_TO_DEVICE) proto_tce |= TCE_PCI_WRITE; - tces = tcep = ((__be64 *)tbl->it_base) + index; + tcep = ((__be64 *)tbl->it_base) + index; while (npages--) { /* can't move this out since we might cross MEMBLOCK boundary */ @@ -129,9 +129,9 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index, static void tce_free_pSeries(struct iommu_table *tbl, long index, long npages) { - __be64 *tcep, *tces; + __be64 *tcep; - tces = tcep = ((__be64 *)tbl->it_base) + index; + tcep = ((__be64 *)tbl->it_base) + index; while (npages--) *(tcep++) = 0; @@ -945,7 +945,7 @@ static phys_addr_t ddw_memory_hotplug_max(void) for_each_node_by_type(memory, "memory") { unsigned long start, size; - int ranges, n_mem_addr_cells, n_mem_size_cells, len; + int n_mem_addr_cells, n_mem_size_cells, len; const __be32 *memcell_buf; memcell_buf = of_get_property(memory, "reg", &len); @@ -955,9 +955,6 @@ static phys_addr_t ddw_memory_hotplug_max(void) n_mem_addr_cells = of_n_addr_cells(memory); n_mem_size_cells = of_n_size_cells(memory); - /* ranges in cell */ - ranges = (len >> 2) / (n_mem_addr_cells + n_mem_size_cells); - start = of_read_number(memcell_buf, n_mem_addr_cells); memcell_buf += n_mem_addr_cells; size = of_read_number(memcell_buf, n_mem_size_cells);
The commit b7d6bf4fdd47 ("powerpc/pseries/pci: Remove obsolete SW invalidate") left 2 variables unused. arch/powerpc/platforms/pseries/iommu.c: In function 'tce_build_pSeries': arch/powerpc/platforms/pseries/iommu.c:108:17: warning: variable 'tces' set but not used [-Wunused-but-set-variable] __be64 *tcep, *tces; ^~~~ arch/powerpc/platforms/pseries/iommu.c: In function 'tce_free_pSeries': arch/powerpc/platforms/pseries/iommu.c:132:17: warning: variable 'tces' set but not used [-Wunused-but-set-variable] __be64 *tcep, *tces; ^~~~ Also, the commit 68c0449ea16d ("powerpc/pseries/iommu: Use memory@ nodes in max RAM address calculation") set "ranges" in ddw_memory_hotplug_max() but never use it. arch/powerpc/platforms/pseries/iommu.c: In function 'ddw_memory_hotplug_max': arch/powerpc/platforms/pseries/iommu.c:948:7: warning: variable 'ranges' set but not used [-Wunused-but-set-variable] int ranges, n_mem_addr_cells, n_mem_size_cells, len; ^~~~~~ Signed-off-by: Qian Cai <cai@lca.pw> --- arch/powerpc/platforms/pseries/iommu.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)