Re: [PATCH 2/2] Input: mcs5000_ts - Remove ifdef

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jul 30, 2014 at 01:17:19PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
> 
> We can annonate the suspend/resume functions with '__maybe_unused' and get rid
> of the ifdef, which makes the code smaller and simpler.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>

Applied both, thank you.

> ---
>  drivers/input/touchscreen/mcs5000_ts.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
> index 1fb760c..8b47e1f 100644
> --- a/drivers/input/touchscreen/mcs5000_ts.c
> +++ b/drivers/input/touchscreen/mcs5000_ts.c
> @@ -248,8 +248,7 @@ static int mcs5000_ts_probe(struct i2c_client *client,
>  	return 0;
>  }
>  
> -#ifdef CONFIG_PM_SLEEP
> -static int mcs5000_ts_suspend(struct device *dev)
> +static int __maybe_unused mcs5000_ts_suspend(struct device *dev)
>  {
>  	struct i2c_client *client = to_i2c_client(dev);
>  
> @@ -259,7 +258,7 @@ static int mcs5000_ts_suspend(struct device *dev)
>  	return 0;
>  }
>  
> -static int mcs5000_ts_resume(struct device *dev)
> +static int __maybe_unused mcs5000_ts_resume(struct device *dev)
>  {
>  	struct i2c_client *client = to_i2c_client(dev);
>  	struct mcs5000_ts_data *data = i2c_get_clientdata(client);
> @@ -269,7 +268,6 @@ static int mcs5000_ts_resume(struct device *dev)
>  
>  	return 0;
>  }
> -#endif
>  
>  static SIMPLE_DEV_PM_OPS(mcs5000_ts_pm, mcs5000_ts_suspend, mcs5000_ts_resume);
>  
> -- 
> 1.9.1
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux