Commit 879a4a66 authored by Paul Cercueil's avatar Paul Cercueil Committed by Greg Kroah-Hartman
Browse files

usb/misc: usb3503: Use pm_ptr() macro 



Use the newly introduced pm_ptr() macro, and mark the suspend/resume
functions __maybe_unused. These functions can then be moved outside the
CONFIG_PM_SUSPEND block, and the compiler can then process them and
detect build failures independently of the config. If unused, they will
simply be discarded by the compiler.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200903112554.34263-8-paul@crapouillou.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7aea2a7d

drivers/usb/misc/usb3503.c

+8 −10
Original line number Diff line number Diff line
@@ -322,8 +322,7 @@ static int usb3503_platform_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int usb3503_suspend(struct usb3503 *hub)

static int __maybe_unused usb3503_suspend(struct usb3503 *hub)

{

	usb3503_switch_mode(hub, USB3503_MODE_STANDBY);

	clk_disable_unprepare(hub->clk);
@@ -331,7 +330,7 @@ static int usb3503_suspend(struct usb3503 *hub) 
	return 0;

}



static int usb3503_resume(struct usb3503 *hub)

static int __maybe_unused usb3503_resume(struct usb3503 *hub)

{

	clk_prepare_enable(hub->clk);

	usb3503_switch_mode(hub, hub->mode);
@@ -339,30 +338,29 @@ static int usb3503_resume(struct usb3503 *hub) 
	return 0;

}



static int usb3503_i2c_suspend(struct device *dev)

static int __maybe_unused usb3503_i2c_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);



	return usb3503_suspend(i2c_get_clientdata(client));

}



static int usb3503_i2c_resume(struct device *dev)

static int __maybe_unused usb3503_i2c_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);



	return usb3503_resume(i2c_get_clientdata(client));

}



static int usb3503_platform_suspend(struct device *dev)

static int __maybe_unused usb3503_platform_suspend(struct device *dev)

{

	return usb3503_suspend(dev_get_drvdata(dev));

}



static int usb3503_platform_resume(struct device *dev)

static int __maybe_unused usb3503_platform_resume(struct device *dev)

{

	return usb3503_resume(dev_get_drvdata(dev));

}

#endif



static SIMPLE_DEV_PM_OPS(usb3503_i2c_pm_ops, usb3503_i2c_suspend,

		usb3503_i2c_resume);
@@ -388,7 +386,7 @@ MODULE_DEVICE_TABLE(of, usb3503_of_match); 
static struct i2c_driver usb3503_i2c_driver = {

	.driver = {

		.name = USB3503_I2C_NAME,

		.pm = &usb3503_i2c_pm_ops,

		.pm = pm_ptr(&usb3503_i2c_pm_ops),

		.of_match_table = of_match_ptr(usb3503_of_match),

	},

	.probe		= usb3503_i2c_probe,
@@ -400,7 +398,7 @@ static struct platform_driver usb3503_platform_driver = { 
	.driver = {

		.name = USB3503_I2C_NAME,

		.of_match_table = of_match_ptr(usb3503_of_match),

		.pm = &usb3503_platform_pm_ops,

		.pm = pm_ptr(&usb3503_platform_pm_ops),

	},

	.probe		= usb3503_platform_probe,

	.remove		= usb3503_platform_remove,

CRA Git | Maintained and supported by SUSTech CRA and CCSE