aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-03-05 05:20:07 -0500
committerKishon Vijay Abraham I <kishon@ti.com>2015-03-10 04:42:27 -0400
commit52a4a72a1ad675b66ec241c0e33ee6e50df63a93 (patch)
treee0ca80d625796a9cda73993f6971a8146cd04894
parent1f9ba767d5918796c7f32724777087f321fde30d (diff)
phy: omap-usb2: Remove unneeded ifdef CONFIG_OF guard and of_match_ptr
if !CONFIG_OF, the probe fails. This is a dt-only driver, so the ifdef CONFIG_OF guard and of_match_ptr are not needed. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-rw-r--r--drivers/phy/phy-omap-usb2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index 6f4aef3db248..18b33cedadba 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -144,7 +144,6 @@ static struct phy_ops ops = {
144 .owner = THIS_MODULE, 144 .owner = THIS_MODULE,
145}; 145};
146 146
147#ifdef CONFIG_OF
148static const struct usb_phy_data omap_usb2_data = { 147static const struct usb_phy_data omap_usb2_data = {
149 .label = "omap_usb2", 148 .label = "omap_usb2",
150 .flags = OMAP_USB2_HAS_START_SRP | OMAP_USB2_HAS_SET_VBUS, 149 .flags = OMAP_USB2_HAS_START_SRP | OMAP_USB2_HAS_SET_VBUS,
@@ -185,7 +184,6 @@ static const struct of_device_id omap_usb2_id_table[] = {
185 {}, 184 {},
186}; 185};
187MODULE_DEVICE_TABLE(of, omap_usb2_id_table); 186MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
188#endif
189 187
190static int omap_usb2_probe(struct platform_device *pdev) 188static int omap_usb2_probe(struct platform_device *pdev)
191{ 189{
@@ -200,7 +198,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
200 const struct of_device_id *of_id; 198 const struct of_device_id *of_id;
201 struct usb_phy_data *phy_data; 199 struct usb_phy_data *phy_data;
202 200
203 of_id = of_match_device(of_match_ptr(omap_usb2_id_table), &pdev->dev); 201 of_id = of_match_device(omap_usb2_id_table, &pdev->dev);
204 202
205 if (!of_id) 203 if (!of_id)
206 return -EINVAL; 204 return -EINVAL;
@@ -377,7 +375,7 @@ static struct platform_driver omap_usb2_driver = {
377 .driver = { 375 .driver = {
378 .name = "omap-usb2", 376 .name = "omap-usb2",
379 .pm = DEV_PM_OPS, 377 .pm = DEV_PM_OPS,
380 .of_match_table = of_match_ptr(omap_usb2_id_table), 378 .of_match_table = omap_usb2_id_table,
381 }, 379 },
382}; 380};
383 381