diff options
Diffstat (limited to 'drivers/clk/clk-xgene.c')
| -rw-r--r-- | drivers/clk/clk-xgene.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/clk/clk-xgene.c b/drivers/clk/clk-xgene.c index bc37030e38ba..4c75821a3933 100644 --- a/drivers/clk/clk-xgene.c +++ b/drivers/clk/clk-xgene.c | |||
| @@ -192,7 +192,7 @@ static void xgene_pllclk_init(struct device_node *np, enum xgene_pll_type pll_ty | |||
| 192 | 192 | ||
| 193 | reg = of_iomap(np, 0); | 193 | reg = of_iomap(np, 0); |
| 194 | if (reg == NULL) { | 194 | if (reg == NULL) { |
| 195 | pr_err("Unable to map CSR register for %s\n", np->full_name); | 195 | pr_err("Unable to map CSR register for %pOF\n", np); |
| 196 | return; | 196 | return; |
| 197 | } | 197 | } |
| 198 | of_property_read_string(np, "clock-output-names", &clk_name); | 198 | of_property_read_string(np, "clock-output-names", &clk_name); |
| @@ -409,12 +409,12 @@ static void xgene_pmdclk_init(struct device_node *np) | |||
| 409 | /* Parse the DTS register for resource */ | 409 | /* Parse the DTS register for resource */ |
| 410 | rc = of_address_to_resource(np, 0, &res); | 410 | rc = of_address_to_resource(np, 0, &res); |
| 411 | if (rc != 0) { | 411 | if (rc != 0) { |
| 412 | pr_err("no DTS register for %s\n", np->full_name); | 412 | pr_err("no DTS register for %pOF\n", np); |
| 413 | return; | 413 | return; |
| 414 | } | 414 | } |
| 415 | csr_reg = of_iomap(np, 0); | 415 | csr_reg = of_iomap(np, 0); |
| 416 | if (!csr_reg) { | 416 | if (!csr_reg) { |
| 417 | pr_err("Unable to map resource for %s\n", np->full_name); | 417 | pr_err("Unable to map resource for %pOF\n", np); |
| 418 | return; | 418 | return; |
| 419 | } | 419 | } |
| 420 | of_property_read_string(np, "clock-output-names", &clk_name); | 420 | of_property_read_string(np, "clock-output-names", &clk_name); |
| @@ -703,16 +703,14 @@ static void __init xgene_devclk_init(struct device_node *np) | |||
| 703 | rc = of_address_to_resource(np, i, &res); | 703 | rc = of_address_to_resource(np, i, &res); |
| 704 | if (rc != 0) { | 704 | if (rc != 0) { |
| 705 | if (i == 0) { | 705 | if (i == 0) { |
| 706 | pr_err("no DTS register for %s\n", | 706 | pr_err("no DTS register for %pOF\n", np); |
| 707 | np->full_name); | ||
| 708 | return; | 707 | return; |
| 709 | } | 708 | } |
| 710 | break; | 709 | break; |
| 711 | } | 710 | } |
| 712 | map_res = of_iomap(np, i); | 711 | map_res = of_iomap(np, i); |
| 713 | if (map_res == NULL) { | 712 | if (map_res == NULL) { |
| 714 | pr_err("Unable to map resource %d for %s\n", | 713 | pr_err("Unable to map resource %d for %pOF\n", i, np); |
| 715 | i, np->full_name); | ||
| 716 | goto err; | 714 | goto err; |
| 717 | } | 715 | } |
| 718 | if (strcmp(res.name, "div-reg") == 0) | 716 | if (strcmp(res.name, "div-reg") == 0) |
| @@ -747,8 +745,7 @@ static void __init xgene_devclk_init(struct device_node *np) | |||
| 747 | pr_debug("Add %s clock\n", clk_name); | 745 | pr_debug("Add %s clock\n", clk_name); |
| 748 | rc = of_clk_add_provider(np, of_clk_src_simple_get, clk); | 746 | rc = of_clk_add_provider(np, of_clk_src_simple_get, clk); |
| 749 | if (rc != 0) | 747 | if (rc != 0) |
| 750 | pr_err("%s: could register provider clk %s\n", __func__, | 748 | pr_err("%s: could register provider clk %pOF\n", __func__, np); |
| 751 | np->full_name); | ||
| 752 | 749 | ||
| 753 | return; | 750 | return; |
| 754 | 751 | ||
