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/ahci.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/ahci.c')
-rw-r--r-- | drivers/ata/ahci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index dda85116343e..85f7b148f1a1 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -540,9 +540,8 @@ static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class, | |||
540 | if (rc == -EIO) { | 540 | if (rc == -EIO) { |
541 | irq_sts = readl(port_mmio + PORT_IRQ_STAT); | 541 | irq_sts = readl(port_mmio + PORT_IRQ_STAT); |
542 | if (irq_sts & PORT_IRQ_BAD_PMP) { | 542 | if (irq_sts & PORT_IRQ_BAD_PMP) { |
543 | ata_link_printk(link, KERN_WARNING, | 543 | ata_link_warn(link, |
544 | "applying SB600 PMP SRST workaround " | 544 | "applying SB600 PMP SRST workaround and retrying\n"); |
545 | "and retrying\n"); | ||
546 | rc = ahci_do_softreset(link, class, 0, deadline, | 545 | rc = ahci_do_softreset(link, class, 0, deadline, |
547 | ahci_check_ready); | 546 | ahci_check_ready); |
548 | } | 547 | } |