Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit deee13dfd6dd6c18518ea725f11111ebd9bf4fa8

Authored by Kai Makisara
Committed by James Bottomley
1 parent c9872fe1ad
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] st: compile fix when DEBUG set to one 

Remove the now useless counting of adjacent pages from the debugging code in
to make it compile when DEBUG is set non-zero.

Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Showing 2 changed files with 4 additions and 8 deletions Side-by-side Diff

... ... @@ -17,7 +17,7 @@
17 17 Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
18 18 */
19 19  
20   -static const char *verstr = "20080117";
  20 +static const char *verstr = "20080221";
21 21  
22 22 #include <linux/module.h>
23 23  
... ... @@ -1172,7 +1172,7 @@
1172 1172 STp->try_dio_now = STp->try_dio;
1173 1173 STp->recover_count = 0;
1174 1174 DEB( STp->nbr_waits = STp->nbr_finished = 0;
1175   - STp->nbr_requests = STp->nbr_dio = STp->nbr_pages = STp->nbr_combinable = 0; )
  1175 + STp->nbr_requests = STp->nbr_dio = STp->nbr_pages = 0; )
1176 1176  
1177 1177 retval = check_tape(STp, filp);
1178 1178 if (retval < 0)
... ... @@ -1226,8 +1226,8 @@
1226 1226 }
1227 1227  
1228 1228 DEBC( if (STp->nbr_requests)
1229   - printk(KERN_DEBUG "%s: Number of r/w requests %d, dio used in %d, pages %d (%d).\n",
1230   - name, STp->nbr_requests, STp->nbr_dio, STp->nbr_pages, STp->nbr_combinable));
  1229 + printk(KERN_DEBUG "%s: Number of r/w requests %d, dio used in %d, pages %d.\n",
  1230 + name, STp->nbr_requests, STp->nbr_dio, STp->nbr_pages));
1231 1231  
1232 1232 if (STps->rw == ST_WRITING && !STp->pos_unknown) {
1233 1233 struct st_cmdstatus *cmdstatp = &STp->buffer->cmdstat;
... ... @@ -1422,9 +1422,6 @@
1422 1422 if (STbp->do_dio) {
1423 1423 STp->nbr_dio++;
1424 1424 STp->nbr_pages += STbp->do_dio;
1425   - for (i=1; i < STbp->do_dio; i++)
1426   - if (page_to_pfn(STbp->sg[i].page) == page_to_pfn(STbp->sg[i-1].page) + 1)
1427   - STp->nbr_combinable++;
1428 1425 }
1429 1426 )
1430 1427 } else
... ... @@ -164,7 +164,6 @@
164 164 int nbr_requests;
165 165 int nbr_dio;
166 166 int nbr_pages;
167   - int nbr_combinable;
168 167 unsigned char last_cmnd[6];
169 168 unsigned char last_sense[16];
170 169 #endif