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

Commit b409214c authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: remove fake "address-of" expressions 



Fake "address-of" expressions that evaluate to NULL generally confuse
readers and can provoke compiler warnings.  This patch (as1412)
removes three such fake expressions, using "#ifdef"s in their place.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b3e67044

drivers/usb/core/driver.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1791,15 +1791,13 @@ static const struct dev_pm_ops usb_bus_pm_ops = { 
	.runtime_idle =		usb_runtime_idle,

	.runtime_idle =		usb_runtime_idle,

};

};





#else



#define usb_bus_pm_ops	(*(const struct dev_pm_ops *) NULL)



#endif /* CONFIG_USB_SUSPEND */

#endif /* CONFIG_USB_SUSPEND */





struct bus_type usb_bus_type = {

struct bus_type usb_bus_type = {

	.name =		"usb",

	.name =		"usb",

	.match =	usb_device_match,

	.match =	usb_device_match,

	.uevent =	usb_uevent,

	.uevent =	usb_uevent,

#ifdef CONFIG_USB_SUSPEND

	.pm =		&usb_bus_pm_ops,

	.pm =		&usb_bus_pm_ops,

#endif

};
 
};

drivers/usb/core/usb.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -317,10 +317,6 @@ static const struct dev_pm_ops usb_device_pm_ops = { 
	.restore =	usb_dev_restore,

	.restore =	usb_dev_restore,

};

};





#else



#define usb_device_pm_ops	(*(struct dev_pm_ops *) NULL)



#endif	/* CONFIG_PM */

#endif	/* CONFIG_PM */
@@ -338,7 +334,9 @@ struct device_type usb_device_type = { 
	.release =	usb_release_dev,

	.release =	usb_release_dev,

	.uevent =	usb_dev_uevent,

	.uevent =	usb_dev_uevent,

	.devnode = 	usb_devnode,

	.devnode = 	usb_devnode,

#ifdef CONFIG_PM

	.pm =		&usb_device_pm_ops,

	.pm =		&usb_device_pm_ops,

#endif

};

};

drivers/usb/host/uhci-debug.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 




#include "uhci-hcd.h"

#include "uhci-hcd.h"





#define uhci_debug_operations (* (const struct file_operations *) NULL)

static struct dentry *uhci_debugfs_root;

static struct dentry *uhci_debugfs_root;





#ifdef DEBUG

#ifdef DEBUG
@@ -558,7 +557,6 @@ static int uhci_debug_release(struct inode *inode, struct file *file) 
	return 0;

	return 0;

}

}





#undef uhci_debug_operations

static const struct file_operations uhci_debug_operations = {

static const struct file_operations uhci_debug_operations = {

	.owner =	THIS_MODULE,

	.owner =	THIS_MODULE,

	.open =		uhci_debug_open,

	.open =		uhci_debug_open,
@@ -566,6 +564,7 @@ static const struct file_operations uhci_debug_operations = { 
	.read =		uhci_debug_read,

	.read =		uhci_debug_read,

	.release =	uhci_debug_release,

	.release =	uhci_debug_release,

};

};

#define UHCI_DEBUG_OPS





#endif	/* CONFIG_DEBUG_FS */

#endif	/* CONFIG_DEBUG_FS */

drivers/usb/host/uhci-hcd.c

+10 −13
Original line number Original line Diff line number Diff line
@@ -597,7 +597,7 @@ static int uhci_start(struct usb_hcd *hcd) 
	struct uhci_hcd *uhci = hcd_to_uhci(hcd);

	struct uhci_hcd *uhci = hcd_to_uhci(hcd);

	int retval = -EBUSY;

	int retval = -EBUSY;

	int i;

	int i;

	struct dentry *dentry;

	struct dentry __maybe_unused *dentry;





	hcd->uses_new_polling = 1;

	hcd->uses_new_polling = 1;
@@ -607,18 +607,16 @@ static int uhci_start(struct usb_hcd *hcd) 
	INIT_LIST_HEAD(&uhci->idle_qh_list);

	INIT_LIST_HEAD(&uhci->idle_qh_list);

	init_waitqueue_head(&uhci->waitqh);

	init_waitqueue_head(&uhci->waitqh);





	if (DEBUG_CONFIGURED) {

#ifdef UHCI_DEBUG_OPS

	dentry = debugfs_create_file(hcd->self.bus_name,

	dentry = debugfs_create_file(hcd->self.bus_name,

			S_IFREG|S_IRUGO|S_IWUSR, uhci_debugfs_root,

			S_IFREG|S_IRUGO|S_IWUSR, uhci_debugfs_root,

			uhci, &uhci_debug_operations);

			uhci, &uhci_debug_operations);

	if (!dentry) {

	if (!dentry) {

			dev_err(uhci_dev(uhci), "couldn't create uhci "

		dev_err(uhci_dev(uhci), "couldn't create uhci debugfs entry\n");

					"debugfs entry\n");

		return -ENOMEM;

			retval = -ENOMEM;

			goto err_create_debug_entry;

	}

	}

	uhci->dentry = dentry;

	uhci->dentry = dentry;

	}

#endif





	uhci->frame = dma_alloc_coherent(uhci_dev(uhci),

	uhci->frame = dma_alloc_coherent(uhci_dev(uhci),

			UHCI_NUMFRAMES * sizeof(*uhci->frame),

			UHCI_NUMFRAMES * sizeof(*uhci->frame),
@@ -732,7 +730,6 @@ static int uhci_start(struct usb_hcd *hcd) 
err_alloc_frame:

err_alloc_frame:

	debugfs_remove(uhci->dentry);

	debugfs_remove(uhci->dentry);





err_create_debug_entry:

	return retval;

	return retval;

}

}