Skip to content

Commit

Permalink
[PATCH] pcmcia: reduce client_handle_t usage
Browse files Browse the repository at this point in the history 
Reduce the occurences of "client_handle_t" which is nothing else than a
pointer to struct pcmcia_device by now.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Dominik Brodowski authored and Linus Torvalds committed Jul 8, 2005
1 parent e12a9a9 commit 2bc5a9b
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 154 deletions.
46 changes: 18 additions & 28 deletions drivers/pcmcia/ds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,15 @@ static const lookup_t service_table[] = {
};


static int pcmcia_report_error(client_handle_t handle, error_info_t *err)
static int pcmcia_report_error(struct pcmcia_device *p_dev, error_info_t *err)
{
int i;
char *serv;

if (!handle)
if (!p_dev)
printk(KERN_NOTICE);
else {
struct pcmcia_device *p_dev = handle_to_pdev(handle);
else
printk(KERN_NOTICE "%s: ", p_dev->dev.bus_id);
}

for (i = 0; i < ARRAY_SIZE(service_table); i++)
if (service_table[i].key == err->func)
Expand All @@ -193,10 +191,10 @@ static int pcmcia_report_error(client_handle_t handle, error_info_t *err)

/*======================================================================*/

void cs_error(client_handle_t handle, int func, int ret)
void cs_error(struct pcmcia_device *p_dev, int func, int ret)
{
error_info_t err = { func, ret };
pcmcia_report_error(handle, &err);
pcmcia_report_error(p_dev, &err);
}
EXPORT_SYMBOL(cs_error);

Expand Down Expand Up @@ -574,8 +572,6 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
else
no_funcs = 1;

/* this doesn't handle multifunction devices on one pcmcia function
* yet. */
for (i=0; i < no_funcs; i++)
pcmcia_device_add(s, i);

Expand Down Expand Up @@ -994,9 +990,8 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)



int pcmcia_register_client(client_handle_t *handle, client_reg_t *req)
int pcmcia_register_client(struct pcmcia_device **handle, client_reg_t *req)
{
struct pcmcia_device *client = NULL;
struct pcmcia_socket *s = NULL;
struct pcmcia_device *p_dev = NULL;
struct pcmcia_driver *p_drv = NULL;
Expand Down Expand Up @@ -1024,7 +1019,6 @@ int pcmcia_register_client(client_handle_t *handle, client_reg_t *req)
}
p_drv = to_pcmcia_drv(p_dev->dev.driver);
if (!strncmp(p_drv->drv.name, (char *)req->dev_info, DEV_NAME_LEN)) {
client = p_dev;
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
goto found;
}
Expand All @@ -1035,7 +1029,7 @@ int pcmcia_register_client(client_handle_t *handle, client_reg_t *req)
}
found:
up_read(&pcmcia_socket_list_rwsem);
if (!p_dev || !client)
if (!p_dev)
return -ENODEV;

pcmcia_put_socket(s); /* safe, as we already hold a reference from bind_device */
Expand All @@ -1046,12 +1040,9 @@ int pcmcia_register_client(client_handle_t *handle, client_reg_t *req)
p_dev->event_callback_args.client_handle = p_dev;


if (s->state & SOCKET_CARDBUS)
client->state |= CLIENT_CARDBUS;

