diff for duplicates of <8762e8v53q.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index a6b44a3..2c2771b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,24 +16,24 @@ >>>>> >>>>> Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> >>>>> --- ->>>>> drivers/gpio/gpio-omap.c | 3 +++ ->>>>> 1 files changed, 3 insertions(+), 0 deletions(-) +>>>>> ?drivers/gpio/gpio-omap.c | ? ?3 +++ +>>>>> ?1 files changed, 3 insertions(+), 0 deletions(-) >>>>> >>>>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c >>>>> index 04c2677..2e8e476 100644 >>>>> --- a/drivers/gpio/gpio-omap.c >>>>> +++ b/drivers/gpio/gpio-omap.c >>>>> @@ -114,6 +114,7 @@ static void _set_gpio_dataout_reg(struct gpio_bank *bank, int gpio, int enable) ->>>>> else ->>>>> reg += bank->regs->clr_dataout; +>>>>> ? ? ? else +>>>>> ? ? ? ? ? ? ? reg += bank->regs->clr_dataout; >>>>> ->>>>> + l |= __raw_readl(bank->base + bank->regs->set_dataout); +>>>>> + ? ? l |= __raw_readl(bank->base + bank->regs->set_dataout); >>>> >>>> minor: IMO, it's more reader-friendly if this looks like >>>> ->>>> l = __raw_read(...) ->>>> l |= GPIO_BIT(...) ->>>> __raw_write(...) +>>>> ? ? ? l = __raw_read(...) +>>>> ? ? ? l |= GPIO_BIT(...) +>>>> ? ? ? __raw_write(...) >>> Agreed. I will make the change. >> Also, the read should be: __raw_readl(bank->base + bank->regs->dataout); >> instead of bank->regs->set_dataout. @@ -81,7 +81,3 @@ index 0b05629..db905c0 100644 reg += bank->regs->clr_dataout; + bank->context.dataout &= ~l; + } --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 43b349e..9cb4f10 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,14 +4,10 @@ "ref\0CAC83ZvJ5rjNJoSZW=j=DXQWKWGgr_Wqu8ukOubxKd7xuEQ4pzQ@mail.gmail.com\0" "ref\0CAC83Zv+CZOGnSpOJgfCgEv-eyWXZzV+_mmd37CBMKM6iMtEksQ@mail.gmail.com\0" "ref\0CAC83ZvLmaLOr4_eZZzKyP2=KvkG+LjHjeOwvxdQHhuiB8+2L0w@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH v3 11/13] gpio/omap: fix dataout register overwrite in _set_gpio_dataout_*\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH v3 11/13] gpio/omap: fix dataout register overwrite in _set_gpio_dataout_*\0" "Date\0Tue, 13 Mar 2012 09:27:21 -0700\0" - "To\0DebBarma" - " Tarun Kanti <tarun.kanti@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - tony@atomide.com - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\"DebBarma, Tarun Kanti\" <tarun.kanti@ti.com> writes:\n" @@ -32,24 +28,24 @@ ">>>>>\n" ">>>>> Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>\n" ">>>>> ---\n" - ">>>>> \302\240drivers/gpio/gpio-omap.c | \302\240 \302\2403 +++\n" - ">>>>> \302\2401 files changed, 3 insertions(+), 0 deletions(-)\n" + ">>>>> ?drivers/gpio/gpio-omap.c | ? ?3 +++\n" + ">>>>> ?1 files changed, 3 insertions(+), 0 deletions(-)\n" ">>>>>\n" ">>>>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c\n" ">>>>> index 04c2677..2e8e476 100644\n" ">>>>> --- a/drivers/gpio/gpio-omap.c\n" ">>>>> +++ b/drivers/gpio/gpio-omap.c\n" ">>>>> @@ -114,6 +114,7 @@ static void _set_gpio_dataout_reg(struct gpio_bank *bank, int gpio, int enable)\n" - ">>>>> \302\240 \302\240 \302\240 else\n" - ">>>>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 reg += bank->regs->clr_dataout;\n" + ">>>>> ? ? ? else\n" + ">>>>> ? ? ? ? ? ? ? reg += bank->regs->clr_dataout;\n" ">>>>>\n" - ">>>>> + \302\240 \302\240 l |= __raw_readl(bank->base + bank->regs->set_dataout);\n" + ">>>>> + ? ? l |= __raw_readl(bank->base + bank->regs->set_dataout);\n" ">>>>\n" ">>>> minor: IMO, it's more reader-friendly if this looks like\n" ">>>>\n" - ">>>> \302\240 \302\240 \302\240 l = __raw_read(...)\n" - ">>>> \302\240 \302\240 \302\240 l |= GPIO_BIT(...)\n" - ">>>> \302\240 \302\240 \302\240 __raw_write(...)\n" + ">>>> ? ? ? l = __raw_read(...)\n" + ">>>> ? ? ? l |= GPIO_BIT(...)\n" + ">>>> ? ? ? __raw_write(...)\n" ">>> Agreed. I will make the change.\n" ">> Also, the read should be: __raw_readl(bank->base + bank->regs->dataout);\n" ">> instead of bank->regs->set_dataout.\n" @@ -96,10 +92,6 @@ "+\t} else {\n" " \t\treg += bank->regs->clr_dataout;\n" "+\t\tbank->context.dataout &= ~l;\n" - "+\t}\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "+\t}" -4adcd7c189da0496fbe1e23399d0d6e005ec796464383d5f534c24a5f4f164b9 +2ecb18d4a2cb8a53f36697ad87f93de1f2b33f455dc216580b787ab241da7ff2
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.