Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685b9e02 authored by James Bottomley's avatar James Bottomley Committed by James Bottomley
Browse files

[SCSI] arcmsr: fix compile problems 



  CC [M]  drivers/scsi/arcmsr/arcmsr_hba.o
drivers/scsi/arcmsr/arcmsr_attr.c:186: warning: initialization from
incompatible pointer type
drivers/scsi/arcmsr/arcmsr_attr.c:196: warning: initialization from
incompatible pointer type
drivers/scsi/arcmsr/arcmsr_attr.c:206: warning: initialization from
incompatible pointer type
drivers/scsi/arcmsr/arcmsr_hba.c: In function 'arcmsr_alloc_ccb_pool':
drivers/scsi/arcmsr/arcmsr_hba.c:329: warning: assignment from
incompatible pointer type
drivers/scsi/arcmsr/arcmsr_hba.c: At top level:
drivers/scsi/arcmsr/arcmsr_hba.c:101: warning:
'arcmsr_pci_error_detected' declared 'static' but never defined
drivers/scsi/arcmsr/arcmsr_hba.c:102: warning: 'arcmsr_pci_slot_reset'
declared 'static' but never defined

The majority being incorrect casting or the fact that binary attributes
now take an additional argument.

Cc: Nick Cheng <nick.cheng@areca.com.tw>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 1a4f550a

drivers/scsi/arcmsr/arcmsr_attr.c

+12 −3
Original line number Diff line number Diff line
@@ -59,7 +59,10 @@ 


struct class_device_attribute *arcmsr_host_attrs[];



static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj, char *buf, loff_t off, size_t count)

static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj,

					     struct bin_attribute *bin,

					     char *buf, loff_t off,

					     size_t count)

{

	struct class_device *cdev = container_of(kobj,struct class_device,kobj);

	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 
	return (allxfer_len);

}



static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj, char *buf, loff_t off, size_t count)

static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj,

					      struct bin_attribute *bin,

					      char *buf, loff_t off,

					      size_t count)

{

	struct class_device *cdev = container_of(kobj,struct class_device,kobj);

	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 
	}

}



static ssize_t arcmsr_sysfs_iop_message_clear(struct kobject *kobj, char *buf, loff_t off, size_t count)

static ssize_t arcmsr_sysfs_iop_message_clear(struct kobject *kobj,

					      struct bin_attribute *bin,

					      char *buf, loff_t off,

					      size_t count)

{

	struct class_device *cdev = container_of(kobj,struct class_device,kobj);

	struct Scsi_Host *host = class_to_shost(cdev);

drivers/scsi/arcmsr/arcmsr_hba.c

+1 −4
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb); 
static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb);

static const char *arcmsr_info(struct Scsi_Host *);

static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb);

static pci_ers_result_t arcmsr_pci_error_detected(struct pci_dev *pdev,

						pci_channel_state_t state);

static pci_ers_result_t arcmsr_pci_slot_reset(struct pci_dev *pdev);

static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev,

								int queue_depth)

{
@@ -326,7 +323,7 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb) 


		reg = (struct MessageUnit_B *)(dma_coherent +

		ARCMSR_MAX_FREECCB_NUM * sizeof(struct CommandControlBlock));

		acb->pmu = (struct MessageUnit_B *)reg;

		acb->pmu = (struct MessageUnit *)reg;

		mem_base0 = ioremap(pci_resource_start(pdev, 0),

					pci_resource_len(pdev, 0));

		mem_base1 = ioremap(pci_resource_start(pdev, 2),