Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1540eec5 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[PATCH] pcmcia: remove pcmcia_compat.c 



Remove the compatibility wrappers, as they can (now) also be implemented
using macros. Please continue using these wrappers instead of new functions
until a new API has stabilized.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent e904663b

drivers/pcmcia/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ pcmcia_core-y += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o 
pcmcia_core-$(CONFIG_CARDBUS)			+= cardbus.o

obj-$(CONFIG_PCCARD)				+= pcmcia_core.o



pcmcia-y					+= ds.o pcmcia_compat.o pcmcia_resource.o

pcmcia-y					+= ds.o pcmcia_resource.o

pcmcia-$(CONFIG_PCMCIA_IOCTL)			+= pcmcia_ioctl.o

obj-$(CONFIG_PCMCIA)				+= pcmcia.o

drivers/pcmcia/pcmcia_compat.c

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
/*

 * PCMCIA 16-bit compatibility functions

 *

 * The initial developer of the original code is David A. Hinds

 * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds

 * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.

 *

 * Copyright (C) 2004 Dominik Brodowski

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */



#include <linux/module.h>

#include <linux/init.h>



#define IN_CARD_SERVICES

#include <pcmcia/cs_types.h>

#include <pcmcia/cs.h>

#include <pcmcia/bulkmem.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ds.h>

#include <pcmcia/ss.h>



#include "cs_internal.h"



int pcmcia_get_first_tuple(struct pcmcia_device *p_dev, tuple_t *tuple)

{

	return pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple);

}

EXPORT_SYMBOL(pcmcia_get_first_tuple);



int pcmcia_get_next_tuple(struct pcmcia_device *p_dev, tuple_t *tuple)

{

	return pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple);

}

EXPORT_SYMBOL(pcmcia_get_next_tuple);



int pcmcia_get_tuple_data(struct pcmcia_device *p_dev, tuple_t *tuple)

{

	return pccard_get_tuple_data(p_dev->socket, tuple);

}

EXPORT_SYMBOL(pcmcia_get_tuple_data);



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(struct pcmcia_device *p_dev, cisinfo_t *info)

{

	return pccard_validate_cis(p_dev->socket, p_dev->func, info);

}

EXPORT_SYMBOL(pcmcia_validate_cis);





int pcmcia_reset_card(struct pcmcia_device *p_dev, client_req_t *req)

{

	return pccard_reset_card(p_dev->socket);

}

EXPORT_SYMBOL(pcmcia_reset_card);

include/pcmcia/cistpl.h

+16 −5
Original line number Diff line number Diff line
@@ -586,12 +586,7 @@ typedef struct cisdump_t { 
    cisdata_t	Data[CISTPL_MAX_CIS_SIZE];

} cisdump_t;



int pcmcia_get_first_tuple(client_handle_t handle, tuple_t *tuple);

int pcmcia_get_next_tuple(client_handle_t handle, tuple_t *tuple);

int pcmcia_get_tuple_data(client_handle_t handle, tuple_t *tuple);

int pcmcia_parse_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse);



int pcmcia_validate_cis(client_handle_t handle, cisinfo_t *info);

int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis);



/* don't use outside of PCMCIA core yet */
@@ -602,4 +597,20 @@ int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse); 


int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_t *info);



/* ... but use these wrappers instead */

#define pcmcia_get_first_tuple(p_dev, tuple) \

		pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple)



#define pcmcia_get_next_tuple(p_dev, tuple) \

		pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple)



#define pcmcia_get_tuple_data(p_dev, tuple) \

		pccard_get_tuple_data(p_dev->socket, tuple)



#define pcmcia_parse_tuple(p_dev, tuple, parse) \

		pccard_parse_tuple(tuple, parse)



#define pcmcia_validate_cis(p_dev, info) \

		pccard_validate_cis(p_dev->socket, p_dev->func, info)



#endif /* LINUX_CISTPL_H */

include/pcmcia/cs.h

+5 −1
Original line number Diff line number Diff line
@@ -386,15 +386,19 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev, config_req_t *req) 
int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req);

int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req);

int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_handle_t *wh);

int pcmcia_reset_card(struct pcmcia_device *p_dev, client_req_t *req);

int pcmcia_suspend_card(struct pcmcia_socket *skt);

int pcmcia_resume_card(struct pcmcia_socket *skt);

int pcmcia_eject_card(struct pcmcia_socket *skt);

int pcmcia_insert_card(struct pcmcia_socket *skt);

int pccard_reset_card(struct pcmcia_socket *skt);



struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);

void pcmcia_put_socket(struct pcmcia_socket *skt);



/* compatibility functions */

#define pcmcia_reset_card(p_dev, req) \

		pccard_reset_card(p_dev->socket)



#endif /* __KERNEL__ */



#endif /* _LINUX_CS_H */