diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:09:00 -0500 |
commit | 3272244c2b1a8f13cec83c04b8245fa7fcb47a27 (patch) | |
tree | dd6db1d885d98ac5f945d676961b3e267ed31440 /drivers/macintosh | |
parent | b4290a23cfa9040e2f0de5ab57d6ea65abaf053b (diff) |
[PATCH] m68k: switch mac/misc.c to direct use of appropriate cuda/pmu/maciisi requests
kill ADBREQ_RAW use, replace adb_read_time(), etc. with per-type variants,
eliminated remapping from pmu ones, fix the ifdefs (PMU->PMU68K)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/via-maciisi.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c index a1966975d58f..ad271e705a31 100644 --- a/drivers/macintosh/via-maciisi.c +++ b/drivers/macintosh/via-maciisi.c | |||
@@ -294,6 +294,24 @@ static void maciisi_sync(struct adb_request *req) | |||
294 | printk(KERN_ERR "maciisi_send_request: poll timed out!\n"); | 294 | printk(KERN_ERR "maciisi_send_request: poll timed out!\n"); |
295 | } | 295 | } |
296 | 296 | ||
297 | int | ||
298 | maciisi_request(struct adb_request *req, void (*done)(struct adb_request *), | ||
299 | int nbytes, ...) | ||
300 | { | ||
301 | va_list list; | ||
302 | int i; | ||
303 | |||
304 | req->nbytes = nbytes; | ||
305 | req->done = done; | ||
306 | req->reply_expected = 0; | ||
307 | va_start(list, nbytes); | ||
308 | for (i = 0; i < nbytes; i++) | ||
309 | req->data[i++] = va_arg(list, int); | ||
310 | va_end(list); | ||
311 | |||
312 | return maciisi_send_request(req, 1); | ||
313 | } | ||
314 | |||
297 | /* Enqueue a request, and run the queue if possible */ | 315 | /* Enqueue a request, and run the queue if possible */ |
298 | static int | 316 | static int |
299 | maciisi_write(struct adb_request* req) | 317 | maciisi_write(struct adb_request* req) |