aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_qstor.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/sata_qstor.c')
-rw-r--r--drivers/scsi/sata_qstor.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 8c20229b01b4..65502c157a54 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -35,6 +35,7 @@
35#include <linux/delay.h> 35#include <linux/delay.h>
36#include <linux/interrupt.h> 36#include <linux/interrupt.h>
37#include <linux/sched.h> 37#include <linux/sched.h>
38#include <linux/device.h>
38#include "scsi.h" 39#include "scsi.h"
39#include <scsi/scsi_host.h> 40#include <scsi/scsi_host.h>
40#include <asm/io.h> 41#include <asm/io.h>
@@ -602,25 +603,22 @@ static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
602 if (rc) { 603 if (rc) {
603 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 604 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
604 if (rc) { 605 if (rc) {
605 printk(KERN_ERR DRV_NAME 606 dev_printk(KERN_ERR, &pdev->dev,
606 "(%s): 64-bit DMA enable failed\n", 607 "64-bit DMA enable failed\n");
607 pci_name(pdev));
608 return rc; 608 return rc;
609 } 609 }
610 } 610 }
611 } else { 611 } else {
612 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 612 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
613 if (rc) { 613 if (rc) {
614 printk(KERN_ERR DRV_NAME 614 dev_printk(KERN_ERR, &pdev->dev,
615 "(%s): 32-bit DMA enable failed\n", 615 "32-bit DMA enable failed\n");
616 pci_name(pdev));
617 return rc; 616 return rc;
618 } 617 }
619 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 618 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
620 if (rc) { 619 if (rc) {
621 printk(KERN_ERR DRV_NAME 620 dev_printk(KERN_ERR, &pdev->dev,
622 "(%s): 32-bit consistent DMA enable failed\n", 621 "32-bit consistent DMA enable failed\n");
623 pci_name(pdev));
624 return rc; 622 return rc;
625 } 623 }
626 } 624 }
@@ -637,7 +635,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
637 int rc, port_no; 635 int rc, port_no;
638 636
639 if (!printed_version++) 637 if (!printed_version++)
640 printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); 638 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
641 639
642 rc = pci_enable_device(pdev); 640 rc = pci_enable_device(pdev);
643 if (rc) 641 if (rc)