Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alan Stern and committed by
Linus Torvalds
e6da54d8 14828349

+2 -2
-2
drivers/scsi/scsi_priv.h
··· 148 148 /* scsi_pm.c */ 149 149 #ifdef CONFIG_PM_OPS 150 150 extern const struct dev_pm_ops scsi_bus_pm_ops; 151 - #else /* CONFIG_PM_OPS */ 152 - #define scsi_bus_pm_ops (*NULL) 153 151 #endif 154 152 #ifdef CONFIG_PM_RUNTIME 155 153 extern void scsi_autopm_get_target(struct scsi_target *);
+2
drivers/scsi/scsi_sysfs.c
··· 381 381 .name = "scsi", 382 382 .match = scsi_bus_match, 383 383 .uevent = scsi_bus_uevent, 384 + #ifdef CONFIG_PM_OPS 384 385 .pm = &scsi_bus_pm_ops, 386 + #endif 385 387 }; 386 388 EXPORT_SYMBOL_GPL(scsi_bus_type); 387 389