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

Commit d9ab7716 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Rafael J. Wysocki
Browse files

Driver Core: Make PM operations a const pointer 



They are not supposed to be modified by drivers, so make them const.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 511647ff

drivers/base/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static int platform_pm_restore_noirq(struct device *dev) 


#endif /* !CONFIG_HIBERNATION */



static struct dev_pm_ops platform_dev_pm_ops = {

static const struct dev_pm_ops platform_dev_pm_ops = {

	.prepare = platform_pm_prepare,

	.complete = platform_pm_complete,

	.suspend = platform_pm_suspend,

drivers/base/power/main.c

+5 −3
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ void device_pm_move_last(struct device *dev) 
 *	@ops:	PM operations to choose from.

 *	@state:	PM transition of the system being carried out.

 */

static int pm_op(struct device *dev, struct dev_pm_ops *ops,

static int pm_op(struct device *dev,

		 const struct dev_pm_ops *ops,

		 pm_message_t state)

{

	int error = 0;
@@ -220,7 +221,8 @@ static int pm_op(struct device *dev, struct dev_pm_ops *ops, 
 *	The operation is executed with interrupts disabled by the only remaining

 *	functional CPU in the system.

 */

static int pm_noirq_op(struct device *dev, struct dev_pm_ops *ops,

static int pm_noirq_op(struct device *dev,

			const struct dev_pm_ops *ops,

			pm_message_t state)

{

	int error = 0;

drivers/pci/pci-driver.c

+8 −8
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static void pci_pm_complete(struct device *dev) 
static int pci_pm_suspend(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;



	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_suspend(dev, PMSG_SUSPEND);
@@ -613,7 +613,7 @@ static int pci_pm_suspend(struct device *dev) 
static int pci_pm_suspend_noirq(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;



	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_suspend_late(dev, PMSG_SUSPEND);
@@ -672,7 +672,7 @@ static int pci_pm_resume_noirq(struct device *dev) 
static int pci_pm_resume(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	int error = 0;



	/*
@@ -711,7 +711,7 @@ static int pci_pm_resume(struct device *dev) 
static int pci_pm_freeze(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;



	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_suspend(dev, PMSG_FREEZE);
@@ -780,7 +780,7 @@ static int pci_pm_thaw_noirq(struct device *dev) 
static int pci_pm_thaw(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	int error = 0;



	if (pci_has_legacy_pm_support(pci_dev))
@@ -799,7 +799,7 @@ static int pci_pm_thaw(struct device *dev) 
static int pci_pm_poweroff(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;



	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_suspend(dev, PMSG_HIBERNATE);
@@ -872,7 +872,7 @@ static int pci_pm_restore_noirq(struct device *dev) 
static int pci_pm_restore(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	int error = 0;



	/*
@@ -910,7 +910,7 @@ static int pci_pm_restore(struct device *dev) 


#endif /* !CONFIG_HIBERNATION */



struct dev_pm_ops pci_dev_pm_ops = {

const struct dev_pm_ops pci_dev_pm_ops = {

	.prepare = pci_pm_prepare,

	.complete = pci_pm_complete,

	.suspend = pci_pm_suspend,

include/linux/device.h

+5 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct bus_type { 
	int (*suspend)(struct device *dev, pm_message_t state);

	int (*resume)(struct device *dev);



	struct dev_pm_ops *pm;

	const struct dev_pm_ops *pm;



	struct bus_type_private *p;

};
@@ -132,7 +132,7 @@ struct device_driver { 
	int (*resume) (struct device *dev);

	struct attribute_group **groups;



	struct dev_pm_ops *pm;

	const struct dev_pm_ops *pm;



	struct driver_private *p;

};
@@ -200,7 +200,8 @@ struct class { 
	int (*suspend)(struct device *dev, pm_message_t state);

	int (*resume)(struct device *dev);



	struct dev_pm_ops *pm;

	const struct dev_pm_ops *pm;



	struct class_private *p;

};
@@ -291,7 +292,7 @@ struct device_type { 
	char *(*nodename)(struct device *dev);

	void (*release)(struct device *dev);



	struct dev_pm_ops *pm;

	const struct dev_pm_ops *pm;

};



/* interface for exporting device attributes */