On Fri, Oct 23, 2015 at 10:44:19AM +0900, Jaedon Shin wrote: > Add data of device node for phy offset. > > Signed-off-by: Jaedon Shin <jaedon.shin@xxxxxxxxx> > --- > drivers/phy/phy-brcmstb-sata.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/phy/phy-brcmstb-sata.c b/drivers/phy/phy-brcmstb-sata.c > index 0be55dafe9ea..41c7535d706b 100644 > --- a/drivers/phy/phy-brcmstb-sata.c > +++ b/drivers/phy/phy-brcmstb-sata.c > @@ -42,6 +42,7 @@ struct brcm_sata_port { > struct brcm_sata_phy { > struct device *dev; > void __iomem *phy_base; > + u32 phy_offset; > > struct brcm_sata_port phys[MAX_PORTS]; > }; > @@ -65,7 +66,7 @@ static inline void __iomem *brcm_sata_phy_base(struct brcm_sata_port *port) > { > struct brcm_sata_phy *priv = port->phy_priv; > > - return priv->phy_base + (port->portnum * SATA_MDIO_REG_SPACE_SIZE); > + return priv->phy_base + (port->portnum * priv->phy_offset); > } > > static void brcm_sata_mdio_wr(void __iomem *addr, u32 bank, u32 ofs, > @@ -126,7 +127,8 @@ static const struct phy_ops phy_ops_28nm = { > }; > > static const struct of_device_id brcm_sata_phy_of_match[] = { > - { .compatible = "brcm,bcm7445-sata-phy" }, > + { .compatible = "brcm,bcm7445-sata-phy", > + .data = (void *)SATA_MDIO_REG_SPACE_SIZE }, > {}, > }; > MODULE_DEVICE_TABLE(of, brcm_sata_phy_of_match); > @@ -135,6 +137,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct device_node *dn = dev->of_node, *child; > + const struct of_device_id *of_id = NULL; Drop the '= NULL', since it's unncessary. Then the compiler will complain if you ever end up dereferencing it before (properly) initializing it. > struct brcm_sata_phy *priv; > struct resource *res; > struct phy_provider *provider; > @@ -154,6 +157,12 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) > if (IS_ERR(priv->phy_base)) > return PTR_ERR(priv->phy_base); > > + of_id = of_match_node(brcm_sata_phy_of_match, dn); > + if (!of_id) > + return -EINVAL; > + > + priv->phy_offset = (u32)of_id->data; Using my mental compiler, I expect you'll get warnings on 64-bit systems about casting from a pointer to an integer of different size. Using uintptr_t would get around that. And if you wanted to be really clear that you are purposely truncating, maybe an ugly double cast? priv->phy_offset = (u32)(uintptr_t)of_id->data; With that: Reviewed-by: Brian Norris <computersforpeace@xxxxxxxxx> > + > for_each_available_child_of_node(dn, child) { > unsigned int id; > struct brcm_sata_port *port; > -- > 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html