From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <kishon@ti.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 06/20] phy: omap-usb2: Remove unneeded ifdef CONFIG_OF guard and of_match_ptr
Date: Fri, 3 Apr 2015 21:56:34 +0530 [thread overview]
Message-ID: <1428078408-13344-7-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1428078408-13344-1-git-send-email-kishon@ti.com>
From: Axel Lin <axel.lin@ingics.com>
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>
---
drivers/phy/phy-omap-usb2.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index 6f4aef3..18b33ce 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -144,7 +144,6 @@ static struct phy_ops ops = {
.owner = THIS_MODULE,
};
-#ifdef CONFIG_OF
static const struct usb_phy_data omap_usb2_data = {
.label = "omap_usb2",
.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[] = {
{},
};
MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
-#endif
static int omap_usb2_probe(struct platform_device *pdev)
{
@@ -200,7 +198,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
const struct of_device_id *of_id;
struct usb_phy_data *phy_data;
- of_id = of_match_device(of_match_ptr(omap_usb2_id_table), &pdev->dev);
+ of_id = of_match_device(omap_usb2_id_table, &pdev->dev);
if (!of_id)
return -EINVAL;
@@ -377,7 +375,7 @@ static struct platform_driver omap_usb2_driver = {
.driver = {
.name = "omap-usb2",
.pm = DEV_PM_OPS,
- .of_match_table = of_match_ptr(omap_usb2_id_table),
+ .of_match_table = omap_usb2_id_table,
},
};
--
1.7.9.5
next prev parent reply other threads:[~2015-04-03 16:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-03 16:26 [GIT PULL 00/20] phy: for 4.1 merge window Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 01/20] phy: berlin-usb: Use PTR_ERR_OR_ZERO Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 02/20] phy: xgene: " Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 03/20] phy: berlin-sata: Use devm_kcalloc at appropriate place Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 04/20] phy: miphy28lp: Use PTR_ERR_OR_ZERO Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 05/20] phy: omap-control: Remove unneeded ifdef CONFIG_OF guard and of_match_ptr Kishon Vijay Abraham I
2015-04-03 16:26 ` Kishon Vijay Abraham I [this message]
2015-04-03 16:26 ` [PATCH 07/20] phy: ti-pipe3: " Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 08/20] phy: berlin-usb: Set drvdata for phy and use it Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 09/20] phy: stih41x-usb: Fixup stih41x_usb_phy_power_on failure path Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 10/20] phy: qcom-ufs: Catch devm_phy_create failure in ufs_qcom_phy_generic_probe Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 11/20] phy: exynos5-usbdrd: Add to support for Exynos5433 SoC Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 12/20] phy: samsung_usb2: Fixup samsung_usb2_phy_power_on/off paths Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 13/20] phy: qcom-ufs: Fix build error due to missing export symbols Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 14/20] phy: qcom-ufs: Don't return error if fail to get optional resource Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 15/20] phy: Add a driver for dm816x USB PHY Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 16/20] phy: Add driver to support individual USB PHYs on sun9i Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 17/20] phy: miphy365x: Use the generic phy type constants in dt-bindings/phy/phy.h Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 18/20] phy: spear1310-miphy: Return proper error for spear1310_miphy_xlate Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 19/20] phy: spear1340-miphy: Return proper error for spear1340_miphy_xlate Kishon Vijay Abraham I
2015-04-03 16:26 ` [PATCH 20/20] MAINTAINERS: Add phy-miphy28lp.c and phy-miphy365x.c to ARCH/STI architecture Kishon Vijay Abraham I
2015-04-08 5:50 ` [GIT PULL 00/20] phy: for 4.1 merge window Kishon Vijay Abraham I
2015-04-10 11:50 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428078408-13344-7-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox