diff for duplicates of <1374514847.15592.7@snotra> diff --git a/a/1.txt b/N1/1.txt index 8091539..296e18e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,47 +4,47 @@ On 07/22/2013 02:53:56 AM, Haijun Zhang wrote: > If we can get a valid voltage-range from device node, we use > this voltage as the final voltage support. Else we still read > from capacity or from other provider. -> +>=20 > Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com> > Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> > --- -> drivers/mmc/host/sdhci-of-esdhc.c | 31 +> drivers/mmc/host/sdhci-of-esdhc.c | 31 =20 > +++++++++++++++++++++++++++++++ > drivers/mmc/host/sdhci.c | 3 +++ > include/linux/mmc/sdhci.h | 1 + > 3 files changed, 35 insertions(+) -> -> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c +>=20 +> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c =20 > b/drivers/mmc/host/sdhci-of-esdhc.c > index 15039e2..8b4b27a 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c -> @@ -262,6 +262,35 @@ static int esdhc_pltfm_bus_width(struct +> @@ -262,6 +262,35 @@ static int esdhc_pltfm_bus_width(struct =20 > sdhci_host *host, int width) > return 0; > } -> +>=20 > +static void esdhc_get_voltage(struct sdhci_host *host, > + struct platform_device *pdev) > +{ > + const u32 *voltage_ranges; > + int num_ranges, i; > + struct device_node *np; -> + np = pdev->dev.of_node; +> + np =3D pdev->dev.of_node; > + -> + voltage_ranges = of_get_property(np, "voltage-ranges", +> + voltage_ranges =3D of_get_property(np, "voltage-ranges", =20 > &num_ranges); -> + num_ranges = num_ranges / sizeof(*voltage_ranges) / 2; +> + num_ranges =3D num_ranges / sizeof(*voltage_ranges) / 2; > + if (!voltage_ranges || !num_ranges) { -> + dev_info(&pdev->dev, "OF: voltage-ranges +> + dev_info(&pdev->dev, "OF: voltage-ranges =20 > unspecified\n"); > + return; > + } > + -> + for (i = 0; i < num_ranges; i++) { -> + const int j = i * 2; +> + for (i =3D 0; i < num_ranges; i++) { +> + const int j =3D i * 2; > + u32 mask; -> + mask = +> + mask =3D =20 > mmc_vddrange_to_ocrmask(be32_to_cpu(voltage_ranges[j]), > + be32_to_cpu(voltage_ranges[j + 1])); > + if (!mask) { @@ -52,13 +52,13 @@ On 07/22/2013 02:53:56 AM, Haijun Zhang wrote: > + "OF: false voltage-ranges specified\n"); > + return; > + } -> + host->ocr_mask |= mask; +> + host->ocr_mask |=3D mask; > + } > +} Don't duplicate this code. Move it somewhere common and share it. -Why did you remove the range index from the error string, and why did +Why did you remove the range index from the error string, and why did =20 you change it from dev_err to dev_info? --Scott +-Scott= diff --git a/a/content_digest b/N1/content_digest index baeaf87..cb68b8e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,12 +3,12 @@ "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH 2/2] mmc: esdhc: get voltage from dts file\0" "Date\0Mon, 22 Jul 2013 12:40:47 -0500\0" + "To\0Haijun Zhang <Haijun.Zhang@freescale.com>\0" "Cc\0linux-mmc@vger.kernel.org" - linuxppc-dev@lists.ozlabs.org + AFLEMING@freescale.com cbouatmailru@gmail.com cjb@laptop.org - AFLEMING@freescale.com - Haijun Zhang <Haijun.Zhang@freescale.com> + linuxppc-dev@lists.ozlabs.org " Haijun Zhang <haijun.zhang@freescale.com>\0" "\00:1\0" "b\0" @@ -18,47 +18,47 @@ "> If we can get a valid voltage-range from device node, we use\n" "> this voltage as the final voltage support. Else we still read\n" "> from capacity or from other provider.\n" - "> \n" + ">=20\n" "> Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com>\n" "> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>\n" "> ---\n" - "> drivers/mmc/host/sdhci-of-esdhc.c | 31 \n" + "> drivers/mmc/host/sdhci-of-esdhc.c | 31 =20\n" "> +++++++++++++++++++++++++++++++\n" "> drivers/mmc/host/sdhci.c | 3 +++\n" "> include/linux/mmc/sdhci.h | 1 +\n" "> 3 files changed, 35 insertions(+)\n" - "> \n" - "> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c \n" + ">=20\n" + "> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c =20\n" "> b/drivers/mmc/host/sdhci-of-esdhc.c\n" "> index 15039e2..8b4b27a 100644\n" "> --- a/drivers/mmc/host/sdhci-of-esdhc.c\n" "> +++ b/drivers/mmc/host/sdhci-of-esdhc.c\n" - "> @@ -262,6 +262,35 @@ static int esdhc_pltfm_bus_width(struct \n" + "> @@ -262,6 +262,35 @@ static int esdhc_pltfm_bus_width(struct =20\n" "> sdhci_host *host, int width)\n" "> \treturn 0;\n" "> }\n" - "> \n" + ">=20\n" "> +static void esdhc_get_voltage(struct sdhci_host *host,\n" "> +\t\t\tstruct platform_device *pdev)\n" "> +{\n" "> +\tconst u32 *voltage_ranges;\n" "> +\tint num_ranges, i;\n" "> +\tstruct device_node *np;\n" - "> +\tnp = pdev->dev.of_node;\n" + "> +\tnp =3D pdev->dev.of_node;\n" "> +\n" - "> +\tvoltage_ranges = of_get_property(np, \"voltage-ranges\", \n" + "> +\tvoltage_ranges =3D of_get_property(np, \"voltage-ranges\", =20\n" "> &num_ranges);\n" - "> +\tnum_ranges = num_ranges / sizeof(*voltage_ranges) / 2;\n" + "> +\tnum_ranges =3D num_ranges / sizeof(*voltage_ranges) / 2;\n" "> +\tif (!voltage_ranges || !num_ranges) {\n" - "> +\t\tdev_info(&pdev->dev, \"OF: voltage-ranges \n" + "> +\t\tdev_info(&pdev->dev, \"OF: voltage-ranges =20\n" "> unspecified\\n\");\n" "> +\t\treturn;\n" "> +\t}\n" "> +\n" - "> +\tfor (i = 0; i < num_ranges; i++) {\n" - "> +\t\tconst int j = i * 2;\n" + "> +\tfor (i =3D 0; i < num_ranges; i++) {\n" + "> +\t\tconst int j =3D i * 2;\n" "> +\t\tu32 mask;\n" - "> +\t\tmask = \n" + "> +\t\tmask =3D =20\n" "> mmc_vddrange_to_ocrmask(be32_to_cpu(voltage_ranges[j]),\n" "> +\t\t\t\tbe32_to_cpu(voltage_ranges[j + 1]));\n" "> +\t\tif (!mask) {\n" @@ -66,15 +66,15 @@ "> +\t\t\t\t\"OF: false voltage-ranges specified\\n\");\n" "> +\t\t\treturn;\n" "> +\t\t}\n" - "> +\t\thost->ocr_mask |= mask;\n" + "> +\t\thost->ocr_mask |=3D mask;\n" "> +\t}\n" "> +}\n" "\n" "Don't duplicate this code. Move it somewhere common and share it.\n" "\n" - "Why did you remove the range index from the error string, and why did \n" + "Why did you remove the range index from the error string, and why did =20\n" "you change it from dev_err to dev_info?\n" "\n" - -Scott + -Scott= -bbd250c448a1e8d09529ffd28467017fe0d802d8a078979d75e9cd2562f2207a +8ad495bfa2880408a903ff52688afa04625a26478cd73f0f3c7a5829197385fa
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.