debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Add arcmsr (Areca) driver. 

* debian/patches/features/all/drivers: New directory.
* debian/patches/features/all/drivers/scsi-arcmsr-1.patch,
  debian/patches/features/all/drivers/scsi-arcmsr-2.patch,
  debian/patches/features/all/drivers/scsi-arcmsr-3.patch: Add.
* debian/patches/series/2: Add features/all/drivers/scsi-arcmsr-*.

svn path=/dists/trunk/linux-2.6/; revision=7537
This commit is contained in:
Bastian Blank 2006-09-27 11:23:58 +00:00
parent 1c43d0d425
commit 2582728098
4 changed files with 3250 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3101
debian/patches/features/all/drivers/scsi-arcmsr-1.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

49
debian/patches/features/all/drivers/scsi-arcmsr-2.patch vendored Normal file
View File

@ -0,0 +1,49 @@
# [SCSI] areca sysfs fix
# 43d6b68dc38867e489995e21649bb82f6ee7b5d3
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 0459f41..c96f714 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -240,15 +240,11 @@ int arcmsr_alloc_sysfs_attr(struct Adapt
}
return 0;
error_bin_file_message_clear:
- error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+ sysfs_remove_bin_file(&host->shost_classdev.kobj,
&arcmsr_sysfs_message_write_attr);
- if (error)
- printk(KERN_ERR "arcmsr: sysfs_remove_bin_file mu_write failed\n");
error_bin_file_message_write:
- error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+ sysfs_remove_bin_file(&host->shost_classdev.kobj,
&arcmsr_sysfs_message_read_attr);
- if (error)
- printk(KERN_ERR "arcmsr: sysfs_remove_bin_file mu_read failed\n");
error_bin_file_message_read:
return error;
}
@@ -256,20 +252,13 @@ error_bin_file_message_read:
void
arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb) {
struct Scsi_Host *host = acb->host;
- int error;
- error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+ sysfs_remove_bin_file(&host->shost_classdev.kobj,
&arcmsr_sysfs_message_clear_attr);
- if (error)
- printk(KERN_ERR "arcmsr: free sysfs mu_clear failed\n");
- error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+ sysfs_remove_bin_file(&host->shost_classdev.kobj,
&arcmsr_sysfs_message_write_attr);
- if (error)
- printk(KERN_ERR "arcmsr: free sysfs mu_write failed\n");
- error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+ sysfs_remove_bin_file(&host->shost_classdev.kobj,
&arcmsr_sysfs_message_read_attr);
- if (error)
- printk(KERN_ERR "arcmsr: free sysfss mu_read failed\n");
}

97
debian/patches/features/all/drivers/scsi-arcmsr-3.patch vendored Normal file
View File

@ -0,0 +1,97 @@
# [SCSI] arcmsr: fix up sysfs values
# d67a70aca200f67be42428e74eb3353f20ad1130
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index c96f714..12497da 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -265,7 +265,7 @@ arcmsr_free_sysfs_attr(struct AdapterCon
static ssize_t
arcmsr_attr_host_driver_version(struct class_device *cdev, char *buf) {
return snprintf(buf, PAGE_SIZE,
- "ARCMSR: %s\n",
+ "%s\n",
ARCMSR_DRIVER_VERSION);
}
@@ -274,7 +274,7 @@ arcmsr_attr_host_driver_posted_cmd(struc
struct Scsi_Host *host = class_to_shost(cdev);
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "Current commands posted: %4d\n",
+ "%4d\n",
atomic_read(&acb->ccboutstandingcount));
}
@@ -283,7 +283,7 @@ arcmsr_attr_host_driver_reset(struct cla
struct Scsi_Host *host = class_to_shost(cdev);
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "SCSI Host Resets: %4d\n",
+ "%4d\n",
acb->num_resets);
}
@@ -292,7 +292,7 @@ arcmsr_attr_host_driver_abort(struct cla
struct Scsi_Host *host = class_to_shost(cdev);
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "SCSI Aborts/Timeouts: %4d\n",
+ "%4d\n",
acb->num_aborts);
}
@@ -301,7 +301,7 @@ arcmsr_attr_host_fw_model(struct class_d
struct Scsi_Host *host = class_to_shost(cdev);
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "Adapter Model: %s\n",
+ "%s\n",
acb->firm_model);
}
@@ -311,7 +311,7 @@ arcmsr_attr_host_fw_version(struct class
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "Firmware Version: %s\n",
+ "%s\n",
acb->firm_version);
}
@@ -321,7 +321,7 @@ arcmsr_attr_host_fw_request_len(struct c
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "Reguest Lenth: %4d\n",
+ "%4d\n",
acb->firm_request_len);
}
@@ -331,7 +331,7 @@ arcmsr_attr_host_fw_numbers_queue(struct
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "Numbers of Queue: %4d\n",
+ "%4d\n",
acb->firm_numbers_queue);
}
@@ -341,7 +341,7 @@ arcmsr_attr_host_fw_sdram_size(struct cl
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "SDRAM Size: %4d\n",
+ "%4d\n",
acb->firm_sdram_size);
}
@@ -351,7 +351,7 @@ arcmsr_attr_host_fw_hd_channels(struct c
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
return snprintf(buf, PAGE_SIZE,
- "Hard Disk Channels: %4d\n",
+ "%4d\n",
acb->firm_hd_channels);
}

3
debian/patches/series/2 vendored Normal file
View File

@ -0,0 +1,3 @@
+ features/all/drivers/scsi-arcmsr-1.patch
+ features/all/drivers/scsi-arcmsr-2.patch
+ features/all/drivers/scsi-arcmsr-3.patch