diff options
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 000d03ae6653..481089c85a94 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -5847,9 +5847,9 @@ int ata_host_start(struct ata_host *host) | |||
5847 | rc = ap->ops->port_start(ap); | 5847 | rc = ap->ops->port_start(ap); |
5848 | if (rc) { | 5848 | if (rc) { |
5849 | if (rc != -ENODEV) | 5849 | if (rc != -ENODEV) |
5850 | dev_printk(KERN_ERR, host->dev, | 5850 | dev_err(host->dev, |
5851 | "failed to start port %d " | 5851 | "failed to start port %d (errno=%d)\n", |
5852 | "(errno=%d)\n", i, rc); | 5852 | i, rc); |
5853 | goto err_out; | 5853 | goto err_out; |
5854 | } | 5854 | } |
5855 | } | 5855 | } |
@@ -5971,8 +5971,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) | |||
5971 | 5971 | ||
5972 | /* host must have been started */ | 5972 | /* host must have been started */ |
5973 | if (!(host->flags & ATA_HOST_STARTED)) { | 5973 | if (!(host->flags & ATA_HOST_STARTED)) { |
5974 | dev_printk(KERN_ERR, host->dev, | 5974 | dev_err(host->dev, "BUG: trying to register unstarted host\n"); |
5975 | "BUG: trying to register unstarted host\n"); | ||
5976 | WARN_ON(1); | 5975 | WARN_ON(1); |
5977 | return -EINVAL; | 5976 | return -EINVAL; |
5978 | } | 5977 | } |
@@ -6242,8 +6241,8 @@ int ata_pci_device_do_resume(struct pci_dev *pdev) | |||
6242 | 6241 | ||
6243 | rc = pcim_enable_device(pdev); | 6242 | rc = pcim_enable_device(pdev); |
6244 | if (rc) { | 6243 | if (rc) { |
6245 | dev_printk(KERN_ERR, &pdev->dev, | 6244 | dev_err(&pdev->dev, |
6246 | "failed to enable device after resume (%d)\n", rc); | 6245 | "failed to enable device after resume (%d)\n", rc); |
6247 | return rc; | 6246 | return rc; |
6248 | } | 6247 | } |
6249 | 6248 | ||