| Message ID | 1231343521-22171-1-git-send-email-galak@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | a1d8f6015e0fab61cc27204560d54a442181be54 |
| Delegated to: | Kumar Gala |
| Headers | show |
From: Kumar Gala <galak@kernel.crashing.org> Date: Wed, 7 Jan 2009 09:52:01 -0600 > Commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4 went back to using > BUS_ID_SIZE instead of sizeof() as per the larger patch series > that will remove "char bus_id[20]" from struct device. > > Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Applied, thanks Kumar.
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 7fcc3af..1b8deca 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -238,8 +238,8 @@ static int gfar_of_init(struct net_device *dev) goto err_out; } - snprintf(priv->phy_bus_id, BUS_ID_SIZE, PHY_ID_FMT, "0", - fixed_link[0]); + snprintf(priv->phy_bus_id, sizeof(priv->phy_bus_id), + PHY_ID_FMT, "0", fixed_link[0]); } else { phy = of_find_node_by_phandle(*ph); @@ -256,7 +256,7 @@ static int gfar_of_init(struct net_device *dev) of_node_put(mdio); gfar_mdio_bus_name(bus_name, mdio); - snprintf(priv->phy_bus_id, BUS_ID_SIZE, "%s:%02x", + snprintf(priv->phy_bus_id, sizeof(priv->phy_bus_id), "%s:%02x", bus_name, *id); }
Commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4 went back to using BUS_ID_SIZE instead of sizeof() as per the larger patch series that will remove "char bus_id[20]" from struct device. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- drivers/net/gianfar.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)