Commit e6da54d8 authored by Alan Stern's avatar Alan Stern Committed by Linus Torvalds

SCSI: remove fake "address-of" expression

Fake "address-of" expressions that evaluate to NULL generally confuse
readers and can provoke compiler warnings.  This patch (as1411) removes
one such fake expression, using an "#ifdef" in its place.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 14828349
...@@ -148,8 +148,6 @@ static inline void scsi_netlink_exit(void) {} ...@@ -148,8 +148,6 @@ static inline void scsi_netlink_exit(void) {}
/* scsi_pm.c */ /* scsi_pm.c */
#ifdef CONFIG_PM_OPS #ifdef CONFIG_PM_OPS
extern const struct dev_pm_ops scsi_bus_pm_ops; extern const struct dev_pm_ops scsi_bus_pm_ops;
#else /* CONFIG_PM_OPS */
#define scsi_bus_pm_ops (*NULL)
#endif #endif
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM_RUNTIME
extern void scsi_autopm_get_target(struct scsi_target *); extern void scsi_autopm_get_target(struct scsi_target *);
......
...@@ -381,7 +381,9 @@ struct bus_type scsi_bus_type = { ...@@ -381,7 +381,9 @@ struct bus_type scsi_bus_type = {
.name = "scsi", .name = "scsi",
.match = scsi_bus_match, .match = scsi_bus_match,
.uevent = scsi_bus_uevent, .uevent = scsi_bus_uevent,
#ifdef CONFIG_PM_OPS
.pm = &scsi_bus_pm_ops, .pm = &scsi_bus_pm_ops,
#endif
}; };
EXPORT_SYMBOL_GPL(scsi_bus_type); EXPORT_SYMBOL_GPL(scsi_bus_type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment