| Message ID | 1335327163-11794-17-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
Hello. On 04/25/2012 08:12 AM, Tushar Behera wrote: > CC: Ben Dooks<ben-linux@fluff.org> > CC: Kukjin Kim<kgene.kim@samsung.com> > Signed-off-by: Tushar Behera<tushar.behera@linaro.org> > --- > arch/arm/mach-s3c24xx/mach-osiris.c | 12 ++---------- > 1 files changed, 2 insertions(+), 10 deletions(-) > diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c > index c5daeb6..95d0772 100644 > --- a/arch/arm/mach-s3c24xx/mach-osiris.c > +++ b/arch/arm/mach-s3c24xx/mach-osiris.c > @@ -244,16 +244,8 @@ static struct s3c2410_platform_nand __initdata osiris_nand_info = { > /* PCMCIA control and configuration */ > > static struct resource osiris_pcmcia_resource[] = { > - [0] = { > - .start = 0x0f000000, > - .end = 0x0f100000, > - .flags = IORESOURCE_MEM, > - }, > - [1] = { > - .start = 0x0c000000, > - .end = 0x0c100000, > - .flags = IORESOURCE_MEM, > - } > + [0] = DEFINE_RES_MEM(0x0f000000, SZ_1M), > + [1] = DEFINE_RES_MEM(0x0c000000, SZ_1M), You seem to be fixing the mistake in the original code where - 1 was missing in the '.end' initializers... WBR, Sergei
On 04/25/2012 10:23 PM, Sergei Shtylyov wrote: > Hello. > > On 04/25/2012 08:12 AM, Tushar Behera wrote: > >> CC: Ben Dooks<ben-linux@fluff.org> >> CC: Kukjin Kim<kgene.kim@samsung.com> >> Signed-off-by: Tushar Behera<tushar.behera@linaro.org> >> --- >> arch/arm/mach-s3c24xx/mach-osiris.c | 12 ++---------- >> 1 files changed, 2 insertions(+), 10 deletions(-) > >> diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c >> b/arch/arm/mach-s3c24xx/mach-osiris.c >> index c5daeb6..95d0772 100644 >> --- a/arch/arm/mach-s3c24xx/mach-osiris.c >> +++ b/arch/arm/mach-s3c24xx/mach-osiris.c >> @@ -244,16 +244,8 @@ static struct s3c2410_platform_nand __initdata >> osiris_nand_info = { >> /* PCMCIA control and configuration */ >> >> static struct resource osiris_pcmcia_resource[] = { >> - [0] = { >> - .start = 0x0f000000, >> - .end = 0x0f100000, >> - .flags = IORESOURCE_MEM, >> - }, >> - [1] = { >> - .start = 0x0c000000, >> - .end = 0x0c100000, >> - .flags = IORESOURCE_MEM, >> - } >> + [0] = DEFINE_RES_MEM(0x0f000000, SZ_1M), >> + [1] = DEFINE_RES_MEM(0x0c000000, SZ_1M), > > You seem to be fixing the mistake in the original code where - 1 was > missing in the '.end' initializers... > I am not sure if the original author intended to have it SZ_1M byte wide or (SZ_1M+1) byte wide. Since the later case seemed highly unlikely, I went ahead with SZ_1M. Although, I should have mentioned this in the commit log. :( > WBR, Sergei
diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c index c5daeb6..95d0772 100644 --- a/arch/arm/mach-s3c24xx/mach-osiris.c +++ b/arch/arm/mach-s3c24xx/mach-osiris.c @@ -244,16 +244,8 @@ static struct s3c2410_platform_nand __initdata osiris_nand_info = { /* PCMCIA control and configuration */ static struct resource osiris_pcmcia_resource[] = { - [0] = { - .start = 0x0f000000, - .end = 0x0f100000, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = 0x0c000000, - .end = 0x0c100000, - .flags = IORESOURCE_MEM, - } + [0] = DEFINE_RES_MEM(0x0f000000, SZ_1M), + [1] = DEFINE_RES_MEM(0x0c000000, SZ_1M), }; static struct platform_device osiris_pcmcia = {
CC: Ben Dooks <ben-linux@fluff.org> CC: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Tushar Behera <tushar.behera@linaro.org> --- arch/arm/mach-s3c24xx/mach-osiris.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)