aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pcmcia/sym53c500_cs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 18:49:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 18:49:58 -0400
commite80ab411e589e00550e2e6e5a6a02d59cc730357 (patch)
tree870225ff7b5b8d03e82a996963213a4bb9cce248 /drivers/scsi/pcmcia/sym53c500_cs.c
parent529a41e36673b518c9e091f3a8d932b6b9e3c461 (diff)
parentee959b00c335d7780136c5abda37809191fe52c3 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits) SCSI: convert struct class_device to struct device DRM: remove unused dev_class IB: rename "dev" to "srp_dev" in srp_host structure IB: convert struct class_device to struct device memstick: convert struct class_device to struct device driver core: replace remaining __FUNCTION__ occurrences sysfs: refill attribute buffer when reading from offset 0 PM: Remove destroy_suspended_device() Firmware: add iSCSI iBFT Support PM: Remove legacy PM (fix) Kobject: Replace list_for_each() with list_for_each_entry(). SYSFS: Explicitly include required header file slab.h. Driver core: make device_is_registered() work for class devices PM: Convert wakeup flag accessors to inline functions PM: Make wakeup flags available whenever CONFIG_PM is set PM: Fix misuse of wakeup flag accessors in serial core Driver core: Call device_pm_add() after bus_add_device() in device_add() PM: Handle device registrations during suspend/resume block: send disk "change" event for rescan_partitions() sysdev: detect multiple driver registrations ... Fixed trivial conflict in include/linux/memory.h due to semaphore header file change (made irrelevant by the change to mutex).
Diffstat (limited to 'drivers/scsi/pcmcia/sym53c500_cs.c')
-rw-r--r--drivers/scsi/pcmcia/sym53c500_cs.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 3454a5714749..0be232b58ffb 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -632,9 +632,10 @@ SYM53C500_biosparm(struct scsi_device *disk,
632} 632}
633 633
634static ssize_t 634static ssize_t
635SYM53C500_show_pio(struct class_device *cdev, char *buf) 635SYM53C500_show_pio(struct device *dev, struct device_attribute *attr,
636 char *buf)
636{ 637{
637 struct Scsi_Host *SHp = class_to_shost(cdev); 638 struct Scsi_Host *SHp = class_to_shost(dev);
638 struct sym53c500_data *data = 639 struct sym53c500_data *data =
639 (struct sym53c500_data *)SHp->hostdata; 640 (struct sym53c500_data *)SHp->hostdata;
640 641
@@ -642,10 +643,11 @@ SYM53C500_show_pio(struct class_device *cdev, char *buf)
642} 643}
643 644
644static ssize_t 645static ssize_t
645SYM53C500_store_pio(struct class_device *cdev, const char *buf, size_t count) 646SYM53C500_store_pio(struct device *dev, struct device_attribute *attr,
647 const char *buf, size_t count)
646{ 648{
647 int pio; 649 int pio;
648 struct Scsi_Host *SHp = class_to_shost(cdev); 650 struct Scsi_Host *SHp = class_to_shost(dev);
649 struct sym53c500_data *data = 651 struct sym53c500_data *data =
650 (struct sym53c500_data *)SHp->hostdata; 652 (struct sym53c500_data *)SHp->hostdata;
651 653
@@ -662,7 +664,7 @@ SYM53C500_store_pio(struct class_device *cdev, const char *buf, size_t count)
662* SCSI HBA device attributes we want to 664* SCSI HBA device attributes we want to
663* make available via sysfs. 665* make available via sysfs.
664*/ 666*/
665static struct class_device_attribute SYM53C500_pio_attr = { 667static struct device_attribute SYM53C500_pio_attr = {
666 .attr = { 668 .attr = {
667 .name = "fast_pio", 669 .name = "fast_pio",
668 .mode = (S_IRUGO | S_IWUSR), 670 .mode = (S_IRUGO | S_IWUSR),
@@ -671,7 +673,7 @@ static struct class_device_attribute SYM53C500_pio_attr = {
671 .store = SYM53C500_store_pio, 673 .store = SYM53C500_store_pio,
672}; 674};
673 675
674static struct class_device_attribute *SYM53C500_shost_attrs[] = { 676static struct device_attribute *SYM53C500_shost_attrs[] = {
675 &SYM53C500_pio_attr, 677 &SYM53C500_pio_attr,
676 NULL, 678 NULL,
677}; 679};