if ((!(s->state & SOCKET_CARDBUS)) && (s->functions == 0)) {
if (!s->functions) {
cistpl_longlink_mfc_t mfc;
if (pccard_read_tuple(s, client->func, CISTPL_LONGLINK_MFC, &mfc)
if (pccard_read_tuple(s, p_dev->func, CISTPL_LONGLINK_MFC, &mfc)
== CS_SUCCESS)
s->functions = mfc.nfn;
else
Expand All @@ -1064,7 +1055,7 @@ int pcmcia_register_client(client_handle_t *handle, client_reg_t *req)
}

ds_dbg(1, "register_client(): client 0x%p, dev %s\n",
client, p_dev->dev.bus_id);
p_dev, p_dev->dev.bus_id);

if ((s->state & (SOCKET_PRESENT|SOCKET_CARDBUS)) == SOCKET_PRESENT) {
if (p_drv->event)
Expand Down Expand Up @@ -1112,26 +1103,25 @@ static int unbind_request(struct pcmcia_socket *s)
return 0;
} /* unbind_request */

int pcmcia_deregister_client(client_handle_t handle)
int pcmcia_deregister_client(struct pcmcia_device *p_dev)
{
struct pcmcia_socket *s;
int i;
struct pcmcia_device *p_dev = handle_to_pdev(handle);

s = SOCKET(handle);
ds_dbg(1, "deregister_client(%p)\n", handle);
s = p_dev->socket;
ds_dbg(1, "deregister_client(%p)\n", p_dev);

if (handle->state & (CLIENT_IRQ_REQ|CLIENT_IO_REQ|CLIENT_CONFIG_LOCKED))
if (p_dev->state & (CLIENT_IRQ_REQ|CLIENT_IO_REQ|CLIENT_CONFIG_LOCKED))
goto warn_out;
for (i = 0; i < MAX_WIN; i++)
if (handle->state & CLIENT_WIN_REQ(i))
if (p_dev->state & CLIENT_WIN_REQ(i))
goto warn_out;

if (handle->state & CLIENT_STALE) {
handle->state &= ~CLIENT_STALE;
if (p_dev->state & CLIENT_STALE) {
p_dev->state &= ~CLIENT_STALE;
pcmcia_put_dev(p_dev);
} else {
handle->state = CLIENT_UNBOUND;
p_dev->state = CLIENT_UNBOUND;
}

return CS_SUCCESS;
Expand Down
36 changes: 11 additions & 25 deletions drivers/pcmcia/pcmcia_compat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,53 +28,39 @@

#include "cs_internal.h"

int pcmcia_get_first_tuple(client_handle_t handle, tuple_t *tuple)
int pcmcia_get_first_tuple(struct pcmcia_device *p_dev, tuple_t *tuple)
{
struct pcmcia_socket *s;
s = SOCKET(handle);
return pccard_get_first_tuple(s, handle->func, tuple);
return pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple);
}
EXPORT_SYMBOL(pcmcia_get_first_tuple);

int pcmcia_get_next_tuple(client_handle_t handle, tuple_t *tuple)
int pcmcia_get_next_tuple(struct pcmcia_device *p_dev, tuple_t *tuple)
{
struct pcmcia_socket *s;
s = SOCKET(handle);
return pccard_get_next_tuple(s, handle->func, tuple);
return pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple);
}
EXPORT_SYMBOL(pcmcia_get_next_tuple);

int pcmcia_get_tuple_data(client_handle_t handle, tuple_t *tuple)
int pcmcia_get_tuple_data(struct pcmcia_device *p_dev, tuple_t *tuple)
{
struct pcmcia_socket *s;
s = SOCKET(handle);
return pccard_get_tuple_data(s, tuple);
return pccard_get_tuple_data(p_dev->socket, tuple);
}
EXPORT_SYMBOL(pcmcia_get_tuple_data);

int pcmcia_parse_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
int pcmcia_parse_tuple(struct pcmcia_device *p_dev, tuple_t *tuple, cisparse_t *parse)
{
return pccard_parse_tuple(tuple, parse);
}
EXPORT_SYMBOL(pcmcia_parse_tuple);

int pcmcia_validate_cis(client_handle_t handle, cisinfo_t *info)
int pcmcia_validate_cis(struct pcmcia_device *p_dev, cisinfo_t *info)
{
struct pcmcia_socket *s;
s = SOCKET(handle);
return pccard_validate_cis(s, handle->func, info);
return pccard_validate_cis(p_dev->socket, p_dev->func, info);
}
EXPORT_SYMBOL(pcmcia_validate_cis);


int pcmcia_reset_card(client_handle_t handle, client_req_t *req)
int pcmcia_reset_card(struct pcmcia_device *p_dev, client_req_t *req)
{
struct pcmcia_socket *skt;

skt = SOCKET(handle);
if (!skt)
return CS_BAD_HANDLE;

return pccard_reset_card(skt);
return pccard_reset_card(p_dev->socket);
}
EXPORT_SYMBOL(pcmcia_reset_card);
Loading

0 comments on commit 2bc5a9b

Please sign in to comment.