diff for duplicates of <87zkfmaa3c.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 0b35363..f7c529c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,19 +16,19 @@ >>>> Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> >>>> Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >>>> --- ->>>> drivers/gpio/gpio-omap.c | 9 +++++++-- ->>>> 1 files changed, 7 insertions(+), 2 deletions(-) +>>>> ?drivers/gpio/gpio-omap.c | ? ?9 +++++++-- +>>>> ?1 files changed, 7 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c >>>> index 4009446..3df7a98 100644 >>>> --- a/drivers/gpio/gpio-omap.c >>>> +++ b/drivers/gpio/gpio-omap.c >>>> @@ -1073,7 +1073,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) ->>>> bank->get_context_loss_count = pdata->get_context_loss_count; ->>>> bank->regs = pdata->regs; +>>>> ? ? ? bank->get_context_loss_count = pdata->get_context_loss_count; +>>>> ? ? ? bank->regs = pdata->regs; >>>> ->>>> - if (bank->regs->set_dataout && bank->regs->clr_dataout) ->>>> + if (bank->regs->set_dataout) +>>>> - ? ? if (bank->regs->set_dataout && bank->regs->clr_dataout) +>>>> + ? ? if (bank->regs->set_dataout) >>> >>> This change isn't right. >>> @@ -38,17 +38,17 @@ > >> >>> ->>>> bank->set_dataout = _set_gpio_dataout_reg; ->>>> else ->>>> bank->set_dataout = _set_gpio_dataout_mask; +>>>> ? ? ? ? ? ? ? bank->set_dataout = _set_gpio_dataout_reg; +>>>> ? ? ? else +>>>> ? ? ? ? ? ? ? bank->set_dataout = _set_gpio_dataout_mask; >>>> @@ -1351,7 +1351,12 @@ static void omap_gpio_restore_context(struct gpio_bank *bank) ->>>> bank->base + bank->regs->risingdetect); ->>>> __raw_writel(bank->context.fallingdetect, ->>>> bank->base + bank->regs->fallingdetect); ->>>> - __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout); ->>>> + if (bank->regs->set_dataout) +>>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->risingdetect); +>>>> ? ? ? __raw_writel(bank->context.fallingdetect, +>>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->fallingdetect); +>>>> - ? ? __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout); +>>>> + ? ? if (bank->regs->set_dataout) >>> ->>> Why the check again? The check has already been done in probe. +>>> Why the check again? ?The check has already been done in probe. >>> >>> Just use bank->set_dataout() here. >> Sure, i will make the change. @@ -64,8 +64,3 @@ OK, then keep the original version, but make sure the if statement matches is checking for ->set_dataout and ->clr_dataout like the other one. Kevin - --- -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 5d2c5f3..fd634b1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,15 +3,10 @@ "ref\087aa8bde2d.fsf@ti.com\0" "ref\0CAC83Zv+gac_Wd8+V+o6USxv73ia5i8JLjLDHj8VQiRiqZ7DOtQ@mail.gmail.com\0" "ref\0CAC83ZvL9w=7RhAuT=5ahbDX+d6miQMif1ngOenEiqP4UN2+mzg@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH v8 24/24] gpio/omap: handle set_dataout reg capable IP on restore\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH v8 24/24] gpio/omap: handle set_dataout reg capable IP on restore\0" "Date\0Wed, 23 Nov 2011 11:54:15 -0800\0" - "To\0DebBarma" - " Tarun Kanti <tarun.kanti@ti.com>\0" - "Cc\0Tony Lindgren <tony@atomide.com>" - Nishanth Menon <nm@ti.com> - linux-omap@vger.kernel.org - " 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,19 +27,19 @@ ">>>> Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>\n" ">>>> Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" ">>>> ---\n" - ">>>> \302\240drivers/gpio/gpio-omap.c | \302\240 \302\2409 +++++++--\n" - ">>>> \302\2401 files changed, 7 insertions(+), 2 deletions(-)\n" + ">>>> ?drivers/gpio/gpio-omap.c | ? ?9 +++++++--\n" + ">>>> ?1 files changed, 7 insertions(+), 2 deletions(-)\n" ">>>>\n" ">>>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c\n" ">>>> index 4009446..3df7a98 100644\n" ">>>> --- a/drivers/gpio/gpio-omap.c\n" ">>>> +++ b/drivers/gpio/gpio-omap.c\n" ">>>> @@ -1073,7 +1073,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)\n" - ">>>> \302\240 \302\240 \302\240 bank->get_context_loss_count = pdata->get_context_loss_count;\n" - ">>>> \302\240 \302\240 \302\240 bank->regs = pdata->regs;\n" + ">>>> ? ? ? bank->get_context_loss_count = pdata->get_context_loss_count;\n" + ">>>> ? ? ? bank->regs = pdata->regs;\n" ">>>>\n" - ">>>> - \302\240 \302\240 if (bank->regs->set_dataout && bank->regs->clr_dataout)\n" - ">>>> + \302\240 \302\240 if (bank->regs->set_dataout)\n" + ">>>> - ? ? if (bank->regs->set_dataout && bank->regs->clr_dataout)\n" + ">>>> + ? ? if (bank->regs->set_dataout)\n" ">>>\n" ">>> This change isn't right.\n" ">>>\n" @@ -54,17 +49,17 @@ ">\n" ">>\n" ">>>\n" - ">>>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->set_dataout = _set_gpio_dataout_reg;\n" - ">>>> \302\240 \302\240 \302\240 else\n" - ">>>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->set_dataout = _set_gpio_dataout_mask;\n" + ">>>> ? ? ? ? ? ? ? bank->set_dataout = _set_gpio_dataout_reg;\n" + ">>>> ? ? ? else\n" + ">>>> ? ? ? ? ? ? ? bank->set_dataout = _set_gpio_dataout_mask;\n" ">>>> @@ -1351,7 +1351,12 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)\n" - ">>>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->base + bank->regs->risingdetect);\n" - ">>>> \302\240 \302\240 \302\240 __raw_writel(bank->context.fallingdetect,\n" - ">>>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->base + bank->regs->fallingdetect);\n" - ">>>> - \302\240 \302\240 __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);\n" - ">>>> + \302\240 \302\240 if (bank->regs->set_dataout)\n" + ">>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->risingdetect);\n" + ">>>> ? ? ? __raw_writel(bank->context.fallingdetect,\n" + ">>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bank->base + bank->regs->fallingdetect);\n" + ">>>> - ? ? __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);\n" + ">>>> + ? ? if (bank->regs->set_dataout)\n" ">>>\n" - ">>> Why the check again? \302\240The check has already been done in probe.\n" + ">>> Why the check again? ?The check has already been done in probe.\n" ">>>\n" ">>> Just use bank->set_dataout() here.\n" ">> Sure, i will make the change.\n" @@ -79,11 +74,6 @@ "OK, then keep the original version, but make sure the if statement\n" "matches is checking for ->set_dataout and ->clr_dataout like the other one.\n" "\n" - "Kevin\n" - "\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 + Kevin -8ab82888ba02af415f0f30412a6bfafbedbdb70ebe9c83ab6a99545aef6f064c +70040084fd4f3c7d3aa34771861ad8e14548591af275443d916c5b0ce4cff194
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.