From: Hirokazu Takata This patch updates m32r-specific CF/PCMCIA drivers and fixes compile errors. Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton --- 25-akpm/arch/m32r/drivers/m32r_cfc.c | 14 +++++++------- 25-akpm/arch/m32r/drivers/m32r_pcc.c | 25 ++++++++++++++----------- 2 files changed, 21 insertions(+), 18 deletions(-) diff -puN arch/m32r/drivers/m32r_cfc.c~m32r-update-cf-pcmcia-drivers arch/m32r/drivers/m32r_cfc.c --- 25/arch/m32r/drivers/m32r_cfc.c~m32r-update-cf-pcmcia-drivers 2004-09-11 16:37:12.384699872 -0700 +++ 25-akpm/arch/m32r/drivers/m32r_cfc.c 2004-09-11 16:37:12.390698960 -0700 @@ -4,7 +4,7 @@ * Device driver for the CFC functionality of M32R. * * Copyright (c) 2001, 2002, 2003, 2004 - * Hiroyuki Kondo, Sugai Naotom, Hayato Fujiwara + * Hiroyuki Kondo, Naoto Sugai, Hayato Fujiwara */ #include @@ -592,15 +592,15 @@ static int _pcc_set_mem_map(u_short sock u_long addr; pcc_socket_t *t = &socket[sock]; - DEBUG(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, %#5.5lx-%#5.5" - "lx, %#5.5x)\n", sock, map, mem->flags, mem->speed, - mem->sys_start, mem->sys_stop, mem->card_start); + DEBUG(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, " + "%#5.5lx-%#5.5lx, %#5.5x)\n", sock, map, mem->flags, + mem->speed, mem->res->start, mem->res->end, mem->card_start); /* * sanity check */ if ((map > MAX_WIN) || (mem->card_start > 0x3ffffff) || - (mem->sys_start > mem->sys_stop)) { + (mem->res->start > mem->res->end)) { return -EINVAL; } @@ -635,8 +635,8 @@ static int _pcc_set_mem_map(u_short sock addr = t->mapaddr + (mem->card_start & M32R_PCC_MAPMASK); // pcc_set(sock, PCADR, addr); - mem->sys_start = addr + mem->card_start; - mem->sys_stop = mem->sys_start + (M32R_PCC_MAPSIZE - 1); + mem->res->start = addr + mem->card_start; + mem->res->end = mem->res->start + (M32R_PCC_MAPSIZE - 1); /* * Set timing diff -puN arch/m32r/drivers/m32r_pcc.c~m32r-update-cf-pcmcia-drivers arch/m32r/drivers/m32r_pcc.c --- 25/arch/m32r/drivers/m32r_pcc.c~m32r-update-cf-pcmcia-drivers 2004-09-11 16:37:12.385699720 -0700 +++ 25-akpm/arch/m32r/drivers/m32r_pcc.c 2004-09-11 16:37:12.390698960 -0700 @@ -1,8 +1,11 @@ -/*====================================================================== - - Device driver for the PCMCIA functionality of M32R. - -======================================================================*/ +/* + * linux/arch/m32r/drivers/m32r_pcc.c + * + * Device driver for the PCMCIA functionality of M32R. + * + * Copyright (c) 2001, 2002, 2003, 2004 + * Hiroyuki Kondo, Naoto Sugai, Hayato Fujiwara + */ #include #include @@ -524,15 +527,15 @@ static int _pcc_set_mem_map(u_short sock #endif #endif - DEBUG(3, "m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, %#5.5lx-%#5.5" - "lx, %#5.5x)\n", sock, map, mem->flags, mem->speed, - mem->sys_start, mem->sys_stop, mem->card_start); + DEBUG(3, "m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, " + "%#5.5lx-%#5.5lx, %#5.5x)\n", sock, map, mem->flags, + mem->speed, mem->res->start, mem->res->end, mem->card_start); /* * sanity check */ if ((map > MAX_WIN) || (mem->card_start > 0x3ffffff) || - (mem->sys_start > mem->sys_stop)) { + (mem->res->start > mem->res->end)) { return -EINVAL; } @@ -567,8 +570,8 @@ static int _pcc_set_mem_map(u_short sock addr = t->mapaddr + (mem->card_start & M32R_PCC_MAPMASK); pcc_set(sock, PCADR, addr); - mem->sys_start = addr + mem->card_start; - mem->sys_stop = mem->sys_start + (M32R_PCC_MAPSIZE - 1); + mem->res->start = addr + mem->card_start; + mem->res->end = mem->res->start + (M32R_PCC_MAPSIZE - 1); /* * Enable again _