aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_atp867x.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-04-15 18:51:58 -0400
committerJeff Garzik <jgarzik@pobox.com>2011-07-23 17:57:36 -0400
commita44fec1fce5d5d14cc3ac4545b8da346394de666 (patch)
treefa3d16a4c8f1a6a7e9af867f16f7201a5b5442f9 /drivers/ata/pata_atp867x.c
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (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/pata_atp867x.c')
-rw-r--r--drivers/ata/pata_atp867x.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
index 95295935dd95..bcbf99856e1f 100644
--- a/drivers/ata/pata_atp867x.c
+++ b/drivers/ata/pata_atp867x.c
@@ -470,7 +470,7 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host)
470 } 470 }
471 471
472 if (!mask) { 472 if (!mask) {
473 dev_printk(KERN_ERR, gdev, "no available native port\n"); 473 dev_err(gdev, "no available native port\n");
474 return -ENODEV; 474 return -ENODEV;
475 } 475 }
476 476
@@ -500,7 +500,7 @@ static int atp867x_init_one(struct pci_dev *pdev,
500 int rc; 500 int rc;
501 501
502 if (!printed_version++) 502 if (!printed_version++)
503 dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n"); 503 dev_info(&pdev->dev, "version " DRV_VERSION "\n");
504 504
505 rc = pcim_enable_device(pdev); 505 rc = pcim_enable_device(pdev);
506 if (rc) 506 if (rc)
@@ -511,15 +511,14 @@ static int atp867x_init_one(struct pci_dev *pdev,
511 511
512 host = ata_host_alloc_pinfo(&pdev->dev, ppi, ATP867X_NUM_PORTS); 512 host = ata_host_alloc_pinfo(&pdev->dev, ppi, ATP867X_NUM_PORTS);
513 if (!host) { 513 if (!host) {
514 dev_printk(KERN_ERR, &pdev->dev, 514 dev_err(&pdev->dev, "failed to allocate ATA host\n");
515 "failed to allocate ATA host\n");
516 rc = -ENOMEM; 515 rc = -ENOMEM;
517 goto err_out; 516 goto err_out;
518 } 517 }
519 518
520 rc = atp867x_ata_pci_sff_init_host(host); 519 rc = atp867x_ata_pci_sff_init_host(host);
521 if (rc) { 520 if (rc) {
522 dev_printk(KERN_ERR, &pdev->dev, "failed to init host\n"); 521 dev_err(&pdev->dev, "failed to init host\n");
523 goto err_out; 522 goto err_out;
524 } 523 }
525 524
@@ -528,7 +527,7 @@ static int atp867x_init_one(struct pci_dev *pdev,
528 rc = ata_host_activate(host, pdev->irq, ata_bmdma_interrupt, 527 rc = ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,
529 IRQF_SHARED, &atp867x_sht); 528 IRQF_SHARED, &atp867x_sht);
530 if (rc) 529 if (rc)
531 dev_printk(KERN_ERR, &pdev->dev, "failed to activate host\n"); 530 dev_err(&pdev->dev, "failed to activate host\n");
532 531
533err_out: 532err_out:
534 return rc; 533 return rc;