From 5cf802800d1a5f48b0d865dae2e48a2a0c19d0d1 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:29:10 -0800 Subject: [PATCH] [PATCH] serial_cs CardServices removal fix From: Russell King --- drivers/serial/serial_cs.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 705236631ec84..ba3d16a789f10 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c @@ -300,10 +300,10 @@ static int setup_serial(struct serial_info * info, ioaddr_t port, int irq) /*====================================================================*/ static int -get_tuple(int fn, client_handle_t handle, tuple_t * tuple, cisparse_t * parse) +first_tuple(client_handle_t handle, tuple_t * tuple, cisparse_t * parse) { int i; - i = CardServices(fn, handle, tuple); + i = pcmcia_get_first_tuple(handle, tuple); if (i != CS_SUCCESS) return CS_NO_MORE_ITEMS; i = pcmcia_get_tuple_data(handle, tuple); @@ -312,8 +312,18 @@ get_tuple(int fn, client_handle_t handle, tuple_t * tuple, cisparse_t * parse) return pcmcia_parse_tuple(handle, tuple, parse); } -#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c) -#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c) +static int +next_tuple(client_handle_t handle, tuple_t * tuple, cisparse_t * parse) +{ + int i; + i = pcmcia_get_next_tuple(handle, tuple); + if (i != CS_SUCCESS) + return CS_NO_MORE_ITEMS; + i = pcmcia_get_tuple_data(handle, tuple); + if (i != CS_SUCCESS) + return i; + return pcmcia_parse_tuple(handle, tuple, parse); +} /*====================================================================*/ -- 2.53.0