Merge branch 'clk-ti' into clk-next

[linux-2.6-block.git] / drivers / clk / ti / clkctrl.c

diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 853a5e650ff7ec3ac1db394df044674c231cd53b..469f560ae1cf7c779a75d4d18dc30e0883e1d340 100644 (file)
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -260,11 +260,11 @@ _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
        int ret = 0;
 
        if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-               init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d",
-                                     node->parent->name, node->name, offset,
+               init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
+                                     node->parent, node, offset,
                                      bit);
        else
-               init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d", node->name,
+               init.name = kasprintf(GFP_KERNEL, "%pOFn:%04x:%d", node,
                                      offset, bit);
        clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
        if (!init.name || !clkctrl_clk) {
@@ -589,12 +589,12 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
                if (reg_data->flags & CLKF_SET_RATE_PARENT)
                        init.flags |= CLK_SET_RATE_PARENT;
                if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-                       init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d",
-                                             node->parent->name, node->name,
+                       init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
+                                             node->parent, node,
                                              reg_data->offset, 0);
                else
-                       init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d",
-                                             node->name, reg_data->offset, 0);
+                       init.name = kasprintf(GFP_KERNEL, "%pOFn:%04x:%d",
+                                             node, reg_data->offset, 0);
                clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
                if (!init.name || !clkctrl_clk)
                        goto cleanup;