Skip to content

Commit 92fec1c

Browse files
shimodaykishon
authored andcommitted
phy: renesas: rcar-gen3-usb2: Use pdev's device pointer on dev_vdbg()
To implement multiple phy instances in the future, this patch uses pdev's device pointer on dev_vdbg() instead of the phy's device pointer. Signed-off-by: Yoshihiro Shimoda <[email protected]> Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Fabrizio Castro <[email protected]> Signed-off-by: Kishon Vijay Abraham I <[email protected]>
1 parent 233da2c commit 92fec1c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

drivers/phy/renesas/phy-rcar-gen3-usb2.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080

8181
struct rcar_gen3_chan {
8282
void __iomem *base;
83+
struct device *dev; /* platform_device's device */
8384
struct extcon_dev *extcon;
8485
struct phy *phy;
8586
struct regulator *vbus;
@@ -120,7 +121,7 @@ static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host)
120121
void __iomem *usb2_base = ch->base;
121122
u32 val = readl(usb2_base + USB2_COMMCTRL);
122123

123-
dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, host);
124+
dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, host);
124125
if (host)
125126
val &= ~USB2_COMMCTRL_OTG_PERI;
126127
else
@@ -133,7 +134,7 @@ static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm)
133134
void __iomem *usb2_base = ch->base;
134135
u32 val = readl(usb2_base + USB2_LINECTRL1);
135136

136-
dev_vdbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm);
137+
dev_vdbg(ch->dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm);
137138
val &= ~(USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD);
138139
if (dp)
139140
val |= USB2_LINECTRL1_DP_RPD;
@@ -147,7 +148,7 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
147148
void __iomem *usb2_base = ch->base;
148149
u32 val = readl(usb2_base + USB2_ADPCTRL);
149150

150-
dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, vbus);
151+
dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
151152
if (vbus)
152153
val |= USB2_ADPCTRL_DRVVBUS;
153154
else
@@ -407,7 +408,7 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
407408
irqreturn_t ret = IRQ_NONE;
408409

409410
if (status & USB2_OBINT_BITS) {
410-
dev_vdbg(&ch->phy->dev, "%s: %08x\n", __func__, status);
411+
dev_vdbg(ch->dev, "%s: %08x\n", __func__, status);
411412
writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);
412413
rcar_gen3_device_recognition(ch);
413414
ret = IRQ_HANDLED;
@@ -526,6 +527,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
526527

527528
platform_set_drvdata(pdev, channel);
528529
phy_set_drvdata(channel->phy, channel);
530+
channel->dev = dev;
529531

530532
provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
531533
if (IS_ERR(provider)) {

0 commit comments

Comments
 (0)