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

Commit d67a70ac authored by James Bottomley's avatar James Bottomley Committed by James Bottomley
Browse files

[SCSI] arcmsr: fix up sysfs values 



The sysfs files in arcmsr are non-standard in that they aren't simple
filename value pairs, the values actually contain preceeding text which
would have to be parsed.  The idea of sysfs files is that the file name
is the description and the contents is a simple value.

Fix up arcmsr to conform to this standard.

Acked-By: default avatarErich Chen <erich@areca.com.tw>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 43d6b68d

drivers/scsi/arcmsr/arcmsr_attr.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb) { 
static ssize_t

static ssize_t

arcmsr_attr_host_driver_version(struct class_device *cdev, char *buf) {

arcmsr_attr_host_driver_version(struct class_device *cdev, char *buf) {

	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"ARCMSR: %s\n",

			"%s\n",

			ARCMSR_DRIVER_VERSION);

			ARCMSR_DRIVER_VERSION);

}

}
@@ -274,7 +274,7 @@ arcmsr_attr_host_driver_posted_cmd(struct class_device *cdev, char *buf) { 
	struct Scsi_Host *host = class_to_shost(cdev);

	struct Scsi_Host *host = class_to_shost(cdev);

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"Current commands posted:     %4d\n",

			"%4d\n",

			atomic_read(&acb->ccboutstandingcount));

			atomic_read(&acb->ccboutstandingcount));

}

}
@@ -283,7 +283,7 @@ arcmsr_attr_host_driver_reset(struct class_device *cdev, char *buf) { 
	struct Scsi_Host *host = class_to_shost(cdev);

	struct Scsi_Host *host = class_to_shost(cdev);

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"SCSI Host Resets:            %4d\n",

			"%4d\n",

			acb->num_resets);

			acb->num_resets);

}

}
@@ -292,7 +292,7 @@ arcmsr_attr_host_driver_abort(struct class_device *cdev, char *buf) { 
	struct Scsi_Host *host = class_to_shost(cdev);

	struct Scsi_Host *host = class_to_shost(cdev);

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"SCSI Aborts/Timeouts:        %4d\n",

			"%4d\n",

			acb->num_aborts);

			acb->num_aborts);

}

}
@@ -301,7 +301,7 @@ arcmsr_attr_host_fw_model(struct class_device *cdev, char *buf) { 
    struct Scsi_Host *host = class_to_shost(cdev);

    struct Scsi_Host *host = class_to_shost(cdev);

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"Adapter Model: %s\n",

			"%s\n",

			acb->firm_model);

			acb->firm_model);

}

}
@@ -311,7 +311,7 @@ arcmsr_attr_host_fw_version(struct class_device *cdev, char *buf) { 
	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;





	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"Firmware Version:  %s\n",

			"%s\n",

			acb->firm_version);

			acb->firm_version);

}

}
@@ -321,7 +321,7 @@ arcmsr_attr_host_fw_request_len(struct class_device *cdev, char *buf) { 
	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;





	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"Reguest Lenth: %4d\n",

			"%4d\n",

			acb->firm_request_len);

			acb->firm_request_len);

}

}
@@ -331,7 +331,7 @@ arcmsr_attr_host_fw_numbers_queue(struct class_device *cdev, char *buf) { 
	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;





	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"Numbers of Queue: %4d\n",

			"%4d\n",

			acb->firm_numbers_queue);

			acb->firm_numbers_queue);

}

}
@@ -341,7 +341,7 @@ arcmsr_attr_host_fw_sdram_size(struct class_device *cdev, char *buf) { 
	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;





	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"SDRAM Size: %4d\n",

			"%4d\n",

			acb->firm_sdram_size);

			acb->firm_sdram_size);

}

}
@@ -351,7 +351,7 @@ arcmsr_attr_host_fw_hd_channels(struct class_device *cdev, char *buf) { 
	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;





	return snprintf(buf, PAGE_SIZE,

	return snprintf(buf, PAGE_SIZE,

			"Hard Disk Channels: %4d\n",

			"%4d\n",

			acb->firm_hd_channels);

			acb->firm_hd_channels);

}

}