diff options
author | Joe Perches <joe@perches.com> | 2011-04-15 18:51:59 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2011-07-23 17:57:36 -0400 |
commit | a9a79dfec239568bdbf778242f8fcd10bcc5b9e2 (patch) | |
tree | 620648585f89cdb589d1625431f8c21ef70a9258 /drivers/ata/sata_fsl.c | |
parent | a44fec1fce5d5d14cc3ac4545b8da346394de666 (diff) |
ata: Convert ata_<foo>_printk(KERN_<LEVEL> to ata_<foo>_<level>
Saves text by removing nearly duplicated text format strings by
creating ata_<foo>_printk functions and printf extension %pV.
ata defconfig size shrinks ~5% (~8KB), allyesconfig ~2.5% (~13KB)
Format string duplication comes from:
#define ata_link_printk(link, lv, fmt, args...) do { \
if (sata_pmp_attached((link)->ap) || (link)->ap->slave_link) \
printk("%sata%u.%02u: "fmt, lv, (link)->ap->print_id, \
(link)->pmp , ##args); \
else \
printk("%sata%u: "fmt, lv, (link)->ap->print_id , ##args); \
} while(0)
Coalesce long formats.
$ size drivers/ata/built-in.*
text data bss dec hex filename
544969 73893 116584 735446 b38d6 drivers/ata/built-in.allyesconfig.ata.o
558429 73893 117864 750186 b726a drivers/ata/built-in.allyesconfig.dev_level.o
141328 14689 4220 160237 271ed drivers/ata/built-in.defconfig.ata.o
149567 14689 4220 168476 2921c drivers/ata/built-in.defconfig.dev_level.o
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/ata/sata_fsl.c')
-rw-r--r-- | drivers/ata/sata_fsl.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 1cc70e33d5a3..78ae7b67b09e 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -346,12 +346,11 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, | |||
346 | 346 | ||
347 | /* warn if each s/g element is not dword aligned */ | 347 | /* warn if each s/g element is not dword aligned */ |
348 | if (sg_addr & 0x03) | 348 | if (sg_addr & 0x03) |
349 | ata_port_printk(qc->ap, KERN_ERR, | 349 | ata_port_err(qc->ap, "s/g addr unaligned : 0x%llx\n", |
350 | "s/g addr unaligned : 0x%llx\n", | 350 | (unsigned long long)sg_addr); |
351 | (unsigned long long)sg_addr); | ||
352 | if (sg_len & 0x03) | 351 | if (sg_len & 0x03) |
353 | ata_port_printk(qc->ap, KERN_ERR, | 352 | ata_port_err(qc->ap, "s/g len unaligned : 0x%x\n", |
354 | "s/g len unaligned : 0x%x\n", sg_len); | 353 | sg_len); |
355 | 354 | ||
356 | if (num_prde == (SATA_FSL_MAX_PRD_DIRECT - 1) && | 355 | if (num_prde == (SATA_FSL_MAX_PRD_DIRECT - 1) && |
357 | sg_next(sg) != NULL) { | 356 | sg_next(sg) != NULL) { |
@@ -739,8 +738,7 @@ try_offline_again: | |||
739 | 1, 500); | 738 | 1, 500); |
740 | 739 | ||
741 | if (temp & ONLINE) { | 740 | if (temp & ONLINE) { |
742 | ata_port_printk(ap, KERN_ERR, | 741 | ata_port_err(ap, "Hardreset failed, not off-lined %d\n", i); |
743 | "Hardreset failed, not off-lined %d\n", i); | ||
744 | 742 | ||
745 | /* | 743 | /* |
746 | * Try to offline controller atleast twice | 744 | * Try to offline controller atleast twice |
@@ -776,8 +774,7 @@ try_offline_again: | |||
776 | temp = ata_wait_register(ap, hcr_base + HSTATUS, ONLINE, 0, 1, 500); | 774 | temp = ata_wait_register(ap, hcr_base + HSTATUS, ONLINE, 0, 1, 500); |
777 | 775 | ||
778 | if (!(temp & ONLINE)) { | 776 | if (!(temp & ONLINE)) { |
779 | ata_port_printk(ap, KERN_ERR, | 777 | ata_port_err(ap, "Hardreset failed, not on-lined\n"); |
780 | "Hardreset failed, not on-lined\n"); | ||
781 | goto err; | 778 | goto err; |
782 | } | 779 | } |
783 | 780 | ||
@@ -793,9 +790,8 @@ try_offline_again: | |||
793 | 790 | ||
794 | temp = ata_wait_register(ap, hcr_base + HSTATUS, 0xFF, 0, 1, 500); | 791 | temp = ata_wait_register(ap, hcr_base + HSTATUS, 0xFF, 0, 1, 500); |
795 | if ((!(temp & 0x10)) || ata_link_offline(link)) { | 792 | if ((!(temp & 0x10)) || ata_link_offline(link)) { |
796 | ata_port_printk(ap, KERN_WARNING, | 793 | ata_port_warn(ap, "No Device OR PHYRDY change,Hstatus = 0x%x\n", |
797 | "No Device OR PHYRDY change,Hstatus = 0x%x\n", | 794 | ioread32(hcr_base + HSTATUS)); |
798 | ioread32(hcr_base + HSTATUS)); | ||
799 | *class = ATA_DEV_NONE; | 795 | *class = ATA_DEV_NONE; |
800 | return 0; | 796 | return 0; |
801 | } | 797 | } |
@@ -808,13 +804,12 @@ try_offline_again: | |||
808 | 500, jiffies_to_msecs(deadline - start_jiffies)); | 804 | 500, jiffies_to_msecs(deadline - start_jiffies)); |
809 | 805 | ||
810 | if ((temp & 0xFF) != 0x18) { | 806 | if ((temp & 0xFF) != 0x18) { |
811 | ata_port_printk(ap, KERN_WARNING, "No Signature Update\n"); | 807 | ata_port_warn(ap, "No Signature Update\n"); |
812 | *class = ATA_DEV_NONE; | 808 | *class = ATA_DEV_NONE; |
813 | goto do_followup_srst; | 809 | goto do_followup_srst; |
814 | } else { | 810 | } else { |
815 | ata_port_printk(ap, KERN_INFO, | 811 | ata_port_info(ap, "Signature Update detected @ %d msecs\n", |
816 | "Signature Update detected @ %d msecs\n", | 812 | jiffies_to_msecs(jiffies - start_jiffies)); |
817 | jiffies_to_msecs(jiffies - start_jiffies)); | ||
818 | *class = sata_fsl_dev_classify(ap); | 813 | *class = sata_fsl_dev_classify(ap); |
819 | return 0; | 814 | return 0; |
820 | } | 815 | } |
@@ -889,7 +884,7 @@ static int sata_fsl_softreset(struct ata_link *link, unsigned int *class, | |||
889 | 884 | ||
890 | temp = ata_wait_register(ap, CQ + hcr_base, 0x1, 0x1, 1, 5000); | 885 | temp = ata_wait_register(ap, CQ + hcr_base, 0x1, 0x1, 1, 5000); |
891 | if (temp & 0x1) { | 886 | if (temp & 0x1) { |
892 | ata_port_printk(ap, KERN_WARNING, "ATA_SRST issue failed\n"); | 887 | ata_port_warn(ap, "ATA_SRST issue failed\n"); |
893 | 888 | ||
894 | DPRINTK("Softreset@5000,CQ=0x%x,CA=0x%x,CC=0x%x\n", | 889 | DPRINTK("Softreset@5000,CQ=0x%x,CA=0x%x,CC=0x%x\n", |
895 | ioread32(CQ + hcr_base), | 890 | ioread32(CQ + hcr_base), |