lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SCSI: remove fake "address-of" expression

Browse Source 
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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Stern
2010-08-05 13:17:10 -04:00
committed by Linus Torvalds
parent 1482834971
commit e6da54d84f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/scsi_priv.h
View File

@@ -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 *);

2
drivers/scsi/scsi_sysfs.c
View File

@@ -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);