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

ata: sata_promise: Drop pointless VPRINTK() calls and convert the remaining ones

Drop pointless VPRINTK() calls for entering and existing interrupt
routines and convert the remaining calls to ata_port_dbg().

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
156e67cc 9913d390

+8 -23
+8 -23
drivers/ata/sata_promise.c
··· 596 596 597 597 prd[idx].addr = cpu_to_le32(addr); 598 598 prd[idx].flags_len = cpu_to_le32(len & 0xffff); 599 - VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", idx, addr, len); 599 + ata_port_dbg(ap, "PRD[%u] = (0x%X, 0x%X)\n", 600 + idx, addr, len); 600 601 601 602 idx++; 602 603 sg_len -= len; ··· 610 609 if (len > SG_COUNT_ASIC_BUG) { 611 610 u32 addr; 612 611 613 - VPRINTK("Splitting last PRD.\n"); 614 - 615 612 addr = le32_to_cpu(prd[idx - 1].addr); 616 613 prd[idx - 1].flags_len = cpu_to_le32(len - SG_COUNT_ASIC_BUG); 617 - VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", idx - 1, addr, SG_COUNT_ASIC_BUG); 614 + ata_port_dbg(ap, "PRD[%u] = (0x%X, 0x%X)\n", 615 + idx - 1, addr, SG_COUNT_ASIC_BUG); 618 616 619 617 addr = addr + len - SG_COUNT_ASIC_BUG; 620 618 len = SG_COUNT_ASIC_BUG; 621 619 prd[idx].addr = cpu_to_le32(addr); 622 620 prd[idx].flags_len = cpu_to_le32(len); 623 - VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", idx, addr, len); 621 + ata_port_dbg(ap, "PRD[%u] = (0x%X, 0x%X)\n", idx, addr, len); 624 622 625 623 idx++; 626 624 } ··· 631 631 { 632 632 struct pdc_port_priv *pp = qc->ap->private_data; 633 633 unsigned int i; 634 - 635 - VPRINTK("ENTER\n"); 636 634 637 635 switch (qc->tf.protocol) { 638 636 case ATA_PROT_DMA: ··· 920 922 u32 hotplug_status; 921 923 int is_sataii_tx4; 922 924 923 - VPRINTK("ENTER\n"); 924 - 925 - if (!host || !host->iomap[PDC_MMIO_BAR]) { 926 - VPRINTK("QUICK EXIT\n"); 925 + if (!host || !host->iomap[PDC_MMIO_BAR]) 927 926 return IRQ_NONE; 928 - } 929 927 930 928 host_mmio = host->iomap[PDC_MMIO_BAR]; 931 929 ··· 940 946 /* reading should also clear interrupts */ 941 947 mask = readl(host_mmio + PDC_INT_SEQMASK); 942 948 943 - if (mask == 0xffffffff && hotplug_status == 0) { 944 - VPRINTK("QUICK EXIT 2\n"); 949 + if (mask == 0xffffffff && hotplug_status == 0) 945 950 goto done_irq; 946 - } 947 951 948 952 mask &= 0xffff; /* only 16 SEQIDs possible */ 949 - if (mask == 0 && hotplug_status == 0) { 950 - VPRINTK("QUICK EXIT 3\n"); 953 + if (mask == 0 && hotplug_status == 0) 951 954 goto done_irq; 952 - } 953 955 954 956 writel(mask, host_mmio + PDC_INT_SEQMASK); 955 957 956 958 is_sataii_tx4 = pdc_is_sataii_tx4(host->ports[0]->flags); 957 959 958 960 for (i = 0; i < host->n_ports; i++) { 959 - VPRINTK("port %u\n", i); 960 961 ap = host->ports[i]; 961 962 962 963 /* check for a plug or unplug event */ ··· 978 989 } 979 990 } 980 991 981 - VPRINTK("EXIT\n"); 982 - 983 992 done_irq: 984 993 spin_unlock(&host->lock); 985 994 return IRQ_RETVAL(handled); ··· 991 1004 void __iomem *ata_mmio = ap->ioaddr.cmd_addr; 992 1005 unsigned int port_no = ap->port_no; 993 1006 u8 seq = (u8) (port_no + 1); 994 - 995 - VPRINTK("ENTER, ap %p\n", ap); 996 1007 997 1008 writel(0x00000001, host_mmio + (seq * 4)); 998 1009 readl(host_mmio + (seq * 4)); /* flush */