aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/arcmsr
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/arcmsr')
-rw-r--r--drivers/scsi/arcmsr/arcmsr_attr.c15
-rw-r--r--drivers/scsi/arcmsr/arcmsr_hba.c5
2 files changed, 13 insertions, 7 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 0f0a1ae99434..d04d1aa28fa4 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -59,7 +59,10 @@
59 59
60struct class_device_attribute *arcmsr_host_attrs[]; 60struct class_device_attribute *arcmsr_host_attrs[];
61 61
62static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj, char *buf, loff_t off, size_t count) 62static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj,
63 struct bin_attribute *bin,
64 char *buf, loff_t off,
65 size_t count)
63{ 66{
64 struct class_device *cdev = container_of(kobj,struct class_device,kobj); 67 struct class_device *cdev = container_of(kobj,struct class_device,kobj);
65 struct Scsi_Host *host = class_to_shost(cdev); 68 struct Scsi_Host *host = class_to_shost(cdev);
@@ -102,7 +105,10 @@ static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj, char *buf, lo
102 return (allxfer_len); 105 return (allxfer_len);
103} 106}
104 107
105static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj, char *buf, loff_t off, size_t count) 108static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj,
109 struct bin_attribute *bin,
110 char *buf, loff_t off,
111 size_t count)
106{ 112{
107 struct class_device *cdev = container_of(kobj,struct class_device,kobj); 113 struct class_device *cdev = container_of(kobj,struct class_device,kobj);
108 struct Scsi_Host *host = class_to_shost(cdev); 114 struct Scsi_Host *host = class_to_shost(cdev);
@@ -147,7 +153,10 @@ static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj, char *buf, l
147 } 153 }
148} 154}
149 155
150static ssize_t arcmsr_sysfs_iop_message_clear(struct kobject *kobj, char *buf, loff_t off, size_t count) 156static ssize_t arcmsr_sysfs_iop_message_clear(struct kobject *kobj,
157 struct bin_attribute *bin,
158 char *buf, loff_t off,
159 size_t count)
151{ 160{
152 struct class_device *cdev = container_of(kobj,struct class_device,kobj); 161 struct class_device *cdev = container_of(kobj,struct class_device,kobj);
153 struct Scsi_Host *host = class_to_shost(cdev); 162 struct Scsi_Host *host = class_to_shost(cdev);
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index d70398ac64db..50e1310ce983 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -97,9 +97,6 @@ static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb);
97static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb); 97static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb);
98static const char *arcmsr_info(struct Scsi_Host *); 98static const char *arcmsr_info(struct Scsi_Host *);
99static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb); 99static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb);
100static pci_ers_result_t arcmsr_pci_error_detected(struct pci_dev *pdev,
101 pci_channel_state_t state);
102static pci_ers_result_t arcmsr_pci_slot_reset(struct pci_dev *pdev);
103static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev, 100static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev,
104 int queue_depth) 101 int queue_depth)
105{ 102{
@@ -326,7 +323,7 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb)
326 323
327 reg = (struct MessageUnit_B *)(dma_coherent + 324 reg = (struct MessageUnit_B *)(dma_coherent +
328 ARCMSR_MAX_FREECCB_NUM * sizeof(struct CommandControlBlock)); 325 ARCMSR_MAX_FREECCB_NUM * sizeof(struct CommandControlBlock));
329 acb->pmu = (struct MessageUnit_B *)reg; 326 acb->pmu = (struct MessageUnit *)reg;
330 mem_base0 = ioremap(pci_resource_start(pdev, 0), 327 mem_base0 = ioremap(pci_resource_start(pdev, 0),
331 pci_resource_len(pdev, 0)); 328 pci_resource_len(pdev, 0));
332 mem_base1 = ioremap(pci_resource_start(pdev, 2), 329 mem_base1 = ioremap(pci_resource_start(pdev, 2),