diff for duplicates of <2211094.l2Gf8f78vv@avalon> diff --git a/a/1.txt b/N1/1.txt index 3de9913..b8d148a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ On Friday 20 November 2015 16:17:13 Geert Uytterhoeven wrote: > >> >> > >> >> - /* Get the SCI functional clock. It's called "fck" on ARM. */ > >> >> - sci_port->fclk = devm_clk_get(dev, "fck"); -> >> >> - if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER) +> >> >> - if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER) > >> >> - return -EPROBE_DEFER; > >> >> - if (!IS_ERR(sci_port->fclk)) > >> >> - return 0; @@ -43,13 +43,13 @@ On Friday 20 November 2015 16:17:13 Geert Uytterhoeven wrote: > >> >> - * backward compatibility. > >> >> - */ > >> >> - sci_port->fclk = devm_clk_get(dev, "sci_ick"); -> >> >> - if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER) +> >> >> - if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER) > >> >> - return -EPROBE_DEFER; > >> >> - if (!IS_ERR(sci_port->fclk)) > >> >> - return 0; > >> >> + for (i = 0; i < SCI_NUM_CLKS; i++) { > >> >> + clk = devm_clk_get(dev, clk_names[i]); -> >> >> + if (PTR_ERR(clk) = -EPROBE_DEFER) +> >> >> + if (PTR_ERR(clk) == -EPROBE_DEFER) > >> >> + return -EPROBE_DEFER; > >> >> > >> >> - /* @@ -61,7 +61,7 @@ On Friday 20 November 2015 16:17:13 Geert Uytterhoeven wrote: > >> >> - sci_port->fclk = devm_clk_get(dev, "peripheral_clk"); > >> >> - if (!IS_ERR(sci_port->fclk)) > >> >> - return 0; -> >> >> + if (IS_ERR(clk) && i = SCI_FCK) { +> >> >> + if (IS_ERR(clk) && i == SCI_FCK) { > >> >> + /* > >> >> + * "fck" used to be called "sci_ick", and we > >> >> need @@ -69,7 +69,7 @@ On Friday 20 November 2015 16:17:13 Geert Uytterhoeven wrote: > >> >> + * maintain DT backward compatibility. > >> >> + */ > >> >> + clk = devm_clk_get(dev, "sci_ick"); -> >> >> + if (PTR_ERR(clk) = -EPROBE_DEFER) +> >> >> + if (PTR_ERR(clk) == -EPROBE_DEFER) > >> >> + return -EPROBE_DEFER; > >> >> + > >> >> + if (!IS_ERR(clk)) diff --git a/a/content_digest b/N1/content_digest index b74869c..27b2f92 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0CAMuHMdX8_nPwmH_i71yhEGzA1vGUfOEu7Da=i44iZKfaNcNb-Q@mail.gmail.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 18/25] serial: sh-sci: Prepare for multiple clocks and baud rate generators\0" - "Date\0Fri, 20 Nov 2015 15:31:24 +0000\0" + "Date\0Fri, 20 Nov 2015 17:31:24 +0200\0" "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" "Cc\0Geert Uytterhoeven <geert+renesas@glider.be>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -44,7 +44,7 @@ "> >> >> \n" "> >> >> - /* Get the SCI functional clock. It's called \"fck\" on ARM. */\n" "> >> >> - sci_port->fclk = devm_clk_get(dev, \"fck\");\n" - "> >> >> - if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)\n" + "> >> >> - if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)\n" "> >> >> - return -EPROBE_DEFER;\n" "> >> >> - if (!IS_ERR(sci_port->fclk))\n" "> >> >> - return 0;\n" @@ -60,13 +60,13 @@ "> >> >> - * backward compatibility.\n" "> >> >> - */\n" "> >> >> - sci_port->fclk = devm_clk_get(dev, \"sci_ick\");\n" - "> >> >> - if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)\n" + "> >> >> - if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)\n" "> >> >> - return -EPROBE_DEFER;\n" "> >> >> - if (!IS_ERR(sci_port->fclk))\n" "> >> >> - return 0;\n" "> >> >> + for (i = 0; i < SCI_NUM_CLKS; i++) {\n" "> >> >> + clk = devm_clk_get(dev, clk_names[i]);\n" - "> >> >> + if (PTR_ERR(clk) = -EPROBE_DEFER)\n" + "> >> >> + if (PTR_ERR(clk) == -EPROBE_DEFER)\n" "> >> >> + return -EPROBE_DEFER;\n" "> >> >> \n" "> >> >> - /*\n" @@ -78,7 +78,7 @@ "> >> >> - sci_port->fclk = devm_clk_get(dev, \"peripheral_clk\");\n" "> >> >> - if (!IS_ERR(sci_port->fclk))\n" "> >> >> - return 0;\n" - "> >> >> + if (IS_ERR(clk) && i = SCI_FCK) {\n" + "> >> >> + if (IS_ERR(clk) && i == SCI_FCK) {\n" "> >> >> + /*\n" "> >> >> + * \"fck\" used to be called \"sci_ick\", and we\n" "> >> >> need\n" @@ -86,7 +86,7 @@ "> >> >> + * maintain DT backward compatibility.\n" "> >> >> + */\n" "> >> >> + clk = devm_clk_get(dev, \"sci_ick\");\n" - "> >> >> + if (PTR_ERR(clk) = -EPROBE_DEFER)\n" + "> >> >> + if (PTR_ERR(clk) == -EPROBE_DEFER)\n" "> >> >> + return -EPROBE_DEFER;\n" "> >> >> +\n" "> >> >> + if (!IS_ERR(clk))\n" @@ -149,4 +149,4 @@ "\n" Laurent Pinchart -8e5416db44e803e2148f28137bb4ab76e688c44a31989bd79db2d10fb3c24500 +425349a371f34722491de98959f8e016225651bcef43dc1ae11178368df45d53
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.