git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
scsi_sysfs.c
diff --git
a/drivers/scsi/scsi_sysfs.c
b/drivers/scsi/scsi_sysfs.c
index 93652a786a4693dbf27d7f7ab32322d167d0193b..775df00021e4d5591044d8e3272bb435a11cfa6a 100644
(file)
--- a/
drivers/scsi/scsi_sysfs.c
+++ b/
drivers/scsi/scsi_sysfs.c
@@
-27,7
+27,7
@@
#include "scsi_priv.h"
#include "scsi_logging.h"
#include "scsi_priv.h"
#include "scsi_logging.h"
-static struct device_type scsi_dev_type;
+static
const
struct device_type scsi_dev_type;
static const struct {
enum scsi_device_state value;
static const struct {
enum scsi_device_state value;
@@
-554,7
+554,7
@@
static int scsi_bus_uevent(const struct device *dev, struct kobj_uevent_env *env
return 0;
}
return 0;
}
-struct bus_type scsi_bus_type = {
+
const
struct bus_type scsi_bus_type = {
.name = "scsi",
.match = scsi_bus_match,
.uevent = scsi_bus_uevent,
.name = "scsi",
.match = scsi_bus_match,
.uevent = scsi_bus_uevent,
@@
-1636,7
+1636,7
@@
int scsi_sysfs_add_host(struct Scsi_Host *shost)
return 0;
}
return 0;
}
-static struct device_type scsi_dev_type = {
+static
const
struct device_type scsi_dev_type = {
.name = "scsi_device",
.release = scsi_device_dev_release,
.groups = scsi_sdev_attr_groups,
.name = "scsi_device",
.release = scsi_device_dev_release,
.groups = scsi_sdev_attr_groups,