diff for duplicates of <2396575.drsjxiqpHR@avalon> diff --git a/a/1.txt b/N1/1.txt index 49d9fa4..fdb6275 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ On Friday 20 November 2015 08:52:19 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; @@ -39,13 +39,13 @@ On Friday 20 November 2015 08:52:19 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; > >> > >> - /* @@ -56,14 +56,14 @@ On Friday 20 November 2015 08:52:19 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 > >> to > >> + * 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 8deeee3..f6d5a48 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0CAMuHMdWZVZ-iVRKOjzszoJiBMxC-p=OTGWRb-EYHFV=eC3DiWQ@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 14:47:19 +0000\0" + "Date\0Fri, 20 Nov 2015 16:47:19 +0200\0" "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" "Cc\0Geert Uytterhoeven <geert+renesas@glider.be>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -41,7 +41,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" @@ -56,13 +56,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" @@ -73,14 +73,14 @@ "> >> - 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 need\n" "> >> to\n" "> >> + * 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" @@ -128,4 +128,4 @@ "\n" Laurent Pinchart -5ff28611a88f764ebeea206bd17fd1f88774475889e4bcedfdbf76e7bf4f8dc8 +77f518ae8d61646677f8fa588ddabb1e3fdec24e1c259395963d5a9987c74aaa
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.