Commit 9135177f authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz

nfc: st21nfca: Remove unneeded CONFIG_OF switches

DT headers already define NOOP routines when CONFIG_OF is not
defined.
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 1faa65b0
...@@ -509,7 +509,6 @@ static struct nfc_phy_ops i2c_phy_ops = { ...@@ -509,7 +509,6 @@ static struct nfc_phy_ops i2c_phy_ops = {
.disable = st21nfca_hci_i2c_disable, .disable = st21nfca_hci_i2c_disable,
}; };
#ifdef CONFIG_OF
static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client) static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
{ {
struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client); struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client);
...@@ -547,12 +546,6 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client) ...@@ -547,12 +546,6 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
return 0; return 0;
} }
#else
static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
{
return -ENODEV;
}
#endif
static int st21nfca_hci_i2c_request_resources(struct i2c_client *client) static int st21nfca_hci_i2c_request_resources(struct i2c_client *client)
{ {
...@@ -670,14 +663,12 @@ static int st21nfca_hci_i2c_remove(struct i2c_client *client) ...@@ -670,14 +663,12 @@ static int st21nfca_hci_i2c_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_OF
static const struct of_device_id of_st21nfca_i2c_match[] = { static const struct of_device_id of_st21nfca_i2c_match[] = {
{ .compatible = "st,st21nfca-i2c", }, { .compatible = "st,st21nfca-i2c", },
{ .compatible = "st,st21nfca_i2c", }, { .compatible = "st,st21nfca_i2c", },
{} {}
}; };
MODULE_DEVICE_TABLE(of, of_st21nfca_i2c_match); MODULE_DEVICE_TABLE(of, of_st21nfca_i2c_match);
#endif
static struct i2c_driver st21nfca_hci_i2c_driver = { static struct i2c_driver st21nfca_hci_i2c_driver = {
.driver = { .driver = {
......
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