aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pdc_adma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/pdc_adma.c')
-rw-r--r--drivers/scsi/pdc_adma.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index 988d0d70a277..a50588c60fab 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -40,6 +40,7 @@
40#include <linux/delay.h> 40#include <linux/delay.h>
41#include <linux/interrupt.h> 41#include <linux/interrupt.h>
42#include <linux/sched.h> 42#include <linux/sched.h>
43#include <linux/device.h>
43#include "scsi.h" 44#include "scsi.h"
44#include <scsi/scsi_host.h> 45#include <scsi/scsi_host.h>
45#include <asm/io.h> 46#include <asm/io.h>
@@ -626,16 +627,14 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
626 627
627 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 628 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
628 if (rc) { 629 if (rc) {
629 printk(KERN_ERR DRV_NAME 630 dev_printk(KERN_ERR, &pdev->dev,
630 "(%s): 32-bit DMA enable failed\n", 631 "32-bit DMA enable failed\n");
631 pci_name(pdev));
632 return rc; 632 return rc;
633 } 633 }
634 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 634 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
635 if (rc) { 635 if (rc) {
636 printk(KERN_ERR DRV_NAME 636 dev_printk(KERN_ERR, &pdev->dev,
637 "(%s): 32-bit consistent DMA enable failed\n", 637 "32-bit consistent DMA enable failed\n");
638 pci_name(pdev));
639 return rc; 638 return rc;
640 } 639 }
641 return 0; 640 return 0;
@@ -651,7 +650,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
651 int rc, port_no; 650 int rc, port_no;
652 651
653 if (!printed_version++) 652 if (!printed_version++)
654 printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); 653 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
655 654
656 rc = pci_enable_device(pdev); 655 rc = pci_enable_device(pdev);
657 if (rc) 656 if (rc)