aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-12-12 02:41:24 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2019-01-08 21:58:35 -0500
commit1d978c336ae3067fd136b7238a60e928b922e9e7 (patch)
tree6554254543150a09b1081b7202dbabac9e6eb103
parente09c142891a9362b91208f3423961e7d436b540f (diff)
scsi: gdth: remove dead dma statistics code
This code can't be built into the kernel without editing the source file and is not generally useful. [mkp: typo] Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/gdth.c18
-rw-r--r--drivers/scsi/gdth_proc.c8
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 8e80902d909e..93d9c2f14ab9 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -2126,12 +2126,6 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, struct scsi_cmnd *scp,
2126 cmdp->u.cache64.sg_canz = sgcnt; 2126 cmdp->u.cache64.sg_canz = sgcnt;
2127 scsi_for_each_sg(scp, sl, sgcnt, i) { 2127 scsi_for_each_sg(scp, sl, sgcnt, i) {
2128 cmdp->u.cache64.sg_lst[i].sg_ptr = sg_dma_address(sl); 2128 cmdp->u.cache64.sg_lst[i].sg_ptr = sg_dma_address(sl);
2129#ifdef GDTH_DMA_STATISTICS
2130 if (cmdp->u.cache64.sg_lst[i].sg_ptr > (u64)0xffffffff)
2131 ha->dma64_cnt++;
2132 else
2133 ha->dma32_cnt++;
2134#endif
2135 cmdp->u.cache64.sg_lst[i].sg_len = sg_dma_len(sl); 2129 cmdp->u.cache64.sg_lst[i].sg_len = sg_dma_len(sl);
2136 } 2130 }
2137 } else { 2131 } else {
@@ -2141,9 +2135,6 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, struct scsi_cmnd *scp,
2141 cmdp->u.cache.sg_canz = sgcnt; 2135 cmdp->u.cache.sg_canz = sgcnt;
2142 scsi_for_each_sg(scp, sl, sgcnt, i) { 2136 scsi_for_each_sg(scp, sl, sgcnt, i) {
2143 cmdp->u.cache.sg_lst[i].sg_ptr = sg_dma_address(sl); 2137 cmdp->u.cache.sg_lst[i].sg_ptr = sg_dma_address(sl);
2144#ifdef GDTH_DMA_STATISTICS
2145 ha->dma32_cnt++;
2146#endif
2147 cmdp->u.cache.sg_lst[i].sg_len = sg_dma_len(sl); 2138 cmdp->u.cache.sg_lst[i].sg_len = sg_dma_len(sl);
2148 } 2139 }
2149 } 2140 }
@@ -2298,12 +2289,6 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, struct scsi_cmnd *scp, u8 b)
2298 cmdp->u.raw64.sg_ranz = sgcnt; 2289 cmdp->u.raw64.sg_ranz = sgcnt;
2299 scsi_for_each_sg(scp, sl, sgcnt, i) { 2290 scsi_for_each_sg(scp, sl, sgcnt, i) {
2300 cmdp->u.raw64.sg_lst[i].sg_ptr = sg_dma_address(sl); 2291 cmdp->u.raw64.sg_lst[i].sg_ptr = sg_dma_address(sl);
2301#ifdef GDTH_DMA_STATISTICS
2302 if (cmdp->u.raw64.sg_lst[i].sg_ptr > (u64)0xffffffff)
2303 ha->dma64_cnt++;
2304 else
2305 ha->dma32_cnt++;
2306#endif
2307 cmdp->u.raw64.sg_lst[i].sg_len = sg_dma_len(sl); 2292 cmdp->u.raw64.sg_lst[i].sg_len = sg_dma_len(sl);
2308 } 2293 }
2309 } else { 2294 } else {
@@ -2313,9 +2298,6 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, struct scsi_cmnd *scp, u8 b)
2313 cmdp->u.raw.sg_ranz = sgcnt; 2298 cmdp->u.raw.sg_ranz = sgcnt;
2314 scsi_for_each_sg(scp, sl, sgcnt, i) { 2299 scsi_for_each_sg(scp, sl, sgcnt, i) {
2315 cmdp->u.raw.sg_lst[i].sg_ptr = sg_dma_address(sl); 2300 cmdp->u.raw.sg_lst[i].sg_ptr = sg_dma_address(sl);
2316#ifdef GDTH_DMA_STATISTICS
2317 ha->dma32_cnt++;
2318#endif
2319 cmdp->u.raw.sg_lst[i].sg_len = sg_dma_len(sl); 2301 cmdp->u.raw.sg_lst[i].sg_len = sg_dma_len(sl);
2320 } 2302 }
2321 } 2303 }
diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
index 8e77f8fd8641..fc36c49a5334 100644
--- a/drivers/scsi/gdth_proc.c
+++ b/drivers/scsi/gdth_proc.c
@@ -229,14 +229,6 @@ int gdth_show_info(struct seq_file *m, struct Scsi_Host *host)
229 " Serial No.: \t0x%8X\tCache RAM size:\t%d KB\n", 229 " Serial No.: \t0x%8X\tCache RAM size:\t%d KB\n",
230 ha->binfo.ser_no, ha->binfo.memsize / 1024); 230 ha->binfo.ser_no, ha->binfo.memsize / 1024);
231 231
232#ifdef GDTH_DMA_STATISTICS
233 /* controller statistics */
234 seq_puts(m, "\nController Statistics:\n");
235 seq_printf(m,
236 " 32-bit DMA buffer:\t%lu\t64-bit DMA buffer:\t%lu\n",
237 ha->dma32_cnt, ha->dma64_cnt);
238#endif
239
240 if (ha->more_proc) { 232 if (ha->more_proc) {
241 size_t size = max_t(size_t, GDTH_SCRATCH, sizeof(gdth_hget_str)); 233 size_t size = max_t(size_t, GDTH_SCRATCH, sizeof(gdth_hget_str));
242 234