From 385c0a75af4e54d579fb37c924284b266251d8af Mon Sep 17 00:00:00 2001 From: Alexander Clouter Date: Sat, 12 May 2012 15:16:59 +0100 Subject: [PATCH] --- yaml --- r: 303123 b: refs/heads/master c: 167473a5937f54aaac4c3c01a192a81214933a23 h: refs/heads/master i: 303121: 93855c41212b585837c76d56b99765935d927fbb 303119: 7bfd40577ea1a654ece9b84231035e1da10bcc2b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-orion5x/ts78xx-setup.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index daf3ce84ad5d..7b0b9890b541 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f234997dac445a64f5d9672bf21649e6d745bb9 +refs/heads/master: 167473a5937f54aaac4c3c01a192a81214933a23 diff --git a/trunk/arch/arm/mach-orion5x/ts78xx-setup.c b/trunk/arch/arm/mach-orion5x/ts78xx-setup.c index c41f27bd7184..d8670cbae770 100644 --- a/trunk/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/trunk/arch/arm/mach-orion5x/ts78xx-setup.c @@ -292,11 +292,8 @@ static struct platform_nand_data ts78xx_ts_nand_data = { }, }; -static struct resource ts78xx_ts_nand_resources = { - .start = TS_NAND_DATA, - .end = TS_NAND_DATA + 4, - .flags = IORESOURCE_MEM, -}; +static struct resource ts78xx_ts_nand_resources + = DEFINE_RES_MEM(TS_NAND_DATA, 4); static struct platform_device ts78xx_ts_nand_device = { .name = "gen_nand", @@ -332,11 +329,8 @@ static void ts78xx_ts_nand_unload(void) ****************************************************************************/ #define TS_RNG_DATA (TS78XX_FPGA_REGS_PHYS_BASE | 0x044) -static struct resource ts78xx_ts_rng_resource = { - .flags = IORESOURCE_MEM, - .start = TS_RNG_DATA, - .end = TS_RNG_DATA + 4 - 1, -}; +static struct resource ts78xx_ts_rng_resource + = DEFINE_RES_MEM(TS_RNG_DATA, 4); static struct timeriomem_rng_data ts78xx_ts_rng_data = { .period = 1000000, /* one second */