powerpc: struct device - replace bus_id with dev_name(), dev_set_name()

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 85xx / mpc85xx_mds.c

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index b915bf587b3d37232568109262c6b0c4298c86c8..658a36fab3ab8a44c9963d5c6512b8e7d20d437a 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -231,7 +231,7 @@ static void __init mpc85xx_mds_setup_arch(void)
 
 static int __init board_fixups(void)
 {
-       char phy_id[BUS_ID_SIZE];
+       char phy_id[20];
        char *compstrs[2] = {"fsl,gianfar-mdio", "fsl,ucc-mdio"};
        struct device_node *mdio;
        struct resource res;
@@ -241,14 +241,14 @@ static int __init board_fixups(void)
                mdio = of_find_compatible_node(NULL, NULL, compstrs[i]);
 
                of_address_to_resource(mdio, 0, &res);
-               snprintf(phy_id, BUS_ID_SIZE, "%llx:%02x",
+               snprintf(phy_id, sizeof(phy_id), "%llx:%02x",
                        (unsigned long long)res.start, 1);
 
                phy_register_fixup_for_id(phy_id, mpc8568_fixup_125_clock);
                phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups);
 
                /* Register a workaround for errata */
-               snprintf(phy_id, BUS_ID_SIZE, "%llx:%02x",
+               snprintf(phy_id, sizeof(phy_id), "%llx:%02x",
                        (unsigned long long)res.start, 7);
                phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups);