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/pata_pcmcia.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/pata_pcmcia.c')
-rw-r--r-- | drivers/ata/pata_pcmcia.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 021abe6d8527..a808ba03bd7f 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -68,7 +68,7 @@ static int pcmcia_set_mode(struct ata_link *link, struct ata_device **r_failed_d | |||
68 | the same vendor - check serial */ | 68 | the same vendor - check serial */ |
69 | if (memcmp(master->id + ATA_ID_SERNO, slave->id + ATA_ID_SERNO, | 69 | if (memcmp(master->id + ATA_ID_SERNO, slave->id + ATA_ID_SERNO, |
70 | ATA_ID_SERNO_LEN) == 0 && master->id[ATA_ID_SERNO] >> 8) { | 70 | ATA_ID_SERNO_LEN) == 0 && master->id[ATA_ID_SERNO] >> 8) { |
71 | ata_dev_printk(slave, KERN_WARNING, "is a ghost device, ignoring.\n"); | 71 | ata_dev_warn(slave, "is a ghost device, ignoring\n"); |
72 | ata_dev_disable(slave); | 72 | ata_dev_disable(slave); |
73 | } | 73 | } |
74 | } | 74 | } |
@@ -142,8 +142,7 @@ static void pcmcia_8bit_drain_fifo(struct ata_queued_cmd *qc) | |||
142 | ioread8(ap->ioaddr.data_addr); | 142 | ioread8(ap->ioaddr.data_addr); |
143 | 143 | ||
144 | if (count) | 144 | if (count) |
145 | ata_port_printk(ap, KERN_WARNING, "drained %d bytes to clear DRQ.\n", | 145 | ata_port_warn(ap, "drained %d bytes to clear DRQ\n", count); |
146 | count); | ||
147 | 146 | ||
148 | } | 147 | } |
149 | 148 | ||