Skip to contentSkip to conversation

phy: berlin-usb: rename table copied from SATA PHY

PATCH In review Thomas Hebb 2 participants 3 messages Jul 2, 2015 – Jul 3, 2015 Generic PHY framework

lore
Share & tools
lore

Thomas Hebb

author
#0 lore raw

PATCH 4/4 phy: berlin-usb: rename table copied from SATA PHY

We're not in a SATA PHY driver, so the of_match table shouldn't have "sata" in its name.

Signed-off-by Thomas Hebb <[email protected]>
Suggested-by Sebastian Hesselbarth <[email protected]>
---
 drivers/phy/phy-berlin-usb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/phy/phy-berlin-usb.c +4 -4
index 335e06d..7143cd3 100644
@@ -152,7 +152,7 @@ static struct phy_ops phy_berlin_usb_ops = {
 	.owner		= THIS_MODULE,
 };
 
-static const struct of_device_id phy_berlin_sata_of_match[] = {
+static const struct of_device_id phy_berlin_usb_of_match[] = {
 	{
 		.compatible = "marvell,berlin2-usb-phy",
 		.data = &phy_berlin_pll_dividers[0],

@@ -163,12 +163,12 @@ static const struct of_device_id phy_berlin_sata_of_match[] = {
 	},
 	{ },
 };
-MODULE_DEVICE_TABLE(of, phy_berlin_sata_of_match);
+MODULE_DEVICE_TABLE(of, phy_berlin_usb_of_match);
 
 static int phy_berlin_usb_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match =
-		of_match_device(phy_berlin_sata_of_match, &pdev->dev);
+		of_match_device(phy_berlin_usb_of_match, &pdev->dev);
 	struct phy_berlin_usb_priv *priv;
 	struct resource *res;
 	struct phy *phy;

@@ -208,7 +208,7 @@ static struct platform_driver phy_berlin_usb_driver = {
 	.driver	= {
 		.name		= "phy-berlin-usb",
 		.owner		= THIS_MODULE,
-		.of_match_table	= phy_berlin_sata_of_match,
+		.of_match_table	= phy_berlin_usb_of_match,
 	 },
 };
 module_platform_driver(phy_berlin_usb_driver);
Signature · 1 line
2.4.4
#1 lore raw

Thomas,

Quoted 2 lines · Thomas Hebb

We're not in a SATA PHY driver, so the of_match table shouldn't have "sata" in its name.

There is already a patch fixing this (which was sent last week):

https://lkml.org/lkml/2015/6/24/103

You can drop this one from the series.

Antoine

Quoted 47 lines
Signed-off-by Thomas Hebb <[email protected]>
Suggested-by Sebastian Hesselbarth <[email protected]>
---
 drivers/phy/phy-berlin-usb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/phy/phy-berlin-usb.c +4 -4
index 335e06d..7143cd3 100644
@@ -152,7 +152,7 @@ static struct phy_ops phy_berlin_usb_ops = {
 	.owner		= THIS_MODULE,
 };
 
-static const struct of_device_id phy_berlin_sata_of_match[] = {
+static const struct of_device_id phy_berlin_usb_of_match[] = {
 	{
 		.compatible = "marvell,berlin2-usb-phy",
 		.data = &phy_berlin_pll_dividers[0],

@@ -163,12 +163,12 @@ static const struct of_device_id phy_berlin_sata_of_match[] = {
 	},
 	{ },
 };
-MODULE_DEVICE_TABLE(of, phy_berlin_sata_of_match);
+MODULE_DEVICE_TABLE(of, phy_berlin_usb_of_match);
 
 static int phy_berlin_usb_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match =
-		of_match_device(phy_berlin_sata_of_match, &pdev->dev);
+		of_match_device(phy_berlin_usb_of_match, &pdev->dev);
 	struct phy_berlin_usb_priv *priv;
 	struct resource *res;
 	struct phy *phy;

@@ -208,7 +208,7 @@ static struct platform_driver phy_berlin_usb_driver = {
 	.driver	= {
 		.name		= "phy-berlin-usb",
 		.owner		= THIS_MODULE,
-		.of_match_table	= phy_berlin_sata_of_match,
+		.of_match_table	= phy_berlin_usb_of_match,
 	 },
 };
 module_platform_driver(phy_berlin_usb_driver);
Signature · 1 line
2.4.4
Signature · 3 lines
Antoine T?nart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw
Quoted 6 lines · Antoine Tenart

Thomas,

Quoted 2 lines · Thomas Hebb

We're not in a SATA PHY driver, so the of_match table shouldn't have "sata" in its name.

Quoted 7 lines

There is already a patch fixing this (which was sent last week):

https://lkml.org/lkml/2015/6/24/103

You can drop this one from the series.

Antoine

Acknowledged. Sorry for the noise.

-Tom

Quoted 48 lines
Quoted 47 lines
Signed-off-by Thomas Hebb <[email protected]>
Suggested-by Sebastian Hesselbarth <[email protected]>
---
 drivers/phy/phy-berlin-usb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/phy/phy-berlin-usb.c +4 -4
index 335e06d..7143cd3 100644
@@ -152,7 +152,7 @@ static struct phy_ops phy_berlin_usb_ops = {
 	.owner		= THIS_MODULE,
 };
 
-static const struct of_device_id phy_berlin_sata_of_match[] = {
+static const struct of_device_id phy_berlin_usb_of_match[] = {
 	{
 		.compatible = "marvell,berlin2-usb-phy",
 		.data = &phy_berlin_pll_dividers[0],

@@ -163,12 +163,12 @@ static const struct of_device_id phy_berlin_sata_of_match[] = {
 	},
 	{ },
 };
-MODULE_DEVICE_TABLE(of, phy_berlin_sata_of_match);
+MODULE_DEVICE_TABLE(of, phy_berlin_usb_of_match);
 
 static int phy_berlin_usb_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match =
-		of_match_device(phy_berlin_sata_of_match, &pdev->dev);
+		of_match_device(phy_berlin_usb_of_match, &pdev->dev);
 	struct phy_berlin_usb_priv *priv;
 	struct resource *res;
 	struct phy *phy;

@@ -208,7 +208,7 @@ static struct platform_driver phy_berlin_usb_driver = {
 	.driver	= {
 		.name		= "phy-berlin-usb",
 		.owner		= THIS_MODULE,
-		.of_match_table	= phy_berlin_sata_of_match,
+		.of_match_table	= phy_berlin_usb_of_match,
 	 },
 };
 module_platform_driver(phy_berlin_usb_driver);
Signature · 1 line
2.4.4