diff for duplicates of <87r4xeyexm.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index f8d7635..f03dabd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,30 +12,30 @@ >> I'm not crazy about this change... >> >>> --- ->>> drivers/gpio/gpio-omap.c | 11 +++++------ ->>> 1 files changed, 5 insertions(+), 6 deletions(-) +>>> ?drivers/gpio/gpio-omap.c | ? 11 +++++------ +>>> ?1 files changed, 5 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c >>> index 64f15d5..b62e861 100644 >>> --- a/drivers/gpio/gpio-omap.c >>> +++ b/drivers/gpio/gpio-omap.c >>> @@ -53,7 +53,6 @@ struct gpio_bank { ->>> void __iomem *base; ->>> u16 irq; ->>> u16 virtual_irq_start; ->>> - u32 suspend_wakeup; ->>> u32 non_wakeup_gpios; ->>> u32 enabled_non_wakeup_gpios; ->>> struct gpio_regs context; +>>> ? ? ? void __iomem *base; +>>> ? ? ? u16 irq; +>>> ? ? ? u16 virtual_irq_start; +>>> - ? ? u32 suspend_wakeup; +>>> ? ? ? u32 non_wakeup_gpios; +>>> ? ? ? u32 enabled_non_wakeup_gpios; +>>> ? ? ? struct gpio_regs context; >>> @@ -497,9 +496,9 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable) >>> ->>> spin_lock_irqsave(&bank->lock, flags); ->>> if (enable) ->>> - bank->suspend_wakeup |= gpio_bit; ->>> + bank->context.wake_en |= gpio_bit; ->>> else ->>> - bank->suspend_wakeup &= ~gpio_bit; ->>> + bank->context.wake_en &= ~gpio_bit; +>>> ? ? ? spin_lock_irqsave(&bank->lock, flags); +>>> ? ? ? if (enable) +>>> - ? ? ? ? ? ? bank->suspend_wakeup |= gpio_bit; +>>> + ? ? ? ? ? ? bank->context.wake_en |= gpio_bit; +>>> ? ? ? else +>>> - ? ? ? ? ? ? bank->suspend_wakeup &= ~gpio_bit; +>>> + ? ? ? ? ? ? bank->context.wake_en &= ~gpio_bit; >> >> The bank->context values are expected to be copies of the actual >> register contents, and here that is clearly not the case. @@ -93,33 +93,33 @@ Kevin >> >> Kevin >> ->>> spin_unlock_irqrestore(&bank->lock, flags); +>>> ? ? ? spin_unlock_irqrestore(&bank->lock, flags); >>> >>> @@ -772,7 +771,7 @@ static int omap_mpuio_suspend_noirq(struct device *dev) >>> ->>> spin_lock_irqsave(&bank->lock, flags); ->>> bank->context.wake_en = __raw_readl(mask_reg); ->>> - __raw_writel(0xffff & ~bank->suspend_wakeup, mask_reg); ->>> + __raw_writel(0xffff & ~bank->context.wake_en, mask_reg); ->>> spin_unlock_irqrestore(&bank->lock, flags); +>>> ? ? ? spin_lock_irqsave(&bank->lock, flags); +>>> ? ? ? bank->context.wake_en = __raw_readl(mask_reg); +>>> - ? ? __raw_writel(0xffff & ~bank->suspend_wakeup, mask_reg); +>>> + ? ? __raw_writel(0xffff & ~bank->context.wake_en, mask_reg); +>>> ? ? ? spin_unlock_irqrestore(&bank->lock, flags); >>> ->>> return 0; +>>> ? ? ? return 0; >>> @@ -1137,12 +1136,12 @@ static int omap_gpio_suspend(struct device *dev) ->>> if (!bank->mod_usage || !bank->loses_context) ->>> return 0; +>>> ? ? ? if (!bank->mod_usage || !bank->loses_context) +>>> ? ? ? ? ? ? ? return 0; >>> ->>> - if (!bank->regs->wkup_en || !bank->suspend_wakeup) ->>> + if (!bank->regs->wkup_en || !bank->context.wake_en) ->>> return 0; +>>> - ? ? if (!bank->regs->wkup_en || !bank->suspend_wakeup) +>>> + ? ? if (!bank->regs->wkup_en || !bank->context.wake_en) +>>> ? ? ? ? ? ? ? return 0; >>> ->>> spin_lock_irqsave(&bank->lock, flags); ->>> _gpio_rmw(base, bank->regs->wkup_en, 0xffffffff, 0); ->>> - _gpio_rmw(base, bank->regs->wkup_en, bank->suspend_wakeup, 1); ->>> + _gpio_rmw(base, bank->regs->wkup_en, bank->context.wake_en, 1); ->>> spin_unlock_irqrestore(&bank->lock, flags); +>>> ? ? ? spin_lock_irqsave(&bank->lock, flags); +>>> ? ? ? _gpio_rmw(base, bank->regs->wkup_en, 0xffffffff, 0); +>>> - ? ? _gpio_rmw(base, bank->regs->wkup_en, bank->suspend_wakeup, 1); +>>> + ? ? _gpio_rmw(base, bank->regs->wkup_en, bank->context.wake_en, 1); +>>> ? ? ? spin_unlock_irqrestore(&bank->lock, flags); >>> ->>> return 0; +>>> ? ? ? return 0; > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at 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 67119aa..617fcd3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,16 +2,10 @@ "ref\01329999031-6914-4-git-send-email-tarun.kanti@ti.com\0" "ref\087ty2bu91e.fsf@ti.com\0" "ref\0CAC83ZvJ97uRSLU-JmO2mnaOuziU=SotghASSJjPvESWL+eATuQ@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH 3/6] gpio/omap: remove suspend_wakeup field from struct gpio_bank\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH 3/6] gpio/omap: remove suspend_wakeup field from struct gpio_bank\0" "Date\0Tue, 28 Feb 2012 10:45:57 -0800\0" - "To\0DebBarma" - " Tarun Kanti <tarun.kanti@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - grant.likely@secretlab.ca - tony@atomide.com - linux-kernel@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" @@ -28,30 +22,30 @@ ">> I'm not crazy about this change...\n" ">>\n" ">>> ---\n" - ">>> \302\240drivers/gpio/gpio-omap.c | \302\240 11 +++++------\n" - ">>> \302\2401 files changed, 5 insertions(+), 6 deletions(-)\n" + ">>> ?drivers/gpio/gpio-omap.c | ? 11 +++++------\n" + ">>> ?1 files changed, 5 insertions(+), 6 deletions(-)\n" ">>>\n" ">>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c\n" ">>> index 64f15d5..b62e861 100644\n" ">>> --- a/drivers/gpio/gpio-omap.c\n" ">>> +++ b/drivers/gpio/gpio-omap.c\n" ">>> @@ -53,7 +53,6 @@ struct gpio_bank {\n" - ">>> \302\240 \302\240 \302\240 void __iomem *base;\n" - ">>> \302\240 \302\240 \302\240 u16 irq;\n" - ">>> \302\240 \302\240 \302\240 u16 virtual_irq_start;\n" - ">>> - \302\240 \302\240 u32 suspend_wakeup;\n" - ">>> \302\240 \302\240 \302\240 u32 non_wakeup_gpios;\n" - ">>> \302\240 \302\240 \302\240 u32 enabled_non_wakeup_gpios;\n" - ">>> \302\240 \302\240 \302\240 struct gpio_regs context;\n" + ">>> ? ? ? void __iomem *base;\n" + ">>> ? ? ? u16 irq;\n" + ">>> ? ? ? u16 virtual_irq_start;\n" + ">>> - ? ? u32 suspend_wakeup;\n" + ">>> ? ? ? u32 non_wakeup_gpios;\n" + ">>> ? ? ? u32 enabled_non_wakeup_gpios;\n" + ">>> ? ? ? struct gpio_regs context;\n" ">>> @@ -497,9 +496,9 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)\n" ">>>\n" - ">>> \302\240 \302\240 \302\240 spin_lock_irqsave(&bank->lock, flags);\n" - ">>> \302\240 \302\240 \302\240 if (enable)\n" - ">>> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->suspend_wakeup |= gpio_bit;\n" - ">>> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->context.wake_en |= gpio_bit;\n" - ">>> \302\240 \302\240 \302\240 else\n" - ">>> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->suspend_wakeup &= ~gpio_bit;\n" - ">>> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bank->context.wake_en &= ~gpio_bit;\n" + ">>> ? ? ? spin_lock_irqsave(&bank->lock, flags);\n" + ">>> ? ? ? if (enable)\n" + ">>> - ? ? ? ? ? ? bank->suspend_wakeup |= gpio_bit;\n" + ">>> + ? ? ? ? ? ? bank->context.wake_en |= gpio_bit;\n" + ">>> ? ? ? else\n" + ">>> - ? ? ? ? ? ? bank->suspend_wakeup &= ~gpio_bit;\n" + ">>> + ? ? ? ? ? ? bank->context.wake_en &= ~gpio_bit;\n" ">>\n" ">> The bank->context values are expected to be copies of the actual\n" ">> register contents, and here that is clearly not the case.\n" @@ -109,35 +103,35 @@ ">>\n" ">> Kevin\n" ">>\n" - ">>> \302\240 \302\240 \302\240 spin_unlock_irqrestore(&bank->lock, flags);\n" + ">>> ? ? ? spin_unlock_irqrestore(&bank->lock, flags);\n" ">>>\n" ">>> @@ -772,7 +771,7 @@ static int omap_mpuio_suspend_noirq(struct device *dev)\n" ">>>\n" - ">>> \302\240 \302\240 \302\240 spin_lock_irqsave(&bank->lock, flags);\n" - ">>> \302\240 \302\240 \302\240 bank->context.wake_en = __raw_readl(mask_reg);\n" - ">>> - \302\240 \302\240 __raw_writel(0xffff & ~bank->suspend_wakeup, mask_reg);\n" - ">>> + \302\240 \302\240 __raw_writel(0xffff & ~bank->context.wake_en, mask_reg);\n" - ">>> \302\240 \302\240 \302\240 spin_unlock_irqrestore(&bank->lock, flags);\n" + ">>> ? ? ? spin_lock_irqsave(&bank->lock, flags);\n" + ">>> ? ? ? bank->context.wake_en = __raw_readl(mask_reg);\n" + ">>> - ? ? __raw_writel(0xffff & ~bank->suspend_wakeup, mask_reg);\n" + ">>> + ? ? __raw_writel(0xffff & ~bank->context.wake_en, mask_reg);\n" + ">>> ? ? ? spin_unlock_irqrestore(&bank->lock, flags);\n" ">>>\n" - ">>> \302\240 \302\240 \302\240 return 0;\n" + ">>> ? ? ? return 0;\n" ">>> @@ -1137,12 +1136,12 @@ static int omap_gpio_suspend(struct device *dev)\n" - ">>> \302\240 \302\240 \302\240 if (!bank->mod_usage || !bank->loses_context)\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return 0;\n" + ">>> ? ? ? if (!bank->mod_usage || !bank->loses_context)\n" + ">>> ? ? ? ? ? ? ? return 0;\n" ">>>\n" - ">>> - \302\240 \302\240 if (!bank->regs->wkup_en || !bank->suspend_wakeup)\n" - ">>> + \302\240 \302\240 if (!bank->regs->wkup_en || !bank->context.wake_en)\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return 0;\n" + ">>> - ? ? if (!bank->regs->wkup_en || !bank->suspend_wakeup)\n" + ">>> + ? ? if (!bank->regs->wkup_en || !bank->context.wake_en)\n" + ">>> ? ? ? ? ? ? ? return 0;\n" ">>>\n" - ">>> \302\240 \302\240 \302\240 spin_lock_irqsave(&bank->lock, flags);\n" - ">>> \302\240 \302\240 \302\240 _gpio_rmw(base, bank->regs->wkup_en, 0xffffffff, 0);\n" - ">>> - \302\240 \302\240 _gpio_rmw(base, bank->regs->wkup_en, bank->suspend_wakeup, 1);\n" - ">>> + \302\240 \302\240 _gpio_rmw(base, bank->regs->wkup_en, bank->context.wake_en, 1);\n" - ">>> \302\240 \302\240 \302\240 spin_unlock_irqrestore(&bank->lock, flags);\n" + ">>> ? ? ? spin_lock_irqsave(&bank->lock, flags);\n" + ">>> ? ? ? _gpio_rmw(base, bank->regs->wkup_en, 0xffffffff, 0);\n" + ">>> - ? ? _gpio_rmw(base, bank->regs->wkup_en, bank->suspend_wakeup, 1);\n" + ">>> + ? ? _gpio_rmw(base, bank->regs->wkup_en, bank->context.wake_en, 1);\n" + ">>> ? ? ? spin_unlock_irqrestore(&bank->lock, flags);\n" ">>>\n" - ">>> \302\240 \302\240 \302\240 return 0;\n" + ">>> ? ? ? return 0;\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" + "> the body of a message to majordomo at vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -8449f4304cd070bc8c88e21f6550d94735e71eb2b1be89a04963a2f971384569 +8b0555b13b8942354da6adac5fe551a860794fcb7d076f2aae1ef1dca83acf6d
diff --git a/a/content_digest b/N2/content_digest index 67119aa..667e79f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,7 +5,7 @@ "From\0Kevin Hilman <khilman@ti.com>\0" "Subject\0Re: [PATCH 3/6] gpio/omap: remove suspend_wakeup field from struct gpio_bank\0" "Date\0Tue, 28 Feb 2012 10:45:57 -0800\0" - "To\0DebBarma" + "To\0DebBarma\\" " Tarun Kanti <tarun.kanti@ti.com>\0" "Cc\0linux-omap@vger.kernel.org" grant.likely@secretlab.ca @@ -140,4 +140,4 @@ "> the body of a message to majordomo@vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -8449f4304cd070bc8c88e21f6550d94735e71eb2b1be89a04963a2f971384569 +0246f0223254005f536cca47870e0ffb5e7a0738c0205c34e0e23acd727e7133
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.