git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
scsi
/
scsi_sysfs.c
diff --git
a/drivers/scsi/scsi_sysfs.c
b/drivers/scsi/scsi_sysfs.c
index
fceb6f9
..
a8855d3
100644
(file)
--- a/
drivers/scsi/scsi_sysfs.c
+++ b/
drivers/scsi/scsi_sysfs.c
@@
-12,9
+12,10
@@
#include <linux/blkdev.h>
#include <linux/device.h>
#include <linux/blkdev.h>
#include <linux/device.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport.h>
-#include "scsi.h"
#include "scsi_priv.h"
#include "scsi_logging.h"
#include "scsi_priv.h"
#include "scsi_logging.h"
@@
-99,7
+100,7
@@
show_##name (struct class_device *class_dev, char *buf) \
*/
#define shost_rd_attr2(name, field, format_string) \
shost_show_function(name, field, format_string) \
*/
#define shost_rd_attr2(name, field, format_string) \
shost_show_function(name, field, format_string) \
-static CLASS_DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
+static CLASS_DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
;
#define shost_rd_attr(field, format_string) \
shost_rd_attr2(field, field, format_string)
#define shost_rd_attr(field, format_string) \
shost_rd_attr2(field, field, format_string)
@@
-228,8
+229,8
@@
sdev_show_##field (struct device *dev, char *buf) \
* read only field.
*/
#define sdev_rd_attr(field, format_string) \
* read only field.
*/
#define sdev_rd_attr(field, format_string) \
- sdev_show_function(field, format_string)
\
-static DEVICE_ATTR(field, S_IRUGO, sdev_show_##field, NULL)
+ sdev_show_function(field, format_string) \
+static DEVICE_ATTR(field, S_IRUGO, sdev_show_##field, NULL)
;
/*
/*
@@
-247,7
+248,7
@@
sdev_store_##field (struct device *dev, const char *buf, size_t count) \
snscanf (buf, 20, format_string, &sdev->field); \
return count; \
} \
snscanf (buf, 20, format_string, &sdev->field); \
return count; \
} \
-static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##field)
+static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##field)
;
/* Currently we don't export bit fields, but we might in future,
* so leave this code in */
/* Currently we don't export bit fields, but we might in future,
* so leave this code in */
@@
-272,7
+273,7
@@
sdev_store_##field (struct device *dev, const char *buf, size_t count) \
} \
return ret; \
} \
} \
return ret; \
} \
-static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##field)
+static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##field)
;
/*
* scsi_sdev_check_buf_bit: return 0 if buf is "0", return 1 if buf is "1",
/*
* scsi_sdev_check_buf_bit: return 0 if buf is "0", return 1 if buf is "1",
@@
-320,7
+321,7
@@
sdev_store_timeout (struct device *dev, const char *buf, size_t count)
sdev->timeout = timeout * HZ;
return count;
}
sdev->timeout = timeout * HZ;
return count;
}
-static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout)
+static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout)
;
static ssize_t
store_rescan_field (struct device *dev, const char *buf, size_t count)
static ssize_t
store_rescan_field (struct device *dev, const char *buf, size_t count)
@@
-328,7
+329,7
@@
store_rescan_field (struct device *dev, const char *buf, size_t count)
scsi_rescan_device(dev);
return count;
}
scsi_rescan_device(dev);
return count;
}
-static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field)
+static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field)
;
static ssize_t sdev_store_delete(struct device *dev, const char *buf,
size_t count)
static ssize_t sdev_store_delete(struct device *dev, const char *buf,
size_t count)
@@
-624,4
+625,4
@@
int scsi_sysfs_add_host(struct Scsi_Host *shost)
/* A blank transport template that is used in drivers that don't
* yet implement Transport Attributes */
/* A blank transport template that is used in drivers that don't
* yet implement Transport Attributes */
-struct scsi_transport_template blank_transport_template = {
0
, };
+struct scsi_transport_template blank_transport_template = {
NULL
, };