diff options
author | Yani Ioannou <yani.ioannou@gmail.com> | 2005-05-17 06:43:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 18:15:35 -0400 |
commit | 10523b3b82456e416cbaffcc24ea2246980aa746 (patch) | |
tree | fab3ac16bffb04cc25683e83a583b1cae3f0d450 /drivers/scsi/megaraid | |
parent | 3fd3c0a5f53a0f9d8987b90acbd84f7dd8ef606e (diff) |
[PATCH] Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_udc.c: update device attribute callbacks
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 057ed45b54b2..cbe430246276 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -124,7 +124,7 @@ static irqreturn_t megaraid_isr(int, void *, struct pt_regs *); | |||
124 | static void megaraid_mbox_dpc(unsigned long); | 124 | static void megaraid_mbox_dpc(unsigned long); |
125 | 125 | ||
126 | static ssize_t megaraid_sysfs_show_app_hndl(struct class_device *, char *); | 126 | static ssize_t megaraid_sysfs_show_app_hndl(struct class_device *, char *); |
127 | static ssize_t megaraid_sysfs_show_ldnum(struct device *, char *); | 127 | static ssize_t megaraid_sysfs_show_ldnum(struct device *, struct device_attribute *attr, char *); |
128 | 128 | ||
129 | static int megaraid_cmm_register(adapter_t *); | 129 | static int megaraid_cmm_register(adapter_t *); |
130 | static int megaraid_cmm_unregister(adapter_t *); | 130 | static int megaraid_cmm_unregister(adapter_t *); |
@@ -4145,7 +4145,7 @@ megaraid_sysfs_show_app_hndl(struct class_device *cdev, char *buf) | |||
4145 | * @param buf : buffer to send data to | 4145 | * @param buf : buffer to send data to |
4146 | */ | 4146 | */ |
4147 | static ssize_t | 4147 | static ssize_t |
4148 | megaraid_sysfs_show_ldnum(struct device *dev, char *buf) | 4148 | megaraid_sysfs_show_ldnum(struct device *dev, struct device_attribute *attr, char *buf) |
4149 | { | 4149 | { |
4150 | struct scsi_device *sdev = to_scsi_device(dev); | 4150 | struct scsi_device *sdev = to_scsi_device(dev); |
4151 | adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host); | 4151 | adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host); |