diff for duplicates of <20100412213235.1688dda8@hyperion.delvare> diff --git a/a/1.txt b/N1/1.txt index 5e2eb6f..b86f855 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,48 +5,48 @@ On Mon, 12 Apr 2010 20:20:10 +0100, Russell King - ARM Linux wrote: > > > > The timeout value is in jiffies, so it should be using HZ, not a plain > > > > number. Assume '100' means 100ms here and adapt accordingly. > > > > -> > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> -> > > > Cc: Eric Miao <eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> -> > > > Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> -> > > > Cc: Marc Zyngier <maz-20xNzvSXLT6hUMvJH42dtQ@public.gmane.org> -> > > > Cc: Paul Shen <paul.shen-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> -> > > > Cc: Mike Rapoport <mike-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org> +> > > > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> +> > > > Cc: Eric Miao <eric.y.miao@gmail.com> +> > > > Cc: Russell King <linux@arm.linux.org.uk> +> > > > Cc: Marc Zyngier <maz@misterjones.org> +> > > > Cc: Paul Shen <paul.shen@marvell.com> +> > > > Cc: Mike Rapoport <mike@compulab.co.il> > > > > --- > > > > > > > > Janitorial fix, not tested due to no hardware. > > > > -> > > > arch/arm/mach-pxa/viper.c | 5 +++-- -> > > > 1 files changed, 3 insertions(+), 2 deletions(-) +> > > > ?arch/arm/mach-pxa/viper.c | ? ?5 +++-- +> > > > ?1 files changed, 3 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c > > > > index 1dd1334..c25921f 100644 > > > > --- a/arch/arm/mach-pxa/viper.c > > > > +++ b/arch/arm/mach-pxa/viper.c > > > > @@ -33,6 +33,7 @@ -> > > > #include <linux/pm.h> -> > > > #include <linux/sched.h> -> > > > #include <linux/gpio.h> +> > > > ?#include <linux/pm.h> +> > > > ?#include <linux/sched.h> +> > > > ?#include <linux/gpio.h> > > > > +#include <linux/jiffies.h> -> > > > #include <linux/i2c-gpio.h> -> > > > #include <linux/serial_8250.h> -> > > > #include <linux/smc91x.h> +> > > > ?#include <linux/i2c-gpio.h> +> > > > ?#include <linux/serial_8250.h> +> > > > ?#include <linux/smc91x.h> > > > > @@ -453,7 +454,7 @@ static struct i2c_gpio_platform_data i2c_bus_data = { -> > > > .sda_pin = VIPER_RTC_I2C_SDA_GPIO, -> > > > .scl_pin = VIPER_RTC_I2C_SCL_GPIO, -> > > > .udelay = 10, -> > > > - .timeout = 100, -> > > > + .timeout = HZ / 10, -> > > > }; +> > > > ? ? ? ?.sda_pin = VIPER_RTC_I2C_SDA_GPIO, +> > > > ? ? ? ?.scl_pin = VIPER_RTC_I2C_SCL_GPIO, +> > > > ? ? ? ?.udelay ?= 10, +> > > > - ? ? ? .timeout = 100, +> > > > + ? ? ? .timeout = HZ / 10, +> > > > ?}; > > > > -> > > > static struct platform_device i2c_bus_device = { +> > > > ?static struct platform_device i2c_bus_device = { > > > > @@ -778,7 +779,7 @@ static void __init viper_tpm_init(void) -> > > > .sda_pin = VIPER_TPM_I2C_SDA_GPIO, -> > > > .scl_pin = VIPER_TPM_I2C_SCL_GPIO, -> > > > .udelay = 10, -> > > > - .timeout = 100, -> > > > + .timeout = HZ / 10, -> > > > }; -> > > > char *errstr; +> > > > ? ? ? ? ? ? ? ?.sda_pin = VIPER_TPM_I2C_SDA_GPIO, +> > > > ? ? ? ? ? ? ? ?.scl_pin = VIPER_TPM_I2C_SCL_GPIO, +> > > > ? ? ? ? ? ? ? ?.udelay ?= 10, +> > > > - ? ? ? ? ? ? ? .timeout = 100, +> > > > + ? ? ? ? ? ? ? .timeout = HZ / 10, +> > > > ? ? ? ?}; +> > > > ? ? ? ?char *errstr; > > > > > > > > > > One other better and cleaner approach to such inconsistency issue is diff --git a/a/content_digest b/N1/content_digest index fa78685..de1adb3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,10 @@ "ref\0m2rf17812d71004121057n5131d025pb4965f45b61271f@mail.gmail.com\0" "ref\020100412211319.5a43c65b@hyperion.delvare\0" "ref\020100412192010.GM3048@n2100.arm.linux.org.uk\0" - "ref\020100412192010.GM3048-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org\0" - "From\0Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\0" - "Subject\0Re: [PATCH] mach-pxa/viper: Fix timeout usage for I2C\0" + "From\0khali@linux-fr.org (Jean Delvare)\0" + "Subject\0[PATCH] mach-pxa/viper: Fix timeout usage for I2C\0" "Date\0Mon, 12 Apr 2010 21:32:35 +0200\0" - "To\0Russell King - ARM Linux <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>\0" - "Cc\0Eric Miao <eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" - Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Marc Zyngier <maz-20xNzvSXLT6hUMvJH42dtQ@public.gmane.org> - Paul Shen <paul.shen-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - " Mike Rapoport <mike-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 12 Apr 2010 20:20:10 +0100, Russell King - ARM Linux wrote:\n" @@ -23,48 +15,48 @@ "> > > > The timeout value is in jiffies, so it should be using HZ, not a plain\n" "> > > > number. Assume '100' means 100ms here and adapt accordingly.\n" "> > > >\n" - "> > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" - "> > > > Cc: Eric Miao <eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" - "> > > > Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>\n" - "> > > > Cc: Marc Zyngier <maz-20xNzvSXLT6hUMvJH42dtQ@public.gmane.org>\n" - "> > > > Cc: Paul Shen <paul.shen-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\n" - "> > > > Cc: Mike Rapoport <mike-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>\n" + "> > > > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>\n" + "> > > > Cc: Eric Miao <eric.y.miao@gmail.com>\n" + "> > > > Cc: Russell King <linux@arm.linux.org.uk>\n" + "> > > > Cc: Marc Zyngier <maz@misterjones.org>\n" + "> > > > Cc: Paul Shen <paul.shen@marvell.com>\n" + "> > > > Cc: Mike Rapoport <mike@compulab.co.il>\n" "> > > > ---\n" "> > > >\n" "> > > > Janitorial fix, not tested due to no hardware.\n" "> > > >\n" - "> > > > \302\240arch/arm/mach-pxa/viper.c | \302\240 \302\2405 +++--\n" - "> > > > \302\2401 files changed, 3 insertions(+), 2 deletions(-)\n" + "> > > > ?arch/arm/mach-pxa/viper.c | ? ?5 +++--\n" + "> > > > ?1 files changed, 3 insertions(+), 2 deletions(-)\n" "> > > >\n" "> > > > diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c\n" "> > > > index 1dd1334..c25921f 100644\n" "> > > > --- a/arch/arm/mach-pxa/viper.c\n" "> > > > +++ b/arch/arm/mach-pxa/viper.c\n" "> > > > @@ -33,6 +33,7 @@\n" - "> > > > \302\240#include <linux/pm.h>\n" - "> > > > \302\240#include <linux/sched.h>\n" - "> > > > \302\240#include <linux/gpio.h>\n" + "> > > > ?#include <linux/pm.h>\n" + "> > > > ?#include <linux/sched.h>\n" + "> > > > ?#include <linux/gpio.h>\n" "> > > > +#include <linux/jiffies.h>\n" - "> > > > \302\240#include <linux/i2c-gpio.h>\n" - "> > > > \302\240#include <linux/serial_8250.h>\n" - "> > > > \302\240#include <linux/smc91x.h>\n" + "> > > > ?#include <linux/i2c-gpio.h>\n" + "> > > > ?#include <linux/serial_8250.h>\n" + "> > > > ?#include <linux/smc91x.h>\n" "> > > > @@ -453,7 +454,7 @@ static struct i2c_gpio_platform_data i2c_bus_data = {\n" - "> > > > \302\240 \302\240 \302\240 \302\240.sda_pin = VIPER_RTC_I2C_SDA_GPIO,\n" - "> > > > \302\240 \302\240 \302\240 \302\240.scl_pin = VIPER_RTC_I2C_SCL_GPIO,\n" - "> > > > \302\240 \302\240 \302\240 \302\240.udelay \302\240= 10,\n" - "> > > > - \302\240 \302\240 \302\240 .timeout = 100,\n" - "> > > > + \302\240 \302\240 \302\240 .timeout = HZ / 10,\n" - "> > > > \302\240};\n" + "> > > > ? ? ? ?.sda_pin = VIPER_RTC_I2C_SDA_GPIO,\n" + "> > > > ? ? ? ?.scl_pin = VIPER_RTC_I2C_SCL_GPIO,\n" + "> > > > ? ? ? ?.udelay ?= 10,\n" + "> > > > - ? ? ? .timeout = 100,\n" + "> > > > + ? ? ? .timeout = HZ / 10,\n" + "> > > > ?};\n" "> > > >\n" - "> > > > \302\240static struct platform_device i2c_bus_device = {\n" + "> > > > ?static struct platform_device i2c_bus_device = {\n" "> > > > @@ -778,7 +779,7 @@ static void __init viper_tpm_init(void)\n" - "> > > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240.sda_pin = VIPER_TPM_I2C_SDA_GPIO,\n" - "> > > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240.scl_pin = VIPER_TPM_I2C_SCL_GPIO,\n" - "> > > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240.udelay \302\240= 10,\n" - "> > > > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .timeout = 100,\n" - "> > > > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .timeout = HZ / 10,\n" - "> > > > \302\240 \302\240 \302\240 \302\240};\n" - "> > > > \302\240 \302\240 \302\240 \302\240char *errstr;\n" + "> > > > ? ? ? ? ? ? ? ?.sda_pin = VIPER_TPM_I2C_SDA_GPIO,\n" + "> > > > ? ? ? ? ? ? ? ?.scl_pin = VIPER_TPM_I2C_SCL_GPIO,\n" + "> > > > ? ? ? ? ? ? ? ?.udelay ?= 10,\n" + "> > > > - ? ? ? ? ? ? ? .timeout = 100,\n" + "> > > > + ? ? ? ? ? ? ? .timeout = HZ / 10,\n" + "> > > > ? ? ? ?};\n" + "> > > > ? ? ? ?char *errstr;\n" "> > > >\n" "> > > \n" "> > > One other better and cleaner approach to such inconsistency issue is\n" @@ -97,4 +89,4 @@ "-- \n" Jean Delvare -8f63cca3d72ebeef87925968b22cb18598f61a2f005228b5ecd039faf0d2cda4 +6955d0bfec07d77a41d4ce8c33c9424ce25fee03e20afe51a2d4c29bbc3cf79c
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.