Commit 8cd13562 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 3f66d6ac 9514d15a
......@@ -822,19 +822,6 @@ int bluecard_close(bluecard_info_t *info)
return 0;
}
/* ======================== Card services ======================== */
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
dev_link_t *bluecard_attach(void)
{
bluecard_info_t *info;
......
......@@ -569,19 +569,6 @@ int bt3c_close(bt3c_info_t *info)
return 0;
}
/* ======================== Card services ======================== */
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
dev_link_t *bt3c_attach(void)
{
bt3c_info_t *info;
......
......@@ -576,19 +576,6 @@ int btuart_close(btuart_info_t *info)
return 0;
}
/* ======================== Card services ======================== */
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
dev_link_t *btuart_attach(void)
{
btuart_info_t *info;
......
......@@ -555,19 +555,6 @@ int dtl1_close(dtl1_info_t *info)
return 0;
}
/* ======================== Card services ======================== */
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
dev_link_t *dtl1_attach(void)
{
dtl1_info_t *info;
......
......@@ -527,12 +527,6 @@ static void mgslpc_detach(dev_link_t *);
static dev_info_t dev_info = "synclink_cs";
static dev_link_t *dev_list = NULL;
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*
* 1st function defined in .text section. Calling this function in
* init_module() followed by a breakpoint allows a remote debugger
......
......@@ -103,14 +103,6 @@ static void ide_detach(dev_link_t *);
static dev_link_t *dev_list = NULL;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
ide_attach() creates an "instance" of the driver, allocating
......
......@@ -118,14 +118,6 @@ typedef struct local_info_t {
dev_node_t node;
} local_info_t;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
avmcs_attach() creates an "instance" of the driver, allocating
......
......@@ -130,14 +130,6 @@ typedef struct local_info_t {
dev_node_t node;
} local_info_t;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
avma1cs_attach() creates an "instance" of the driver, allocating
......
......@@ -170,14 +170,6 @@ typedef struct local_info_t {
int busy;
} local_info_t;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret};
CardServices(ReportError, handle, &err);
}
/*======================================================================
elsa_cs_attach() creates an "instance" of the driver, allocatingx
......
......@@ -178,14 +178,6 @@ typedef struct local_info_t {
int stop;
} local_info_t;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
sedlbauer_attach() creates an "instance" of the driver, allocating
......
......@@ -106,16 +106,7 @@ MODULE_PARM(mem_type, "i");
MODULE_PARM_DESC(mem_type, "Set Memory type (0=Flash, 1=RAM, 2=ROM, default=0)");
static inline void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/* read/write{8,16} copy_{from,to} routines with window remapping to access whole card */
static caddr_t remap_window(struct map_info *map, unsigned long to)
{
struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1;
......
......@@ -273,16 +273,6 @@ static void flush_stale_links(void)
}
}
static void cs_error(client_handle_t handle, int func, int ret)
{
#if CS_RELEASE_CODE < 0x2911
CardServices(ReportError, dev_info, (void *)func, (void *)ret);
#else
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
#endif
}
/*
tc574_attach() creates an "instance" of the driver, allocating
local data structures for one device. The device is registered
......
......@@ -193,14 +193,6 @@ static void flush_stale_links(void)
}
}
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
tc589_attach() creates an "instance" of the driver, allocating
......
......@@ -157,14 +157,6 @@ static void flush_stale_links(void)
}
}
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
We never need to do anything when a axnet device is "initialized"
......
......@@ -163,14 +163,6 @@ static void flush_stale_links(void)
}
}
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
com20020_attach() creates an "instance" of the driver, allocating
......
......@@ -261,16 +261,6 @@ static void flush_stale_links(void)
}
}
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*====================================================================*/
static dev_link_t *fmvj18x_attach(void)
{
local_info_t *lp;
......
......@@ -157,14 +157,6 @@ static void flush_stale_links(void)
}
}
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
{
u32 ethcmd;
......
......@@ -456,17 +456,6 @@ static void flush_stale_links(void)
}
}
/* ----------------------------------------------------------------------------
cs_error
Report a Card Services related error.
---------------------------------------------------------------------------- */
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/* ----------------------------------------------------------------------------
nmclan_attach
Creates an "instance" of the driver, allocating local data
......
......@@ -255,14 +255,6 @@ static void flush_stale_links(void)
}
}
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
We never need to do anything when a pcnet device is "initialized"
......
......@@ -324,14 +324,6 @@ static void flush_stale_links(void)
}
}
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
smc91c92_attach() creates an "instance" of the driver, allocating
......
......@@ -403,13 +403,6 @@ flush_stale_links(void)
}
}
static void
cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
static int
get_tuple_data(int fn, client_handle_t handle, tuple_t *tuple)
{
......
......@@ -161,14 +161,6 @@ typedef struct local_info_t {
struct net_device *eth_dev;
} local_info_t;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
This bit of code is used to avoid unregistering network devices
......
......@@ -353,14 +353,6 @@ static inline short get_int16(u_char* staddr)
return readw(staddr);
}
/**************************************************************************/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*
* Wait until the WOC (Write Operation Complete) bit in the
* ASR (Adapter Status Register) is asserted.
......
......@@ -144,14 +144,6 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
/* PCMCIA stuff */
/********************************************************************/
static void
cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/* Remove zombie instances (card removed, detach pending) */
static void
flush_stale_links(void)
......
......@@ -314,12 +314,6 @@ static char hop_pattern_length[] = { 1,
static char rcsid[] = "Raylink/WebGear wireless LAN - Corey <Thomas corey@world.std.com>";
/*===========================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
pcmcia_report_error(handle, &err);
}
/*======================================================================
This bit of code is used to avoid unregistering network devices
......
......@@ -65,16 +65,6 @@
* (wavelan modem or i82593)
*/
/*------------------------------------------------------------------*/
/*
* Wrapper for reporting error to cardservices
*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
#ifdef STRUCT_CHECK
/*------------------------------------------------------------------*/
/*
......
......@@ -103,14 +103,6 @@ static int parport_event(event_t event, int priority,
static dev_info_t dev_info = "parport_cs";
static dev_link_t *dev_list = NULL;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
parport_attach() creates an "instance" of the driver, allocating
......
......@@ -130,11 +130,12 @@ extern struct proc_dir_entry *proc_pccard;
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
pcmcia_report_error(handle, &err);
error_info_t err = { func, ret };
pcmcia_report_error(handle, &err);
}
EXPORT_SYMBOL(cs_error);
/*======================================================================*/
......
......@@ -113,16 +113,6 @@ static void aha152x_detach(dev_link_t *);
static dev_link_t *dev_list;
static dev_info_t dev_info = "aha152x_cs";
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*====================================================================*/
static dev_link_t *aha152x_attach(void)
{
scsi_info_t *info;
......
......@@ -103,16 +103,6 @@ static dev_link_t *dev_list = NULL;
static dev_info_t dev_info = "fdomain_cs";
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*====================================================================*/
static dev_link_t *fdomain_attach(void)
{
scsi_info_t *info;
......
......@@ -1469,13 +1469,6 @@ static int nsp_eh_host_reset(Scsi_Cmnd *SCpnt)
PCMCIA functions
**********************************************************************/
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
nsp_cs_attach() creates an "instance" of the driver, allocating
local data structures for one device. The device is registered
......
......@@ -102,16 +102,6 @@ static dev_link_t *dev_list = NULL;
static dev_info_t dev_info = "qlogic_cs";
/*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*====================================================================*/
static dev_link_t *qlogic_attach(void)
{
scsi_info_t *info;
......
......@@ -122,15 +122,6 @@ static void serial_detach(dev_link_t *);
static dev_link_t *dev_list = NULL;
/*====================================================================*/
static void
cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
/*======================================================================
After a card is removed, do_serial_release() will unregister
......
......@@ -43,15 +43,6 @@ static int ixj_event(event_t event, int priority, event_callback_args_t * args);
static dev_info_t dev_info = "ixj_cs";
static dev_link_t *dev_list = NULL;
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err =
{
func, ret
};
CardServices(ReportError, handle, &err);
}
static dev_link_t *ixj_attach(void)
{
client_reg_t client_reg;
......
......@@ -141,11 +141,6 @@ typedef struct dev_link_t {
#define DEV_OK(l) \
((l) && ((l->state & ~DEV_BUSY) == (DEV_CONFIG|DEV_PRESENT)))
int register_pccard_driver(dev_info_t *dev_info,
dev_link_t *(*attach)(void),
void (*detach)(dev_link_t *));
int unregister_pccard_driver(dev_info_t *dev_info);
extern struct bus_type pcmcia_bus_type;
......@@ -157,9 +152,18 @@ struct pcmcia_driver {
struct device_driver drv;
};
/* driver registration */
int pcmcia_register_driver(struct pcmcia_driver *driver);
void pcmcia_unregister_driver(struct pcmcia_driver *driver);
#endif /* __KERNEL__ */
/* legacy driver registration interface. don't use in new code */
int register_pccard_driver(dev_info_t *dev_info,
dev_link_t *(*attach)(void),
void (*detach)(dev_link_t *));
int unregister_pccard_driver(dev_info_t *dev_info);
/* error reporting */
void cs_error(client_handle_t handle, int func, int ret);
#endif /* __KERNEL__ */
#endif /* _LINUX_DS_H */
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