From 9be62e3b90125723fccbe423faf1ea95afe92bcc Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 22 Feb 2003 18:47:42 -0800 Subject: [PATCH] [PATCH] Remove dummy cb_config() and cb_release() cb_config() and cb_release() are just simple dummy functions that are only used in the internals of the PCMCIA code. We inline them where used. --- drivers/pcmcia/cardbus.c | 32 -------------------------------- drivers/pcmcia/cs.c | 7 ++----- drivers/pcmcia/cs_internal.h | 2 -- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c index adbecd7521749..84bf602396fdd 100644 --- a/drivers/pcmcia/cardbus.c +++ b/drivers/pcmcia/cardbus.c @@ -333,38 +333,6 @@ void cb_free(socket_info_t * s) } } -/*===================================================================== - - cb_config() has the job of allocating all system resources that - a Cardbus card requires. Rather than using the CIS (which seems - to not always be present), it treats the card as an ordinary PCI - device, and probes the base address registers to determine each - function's IO and memory space needs. - - It is called from the RequestIO card service. - -======================================================================*/ - -int cb_config(socket_info_t * s) -{ - return CS_SUCCESS; -} - -/*====================================================================== - - cb_release() releases all the system resources (IO and memory - space, and interrupt) committed for a Cardbus card by a prior call - to cb_config(). - - It is called from the ReleaseIO() service. - -======================================================================*/ - -void cb_release(socket_info_t * s) -{ - DEBUG(0, "cs: cb_release(bus %d)\n", s->cap.cb_dev->subordinate->number); -} - /*===================================================================== cb_enable() has the job of configuring a socket for a Cardbus diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 16c49060595cb..88fe64a0ac9d1 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -1569,7 +1569,6 @@ int pcmcia_release_io(client_handle_t handle, io_req_t *req) #ifdef CONFIG_CARDBUS if (handle->state & CLIENT_CARDBUS) { - cb_release(s); return CS_SUCCESS; } #endif @@ -1811,10 +1810,8 @@ int pcmcia_request_io(client_handle_t handle, io_req_t *req) if (handle->state & CLIENT_CARDBUS) { #ifdef CONFIG_CARDBUS - int ret = cb_config(s); - if (ret == CS_SUCCESS) - handle->state |= CLIENT_IO_REQ; - return ret; + handle->state |= CLIENT_IO_REQ; + return CS_SUCCESS; #else return CS_UNSUPPORTED_FUNCTION; #endif diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 75731296aac30..55bf1220e36d2 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -198,8 +198,6 @@ typedef struct socket_info_t { /* In cardbus.c */ int cb_alloc(socket_info_t *s); void cb_free(socket_info_t *s); -int cb_config(socket_info_t *s); -void cb_release(socket_info_t *s); void cb_enable(socket_info_t *s); void cb_disable(socket_info_t *s); int read_cb_mem(socket_info_t *s, u_char fn, int space, -- 2.53.0