Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ata: pdc_adma: Drop pointless VPRINTK() calls and remove disabled NCQ debugging

Drop pointless VPRINTK() calls for entering routines and setting up sg
tables. And while we're at it, remove the disabled debugging messages.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

authored by

Hannes Reinecke and committed by
Damien Le Moal
51d628f1 93c77114

+2 -29
+2 -29
drivers/ata/pdc_adma.c
··· 284 284 *(__le32 *)(buf + i) = 285 285 (pFLAGS & pEND) ? 0 : cpu_to_le32(pp->pkt_dma + i + 4); 286 286 i += 4; 287 - 288 - VPRINTK("PRD[%u] = (0x%lX, 0x%X)\n", i/4, 289 - (unsigned long)addr, len); 290 287 } 291 288 292 289 if (likely(last_buf)) ··· 298 301 u8 *buf = pp->pkt; 299 302 u32 pkt_dma = (u32)pp->pkt_dma; 300 303 int i = 0; 301 - 302 - VPRINTK("ENTER\n"); 303 304 304 305 adma_enter_reg_mode(qc->ap); 305 306 if (qc->tf.protocol != ATA_PROT_DMA) ··· 350 355 351 356 i = adma_fill_sg(qc); 352 357 wmb(); /* flush PRDs and pkt to memory */ 353 - #if 0 354 - /* dump out CPB + PRDs for debug */ 355 - { 356 - int j, len = 0; 357 - static char obuf[2048]; 358 - for (j = 0; j < i; ++j) { 359 - len += sprintf(obuf+len, "%02x ", buf[j]); 360 - if ((j & 7) == 7) { 361 - printk("%s\n", obuf); 362 - len = 0; 363 - } 364 - } 365 - if (len) 366 - printk("%s\n", obuf); 367 - } 368 - #endif 369 358 return AC_ERR_OK; 370 359 } 371 360 ··· 357 378 { 358 379 struct ata_port *ap = qc->ap; 359 380 void __iomem *chan = ADMA_PORT_REGS(ap); 360 - 361 - VPRINTK("ENTER, ap %p\n", ap); 362 381 363 382 /* fire up the ADMA engine */ 364 383 writew(aPIOMD4 | aGO, chan + ADMA_CONTROL); ··· 479 502 struct ata_host *host = dev_instance; 480 503 unsigned int handled = 0; 481 504 482 - VPRINTK("ENTER\n"); 483 - 484 505 spin_lock(&host->lock); 485 506 handled = adma_intr_pkt(host) | adma_intr_mmio(host); 486 507 spin_unlock(&host->lock); 487 - 488 - VPRINTK("EXIT\n"); 489 508 490 509 return IRQ_RETVAL(handled); 491 510 } ··· 518 545 return -ENOMEM; 519 546 /* paranoia? */ 520 547 if ((pp->pkt_dma & 7) != 0) { 521 - printk(KERN_ERR "bad alignment for pp->pkt_dma: %08x\n", 522 - (u32)pp->pkt_dma); 548 + ata_port_err(ap, "bad alignment for pp->pkt_dma: %08x\n", 549 + (u32)pp->pkt_dma); 523 550 return -ENOMEM; 524 551 } 525 552 ap->private_data = pp;