Commit 8d8d218e authored by Christophe RICARD's avatar Christophe RICARD Committed by Jarkko Sakkinen

tpm/st33zp24: Remove unneeded CONFIG_OF switches

DT headers already define NOOP routines when CONFIG_OF is not defined.

[jarkko.sakkinen@linux.intel.com: I tested that the driver compiles
 without warnings and errors with and without CONFIG_OF flag.]
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent b637a366
...@@ -108,7 +108,6 @@ static const struct st33zp24_phy_ops i2c_phy_ops = { ...@@ -108,7 +108,6 @@ static const struct st33zp24_phy_ops i2c_phy_ops = {
.recv = st33zp24_i2c_recv, .recv = st33zp24_i2c_recv,
}; };
#ifdef CONFIG_OF
static int st33zp24_i2c_of_request_resources(struct st33zp24_i2c_phy *phy) static int st33zp24_i2c_of_request_resources(struct st33zp24_i2c_phy *phy)
{ {
struct device_node *pp; struct device_node *pp;
...@@ -146,12 +145,6 @@ static int st33zp24_i2c_of_request_resources(struct st33zp24_i2c_phy *phy) ...@@ -146,12 +145,6 @@ static int st33zp24_i2c_of_request_resources(struct st33zp24_i2c_phy *phy)
return 0; 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, static int st33zp24_i2c_request_resources(struct i2c_client *client,
struct st33zp24_i2c_phy *phy) struct st33zp24_i2c_phy *phy)
...@@ -245,13 +238,11 @@ static const struct i2c_device_id st33zp24_i2c_id[] = { ...@@ -245,13 +238,11 @@ static const struct i2c_device_id st33zp24_i2c_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, st33zp24_i2c_id); MODULE_DEVICE_TABLE(i2c, st33zp24_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id of_st33zp24_i2c_match[] = { static const struct of_device_id of_st33zp24_i2c_match[] = {
{ .compatible = "st,st33zp24-i2c", }, { .compatible = "st,st33zp24-i2c", },
{} {}
}; };
MODULE_DEVICE_TABLE(of, of_st33zp24_i2c_match); MODULE_DEVICE_TABLE(of, of_st33zp24_i2c_match);
#endif
static SIMPLE_DEV_PM_OPS(st33zp24_i2c_ops, st33zp24_pm_suspend, static SIMPLE_DEV_PM_OPS(st33zp24_i2c_ops, st33zp24_pm_suspend,
st33zp24_pm_resume); st33zp24_pm_resume);
......
...@@ -222,7 +222,6 @@ static const struct st33zp24_phy_ops spi_phy_ops = { ...@@ -222,7 +222,6 @@ static const struct st33zp24_phy_ops spi_phy_ops = {
.recv = st33zp24_spi_recv, .recv = st33zp24_spi_recv,
}; };
#ifdef CONFIG_OF
static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy) static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy)
{ {
struct device_node *pp; struct device_node *pp;
...@@ -260,12 +259,6 @@ static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy) ...@@ -260,12 +259,6 @@ static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy)
return 0; 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, static int st33zp24_spi_request_resources(struct spi_device *dev,
struct st33zp24_spi_phy *phy) struct st33zp24_spi_phy *phy)
...@@ -358,13 +351,11 @@ static const struct spi_device_id st33zp24_spi_id[] = { ...@@ -358,13 +351,11 @@ static const struct spi_device_id st33zp24_spi_id[] = {
}; };
MODULE_DEVICE_TABLE(spi, st33zp24_spi_id); MODULE_DEVICE_TABLE(spi, st33zp24_spi_id);
#ifdef CONFIG_OF
static const struct of_device_id of_st33zp24_spi_match[] = { static const struct of_device_id of_st33zp24_spi_match[] = {
{ .compatible = "st,st33zp24-spi", }, { .compatible = "st,st33zp24-spi", },
{} {}
}; };
MODULE_DEVICE_TABLE(of, of_st33zp24_spi_match); MODULE_DEVICE_TABLE(of, of_st33zp24_spi_match);
#endif
static SIMPLE_DEV_PM_OPS(st33zp24_spi_ops, st33zp24_pm_suspend, static SIMPLE_DEV_PM_OPS(st33zp24_spi_ops, st33zp24_pm_suspend,
st33zp24_pm_resume); st33zp24_pm_resume);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment