Re: [PATCH 05/12] tpm/st33zp24: Remove unneeded CONFIG_OF switches

[Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]

On Tue, Feb 09, 2016 at 10:26:54AM +0100, Christophe Ricard wrote:
> DT headers already define NOOP routines when CONFIG_OF is not defined.
> 
> Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>

Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>

Yeah, I do actually read the diffs even though my replies are fairly
monotonic. You can see it from varying times between replies :)
Nothing bad to say. That's all.

/Jarkko

> ---
>  drivers/char/tpm/st33zp24/i2c.c | 9 ---------
>  drivers/char/tpm/st33zp24/spi.c | 9 ---------
>  2 files changed, 18 deletions(-)
> 
> diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
> index 309d276..a05fbd8 100644
> --- a/drivers/char/tpm/st33zp24/i2c.c
> +++ b/drivers/char/tpm/st33zp24/i2c.c
> @@ -108,7 +108,6 @@ static const struct st33zp24_phy_ops i2c_phy_ops = {
>  	.recv = st33zp24_i2c_recv,
>  };
>  
> -#ifdef CONFIG_OF
>  static int st33zp24_i2c_of_request_resources(struct st33zp24_i2c_phy *phy)
>  {
>  	struct device_node *pp;
> @@ -146,12 +145,6 @@ static int st33zp24_i2c_of_request_resources(struct st33zp24_i2c_phy *phy)
>  
>  	return 0;
>  }
> -#else
> -static int st33zp24_i2c_of_request_resources(struct st33zp24_i2c_phy *phy)
> -{
> -	return -ENODEV;
> -}
> -#endif
>  
>  static int st33zp24_i2c_request_resources(struct i2c_client *client,
>  					  struct st33zp24_i2c_phy *phy)
> @@ -245,13 +238,11 @@ static const struct i2c_device_id st33zp24_i2c_id[] = {
>  };
>  MODULE_DEVICE_TABLE(i2c, st33zp24_i2c_id);
>  
> -#ifdef CONFIG_OF
>  static const struct of_device_id of_st33zp24_i2c_match[] = {
>  	{ .compatible = "st,st33zp24-i2c", },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, of_st33zp24_i2c_match);
> -#endif
>  
>  static SIMPLE_DEV_PM_OPS(st33zp24_i2c_ops, st33zp24_pm_suspend,
>  			 st33zp24_pm_resume);
> diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c
> index 41c11c9..0af836a 100644
> --- a/drivers/char/tpm/st33zp24/spi.c
> +++ b/drivers/char/tpm/st33zp24/spi.c
> @@ -221,7 +221,6 @@ static const struct st33zp24_phy_ops spi_phy_ops = {
>  	.recv = st33zp24_spi_recv,
>  };
>  
> -#ifdef CONFIG_OF
>  static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy)
>  {
>  	struct device_node *pp;
> @@ -259,12 +258,6 @@ static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy)
>  
>  	return 0;
>  }
> -#else
> -static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy)
> -{
> -	return -ENODEV;
> -}
> -#endif
>  
>  static int st33zp24_spi_request_resources(struct spi_device *dev,
>  					  struct st33zp24_spi_phy *phy)
> @@ -357,13 +350,11 @@ static const struct spi_device_id st33zp24_spi_id[] = {
>  };
>  MODULE_DEVICE_TABLE(spi, st33zp24_spi_id);
>  
> -#ifdef CONFIG_OF
>  static const struct of_device_id of_st33zp24_spi_match[] = {
>  	{ .compatible = "st,st33zp24-spi", },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, of_st33zp24_spi_match);
> -#endif
>  
>  static SIMPLE_DEV_PM_OPS(st33zp24_spi_ops, st33zp24_pm_suspend,
>  			 st33zp24_pm_resume);
> -- 
> 2.5.0
> 

------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140