Commit 38be2661 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds

[PATCH] pcmcia: socket->{a,c}region are unused

From: Christoph Hellwig <hch@lst.de>

socket->{a,c}_region aren't ever touched elsewhere, so let's kill this.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDominik Brodowski <linux@brodo.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c0e742d4
...@@ -341,25 +341,13 @@ EXPORT_SYMBOL(pcmcia_get_socket_by_nr); ...@@ -341,25 +341,13 @@ EXPORT_SYMBOL(pcmcia_get_socket_by_nr);
/*====================================================================== /*======================================================================
Shutdown_Socket() and setup_socket() are scheduled using add_timer socket_setup() and shutdown_socket() are called by the main event
calls by the main event handler when card insertion and removal handler when card insertion and removal events are received.
events are received. Shutdown_Socket() unconfigures a socket and socket_setup() turns on socket power and resets the socket, in two stages.
turns off socket power. Setup_socket() turns on socket power shutdown_socket() unconfigures a socket and turns off socket power.
and resets the socket, in two stages.
======================================================================*/ ======================================================================*/
static void free_regions(memory_handle_t *list)
{
memory_handle_t tmp;
while (*list != NULL) {
tmp = *list;
*list = tmp->info.next;
tmp->region_magic = 0;
kfree(tmp);
}
}
static void shutdown_socket(struct pcmcia_socket *s) static void shutdown_socket(struct pcmcia_socket *s)
{ {
cs_dbg(s, 1, "shutdown_socket\n"); cs_dbg(s, 1, "shutdown_socket\n");
...@@ -379,8 +367,6 @@ static void shutdown_socket(struct pcmcia_socket *s) ...@@ -379,8 +367,6 @@ static void shutdown_socket(struct pcmcia_socket *s)
kfree(s->config); kfree(s->config);
s->config = NULL; s->config = NULL;
} }
free_regions(&s->a_region);
free_regions(&s->c_region);
{ {
int status; int status;
......
...@@ -165,7 +165,6 @@ typedef struct window_t { ...@@ -165,7 +165,6 @@ typedef struct window_t {
#define MAX_WIN 4 #define MAX_WIN 4
struct config_t; struct config_t;
struct region_t;
struct pcmcia_callback; struct pcmcia_callback;
...@@ -185,7 +184,6 @@ struct pcmcia_socket { ...@@ -185,7 +184,6 @@ struct pcmcia_socket {
} irq; } irq;
io_window_t io[MAX_IO_WIN]; io_window_t io[MAX_IO_WIN];
window_t win[MAX_WIN]; window_t win[MAX_WIN];
struct region_t *c_region, *a_region;
struct list_head cis_cache; struct list_head cis_cache;
u_int fake_cis_len; u_int fake_cis_len;
char *fake_cis; char *fake_cis;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment