Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

phy: omap-control: Remove unneeded ifdef CONFIG_OF guard and of_match_ptr

Browse Source 
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>
This commit is contained in:
Axel Lin 2015-03-05 18:18:45 +08:00 committed by Kishon Vijay Abraham I
parent 320c3fcec6
commit 1f9ba767d5
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/phy/phy-omap-control.c
View File

@ -216,7 +216,6 @@ void omap_control_usb_set_mode(struct device *dev,
return; return;
ctrl_phy = dev_get_drvdata(dev); ctrl_phy = dev_get_drvdata(dev);
if (!ctrl_phy) { if (!ctrl_phy) {
dev_err(dev, "Invalid control phy device\n"); dev_err(dev, "Invalid control phy device\n");
return; return;
@ -241,8 +240,6 @@ void omap_control_usb_set_mode(struct device *dev,
} }
EXPORT_SYMBOL_GPL(omap_control_usb_set_mode); EXPORT_SYMBOL_GPL(omap_control_usb_set_mode);
#ifdef CONFIG_OF
static const enum omap_control_phy_type otghs_data = OMAP_CTRL_TYPE_OTGHS; static const enum omap_control_phy_type otghs_data = OMAP_CTRL_TYPE_OTGHS;
static const enum omap_control_phy_type usb2_data = OMAP_CTRL_TYPE_USB2; static const enum omap_control_phy_type usb2_data = OMAP_CTRL_TYPE_USB2;
static const enum omap_control_phy_type pipe3_data = OMAP_CTRL_TYPE_PIPE3; static const enum omap_control_phy_type pipe3_data = OMAP_CTRL_TYPE_PIPE3;
@ -278,8 +275,6 @@ static const struct of_device_id omap_control_phy_id_table[] = {
{}, {},
}; };
MODULE_DEVICE_TABLE(of, omap_control_phy_id_table); MODULE_DEVICE_TABLE(of, omap_control_phy_id_table);
#endif
static int omap_control_phy_probe(struct platform_device *pdev) static int omap_control_phy_probe(struct platform_device *pdev)
{ {
@ -287,8 +282,7 @@ static int omap_control_phy_probe(struct platform_device *pdev)
const struct of_device_id *of_id; const struct of_device_id *of_id;
struct omap_control_phy *control_phy; struct omap_control_phy *control_phy;
of_id = of_match_device(of_match_ptr(omap_control_phy_id_table), of_id = of_match_device(omap_control_phy_id_table, &pdev->dev);
&pdev->dev);
if (!of_id) if (!of_id)
return -EINVAL; return -EINVAL;
@ -344,7 +338,7 @@ static struct platform_driver omap_control_phy_driver = {
.probe = omap_control_phy_probe, .probe = omap_control_phy_probe,
.driver = { .driver = {
.name = "omap-control-phy", .name = "omap-control-phy",
.of_match_table = of_match_ptr(omap_control_phy_id_table), .of_match_table = omap_control_phy_id_table,
}, },
}; };