From: Hirokazu Takata <takata@linux-m32r.org>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, takata@linux-m32r.org
Subject: [PATCH 2.6.9-rc1-mm4 6/6] [m32r] Update CF/PCMCIA drivers
Date: Sun, 12 Sep 2004 05:51:23 +0900 (JST) [thread overview]
Message-ID: <20040912.055123.719890756.takata@linux-m32r.org> (raw)
In-Reply-To: <20040912.052403.730551818.takata@linux-m32r.org>
[PATCH 2.6.9-rc1-mm4 6/6] [m32r] Update CF/PCMCIA drivers
This patch updates m32r-specific CF/PCMCIA drivers and
fixes compile errors.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
---
arch/m32r/drivers/m32r_cfc.c | 14 +++++++-------
arch/m32r/drivers/m32r_pcc.c | 25 ++++++++++++++-----------
2 files changed, 21 insertions(+), 18 deletions(-)
diff -ruNp linux-2.6.9-rc1-mm4.orig/arch/m32r/drivers/m32r_cfc.c linux-2.6.9-rc1-mm4/arch/m32r/drivers/m32r_cfc.c
--- linux-2.6.9-rc1-mm4.orig/arch/m32r/drivers/m32r_cfc.c 2004-09-08 08:14:03.000000000 +0900
+++ linux-2.6.9-rc1-mm4/arch/m32r/drivers/m32r_cfc.c 2004-09-12 01:53:40.000000000 +0900
@@ -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 <linux/module.h>
@@ -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 -ruNp linux-2.6.9-rc1-mm4.orig/arch/m32r/drivers/m32r_pcc.c linux-2.6.9-rc1-mm4/arch/m32r/drivers/m32r_pcc.c
--- linux-2.6.9-rc1-mm4.orig/arch/m32r/drivers/m32r_pcc.c 2004-09-08 08:14:03.000000000 +0900
+++ linux-2.6.9-rc1-mm4/arch/m32r/drivers/m32r_pcc.c 2004-09-12 01:53:54.000000000 +0900
@@ -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 <linux/module.h>
#include <linux/moduleparam.h>
@@ -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
--
Hirokazu Takata <takata@linux-m32r.org>
Linux/M32R Project: http://www.linux-m32r.org/
next prev parent reply other threads:[~2004-09-11 20:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-11 20:24 [PATCH 2.6.9-rc1-mm4 0/6] [m32r] Update to fix compile errors Hirokazu Takata
2004-09-11 20:43 ` [PATCH 2.6.9-rc1-mm4 1/6] [m32r] Update for profiling Hirokazu Takata
2004-09-11 20:48 ` [PATCH 2.6.9-rc1-mm4 2/6] [m32r] Update zone_sizes_init() Hirokazu Takata
2004-09-11 20:51 ` [PATCH 2.6.9-rc1-mm4 3/6] [m32r] Update to fix compile errors Hirokazu Takata
2004-09-11 20:51 ` [PATCH 2.6.9-rc1-mm4 4/6] [m32r] Update uaccess.h Hirokazu Takata
2004-09-11 20:51 ` [PATCH 2.6.9-rc1-mm4 5/6] [m32r] Update checksum functions Hirokazu Takata
2004-09-11 20:51 ` Hirokazu Takata [this message]
2004-09-11 21:02 ` [PATCH 2.6.9-rc1-mm4 6/6] [m32r] Update CF/PCMCIA drivers Christoph Hellwig
2004-09-11 21:05 ` Arjan van de Ven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040912.055123.719890756.takata@linux-m32r.org \
--to=takata@linux-m32r.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®