diff options
author | Joe Perches <joe@perches.com> | 2011-04-15 18:51:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2011-07-23 17:57:36 -0400 |
commit | a44fec1fce5d5d14cc3ac4545b8da346394de666 (patch) | |
tree | fa3d16a4c8f1a6a7e9af867f16f7201a5b5442f9 /drivers/ata/sata_sis.c | |
parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) |
ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
Saves a bit of text as the call takes fewer args.
Coalesce a few formats.
Convert a few bare printks to pr_cont.
$ size drivers/ata/built-in.o*
text data bss dec hex filename
558429 73893 117864 750186 b726a drivers/ata/built-in.o.allyesconfig.new
559574 73893 117888 751355 b76fb drivers/ata/built-in.o.allyesconfig.old
149567 14689 4220 168476 2921c drivers/ata/built-in.o.defconfig.new
149851 14689 4220 168760 29338 drivers/ata/built-in.o.defconfig.old
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/ata/sata_sis.c')
-rw-r--r-- | drivers/ata/sata_sis.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index cdcc13e9cf51..ae040dee419e 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
@@ -203,7 +203,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
203 | int i, rc; | 203 | int i, rc; |
204 | 204 | ||
205 | if (!printed_version++) | 205 | if (!printed_version++) |
206 | dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n"); | 206 | dev_info(&pdev->dev, "version " DRV_VERSION "\n"); |
207 | 207 | ||
208 | rc = pcim_enable_device(pdev); | 208 | rc = pcim_enable_device(pdev); |
209 | if (rc) | 209 | if (rc) |
@@ -241,12 +241,12 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
241 | break; | 241 | break; |
242 | } | 242 | } |
243 | if ((pmr & SIS_PMR_COMBINED) == 0) { | 243 | if ((pmr & SIS_PMR_COMBINED) == 0) { |
244 | dev_printk(KERN_INFO, &pdev->dev, | 244 | dev_info(&pdev->dev, |
245 | "Detected SiS 180/181/964 chipset in SATA mode\n"); | 245 | "Detected SiS 180/181/964 chipset in SATA mode\n"); |
246 | port2_start = 64; | 246 | port2_start = 64; |
247 | } else { | 247 | } else { |
248 | dev_printk(KERN_INFO, &pdev->dev, | 248 | dev_info(&pdev->dev, |
249 | "Detected SiS 180/181 chipset in combined mode\n"); | 249 | "Detected SiS 180/181 chipset in combined mode\n"); |
250 | port2_start = 0; | 250 | port2_start = 0; |
251 | pi.flags |= ATA_FLAG_SLAVE_POSS; | 251 | pi.flags |= ATA_FLAG_SLAVE_POSS; |
252 | } | 252 | } |
@@ -256,24 +256,22 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
256 | case 0x0183: | 256 | case 0x0183: |
257 | pci_read_config_dword(pdev, 0x6C, &val); | 257 | pci_read_config_dword(pdev, 0x6C, &val); |
258 | if (val & (1L << 31)) { | 258 | if (val & (1L << 31)) { |
259 | dev_printk(KERN_INFO, &pdev->dev, | 259 | dev_info(&pdev->dev, "Detected SiS 182/965 chipset\n"); |
260 | "Detected SiS 182/965 chipset\n"); | ||
261 | pi.flags |= ATA_FLAG_SLAVE_POSS; | 260 | pi.flags |= ATA_FLAG_SLAVE_POSS; |
262 | } else { | 261 | } else { |
263 | dev_printk(KERN_INFO, &pdev->dev, | 262 | dev_info(&pdev->dev, "Detected SiS 182/965L chipset\n"); |
264 | "Detected SiS 182/965L chipset\n"); | ||
265 | } | 263 | } |
266 | break; | 264 | break; |
267 | 265 | ||
268 | case 0x1182: | 266 | case 0x1182: |
269 | dev_printk(KERN_INFO, &pdev->dev, | 267 | dev_info(&pdev->dev, |
270 | "Detected SiS 1182/966/680 SATA controller\n"); | 268 | "Detected SiS 1182/966/680 SATA controller\n"); |
271 | pi.flags |= ATA_FLAG_SLAVE_POSS; | 269 | pi.flags |= ATA_FLAG_SLAVE_POSS; |
272 | break; | 270 | break; |
273 | 271 | ||
274 | case 0x1183: | 272 | case 0x1183: |
275 | dev_printk(KERN_INFO, &pdev->dev, | 273 | dev_info(&pdev->dev, |
276 | "Detected SiS 1183/966/966L/968/680 controller in PATA mode\n"); | 274 | "Detected SiS 1183/966/966L/968/680 controller in PATA mode\n"); |
277 | ppi[0] = &sis_info133_for_sata; | 275 | ppi[0] = &sis_info133_for_sata; |
278 | ppi[1] = &sis_info133_for_sata; | 276 | ppi[1] = &sis_info133_for_sata; |
279 | break; | 277 | break; |