Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26845f58 authored by Alan Stern's avatar Alan Stern Committed by James Bottomley
Browse files

[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 introduced by:

commit db5bd1e0
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Thu Jun 17 10:36:49 2010 -0400

    [SCSI] convert to the new PM framework
 
using an "#ifdef" in its place.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent aab7a8fd

drivers/scsi/scsi_priv.h

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ static inline void scsi_netlink_exit(void) {} 
/* scsi_pm.c */

#ifdef CONFIG_PM_OPS

extern const struct dev_pm_ops scsi_bus_pm_ops;

#else /* CONFIG_PM_OPS */

#define scsi_bus_pm_ops		(*NULL)

#endif

#ifdef CONFIG_PM_RUNTIME

extern void scsi_autopm_get_target(struct scsi_target *);

drivers/scsi/scsi_sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -381,7 +381,9 @@ struct bus_type scsi_bus_type = { 
        .name		= "scsi",

        .match		= scsi_bus_match,

	.uevent		= scsi_bus_uevent,

#ifdef CONFIG_PM_OPS

	.pm		= &scsi_bus_pm_ops,

#endif

};

EXPORT_SYMBOL_GPL(scsi_bus_type);