mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-15 08:44:14 +08:00
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (wireless)
Convert PCMCIA drivers to use the dynamic debug infrastructure, instead of requiring manual settings of PCMCIA_DEBUG. Also, remove all usages of the CS_CHECK macro and replace them with proper Linux style calling and return value checking. The extra error reporting may be dropped, as the PCMCIA core already complains about any (non-driver-author) errors. CC: linux-wireless@vger.kernel.org CC: netdev@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski
parent
624dd66957
commit
2caff14713
@ -43,21 +43,6 @@
|
||||
|
||||
#include "airo.h"
|
||||
|
||||
/*
|
||||
All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
|
||||
you do not define PCMCIA_DEBUG at all, all the debug code will be
|
||||
left out. If you compile with PCMCIA_DEBUG=0, the debug code will
|
||||
be present but disabled -- but it can then be enabled for specific
|
||||
modules at load time with a 'pc_debug=#' option to insmod.
|
||||
*/
|
||||
#ifdef PCMCIA_DEBUG
|
||||
static int pc_debug = PCMCIA_DEBUG;
|
||||
module_param(pc_debug, int, 0);
|
||||
static char *version = "$Revision: 1.2 $";
|
||||
#define DEBUG(n, args...) if (pc_debug > (n)) printk(KERN_DEBUG args);
|
||||
#else
|
||||
#define DEBUG(n, args...)
|
||||
#endif
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
@ -145,7 +130,7 @@ static int airo_probe(struct pcmcia_device *p_dev)
|
||||
{
|
||||
local_info_t *local;
|
||||
|
||||
DEBUG(0, "airo_attach()\n");
|
||||
dev_dbg(&p_dev->dev, "airo_attach()\n");
|
||||
|
||||
/* Interrupt setup */
|
||||
p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||
@ -184,7 +169,7 @@ static int airo_probe(struct pcmcia_device *p_dev)
|
||||
|
||||
static void airo_detach(struct pcmcia_device *link)
|
||||
{
|
||||
DEBUG(0, "airo_detach(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "airo_detach\n");
|
||||
|
||||
airo_release(link);
|
||||
|
||||
@ -204,9 +189,6 @@ static void airo_detach(struct pcmcia_device *link)
|
||||
|
||||
======================================================================*/
|
||||
|
||||
#define CS_CHECK(fn, ret) \
|
||||
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
|
||||
|
||||
static int airo_cs_config_check(struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cfg,
|
||||
cistpl_cftable_entry_t *dflt,
|
||||
@ -291,11 +273,11 @@ static int airo_config(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *dev;
|
||||
win_req_t *req;
|
||||
int last_fn, last_ret;
|
||||
int ret;
|
||||
|
||||
dev = link->priv;
|
||||
|
||||
DEBUG(0, "airo_config(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "airo_config\n");
|
||||
|
||||
req = kzalloc(sizeof(win_req_t), GFP_KERNEL);
|
||||
if (!req)
|
||||
@ -315,8 +297,8 @@ static int airo_config(struct pcmcia_device *link)
|
||||
* and most client drivers will only use the CIS to fill in
|
||||
* implementation-defined details.
|
||||
*/
|
||||
last_ret = pcmcia_loop_config(link, airo_cs_config_check, req);
|
||||
if (last_ret)
|
||||
ret = pcmcia_loop_config(link, airo_cs_config_check, req);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/*
|
||||
@ -324,21 +306,25 @@ static int airo_config(struct pcmcia_device *link)
|
||||
handler to the interrupt, unless the 'Handler' member of the
|
||||
irq structure is initialized.
|
||||
*/
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
||||
CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ) {
|
||||
ret = pcmcia_request_irq(link, &link->irq);
|
||||
if (ret)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/*
|
||||
This actually configures the PCMCIA socket -- setting up
|
||||
the I/O windows and the interrupt mapping, and putting the
|
||||
card and host interface into "Memory and IO" mode.
|
||||
*/
|
||||
CS_CHECK(RequestConfiguration,
|
||||
pcmcia_request_configuration(link, &link->conf));
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
if (ret)
|
||||
goto failed;
|
||||
((local_info_t *)link->priv)->eth_dev =
|
||||
init_airo_card(link->irq.AssignedIRQ,
|
||||
link->io.BasePort1, 1, &handle_to_dev(link));
|
||||
if (!((local_info_t *)link->priv)->eth_dev)
|
||||
goto cs_failed;
|
||||
goto failed;
|
||||
|
||||
/*
|
||||
At this point, the dev_node_t structure(s) need to be
|
||||
@ -368,8 +354,6 @@ static int airo_config(struct pcmcia_device *link)
|
||||
kfree(req);
|
||||
return 0;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
failed:
|
||||
airo_release(link);
|
||||
kfree(req);
|
||||
@ -386,7 +370,7 @@ static int airo_config(struct pcmcia_device *link)
|
||||
|
||||
static void airo_release(struct pcmcia_device *link)
|
||||
{
|
||||
DEBUG(0, "airo_release(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "airo_release\n");
|
||||
pcmcia_disable_device(link);
|
||||
}
|
||||
|
||||
|
||||
@ -55,22 +55,6 @@
|
||||
|
||||
#include "atmel.h"
|
||||
|
||||
/*
|
||||
All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
|
||||
you do not define PCMCIA_DEBUG at all, all the debug code will be
|
||||
left out. If you compile with PCMCIA_DEBUG=0, the debug code will
|
||||
be present but disabled -- but it can then be enabled for specific
|
||||
modules at load time with a 'pc_debug=#' option to insmod.
|
||||
*/
|
||||
|
||||
#ifdef PCMCIA_DEBUG
|
||||
static int pc_debug = PCMCIA_DEBUG;
|
||||
module_param(pc_debug, int, 0);
|
||||
static char *version = "$Revision: 1.2 $";
|
||||
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args);
|
||||
#else
|
||||
#define DEBUG(n, args...)
|
||||
#endif
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
@ -155,7 +139,7 @@ static int atmel_probe(struct pcmcia_device *p_dev)
|
||||
{
|
||||
local_info_t *local;
|
||||
|
||||
DEBUG(0, "atmel_attach()\n");
|
||||
dev_dbg(&p_dev->dev, "atmel_attach()\n");
|
||||
|
||||
/* Interrupt setup */
|
||||
p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||
@ -194,7 +178,7 @@ static int atmel_probe(struct pcmcia_device *p_dev)
|
||||
|
||||
static void atmel_detach(struct pcmcia_device *link)
|
||||
{
|
||||
DEBUG(0, "atmel_detach(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "atmel_detach\n");
|
||||
|
||||
atmel_release(link);
|
||||
|
||||
@ -209,9 +193,6 @@ static void atmel_detach(struct pcmcia_device *link)
|
||||
|
||||
======================================================================*/
|
||||
|
||||
#define CS_CHECK(fn, ret) \
|
||||
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
|
||||
|
||||
/* Call-back function to interrogate PCMCIA-specific information
|
||||
about the current existance of the card */
|
||||
static int card_present(void *arg)
|
||||
@ -275,13 +256,13 @@ static int atmel_config_check(struct pcmcia_device *p_dev,
|
||||
static int atmel_config(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *dev;
|
||||
int last_fn, last_ret;
|
||||
int ret;
|
||||
struct pcmcia_device_id *did;
|
||||
|
||||
dev = link->priv;
|
||||
did = dev_get_drvdata(&handle_to_dev(link));
|
||||
|
||||
DEBUG(0, "atmel_config(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "atmel_config\n");
|
||||
|
||||
/*
|
||||
In this loop, we scan the CIS for configuration table entries,
|
||||
@ -303,20 +284,25 @@ static int atmel_config(struct pcmcia_device *link)
|
||||
handler to the interrupt, unless the 'Handler' member of the
|
||||
irq structure is initialized.
|
||||
*/
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
||||
CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ) {
|
||||
ret = pcmcia_request_irq(link, &link->irq);
|
||||
if (ret)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/*
|
||||
This actually configures the PCMCIA socket -- setting up
|
||||
the I/O windows and the interrupt mapping, and putting the
|
||||
card and host interface into "Memory and IO" mode.
|
||||
*/
|
||||
CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
if (link->irq.AssignedIRQ == 0) {
|
||||
printk(KERN_ALERT
|
||||
"atmel: cannot assign IRQ: check that CONFIG_ISA is set in kernel config.");
|
||||
goto cs_failed;
|
||||
goto failed;
|
||||
}
|
||||
|
||||
((local_info_t*)link->priv)->eth_dev =
|
||||
@ -327,7 +313,7 @@ static int atmel_config(struct pcmcia_device *link)
|
||||
card_present,
|
||||
link);
|
||||
if (!((local_info_t*)link->priv)->eth_dev)
|
||||
goto cs_failed;
|
||||
goto failed;
|
||||
|
||||
|
||||
/*
|
||||
@ -340,8 +326,6 @@ static int atmel_config(struct pcmcia_device *link)
|
||||
|
||||
return 0;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
failed:
|
||||
atmel_release(link);
|
||||
return -ENODEV;
|
||||
@ -359,7 +343,7 @@ static void atmel_release(struct pcmcia_device *link)
|
||||
{
|
||||
struct net_device *dev = ((local_info_t*)link->priv)->eth_dev;
|
||||
|
||||
DEBUG(0, "atmel_release(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "atmel_release\n");
|
||||
|
||||
if (dev)
|
||||
stop_atmel_card(dev);
|
||||
|
||||
@ -510,10 +510,6 @@ static void prism2_detach(struct pcmcia_device *link)
|
||||
}
|
||||
|
||||
|
||||
#define CS_CHECK(fn, ret) \
|
||||
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
|
||||
|
||||
|
||||
/* run after a CARD_INSERTION event is received to configure the PCMCIA
|
||||
* socket and make the device available to the system */
|
||||
|
||||
@ -605,7 +601,6 @@ static int prism2_config(struct pcmcia_device *link)
|
||||
struct hostap_interface *iface;
|
||||
local_info_t *local;
|
||||
int ret = 1;
|
||||
int last_fn, last_ret;
|
||||
struct hostap_cs_priv *hw_priv;
|
||||
|
||||
PDEBUG(DEBUG_FLOW, "prism2_config()\n");
|
||||
@ -617,13 +612,12 @@ static int prism2_config(struct pcmcia_device *link)
|
||||
}
|
||||
|
||||
/* Look for an appropriate configuration table entry in the CIS */
|
||||
last_ret = pcmcia_loop_config(link, prism2_config_check, NULL);
|
||||
if (last_ret) {
|
||||
ret = pcmcia_loop_config(link, prism2_config_check, NULL);
|
||||
if (ret) {
|
||||
if (!ignore_cis_vcc)
|
||||
printk(KERN_ERR "GetNextTuple(): No matching "
|
||||
"CIS configuration. Maybe you need the "
|
||||
"ignore_cis_vcc=1 parameter.\n");
|
||||
cs_error(link, RequestIO, last_ret);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -652,8 +646,9 @@ static int prism2_config(struct pcmcia_device *link)
|
||||
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
||||
link->irq.Handler = prism2_interrupt;
|
||||
link->irq.Instance = dev;
|
||||
CS_CHECK(RequestIRQ,
|
||||
pcmcia_request_irq(link, &link->irq));
|
||||
ret = pcmcia_request_irq(link, &link->irq);
|
||||
if (ret)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -661,8 +656,9 @@ static int prism2_config(struct pcmcia_device *link)
|
||||
* the I/O windows and the interrupt mapping, and putting the
|
||||
* card and host interface into "Memory and IO" mode.
|
||||
*/
|
||||
CS_CHECK(RequestConfiguration,
|
||||
pcmcia_request_configuration(link, &link->conf));
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
dev->irq = link->irq.AssignedIRQ;
|
||||
dev->base_addr = link->io.BasePort1;
|
||||
@ -695,9 +691,6 @@ static int prism2_config(struct pcmcia_device *link)
|
||||
}
|
||||
return ret;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
|
||||
failed:
|
||||
kfree(hw_priv);
|
||||
prism2_release((u_long)link);
|
||||
|
||||
@ -145,23 +145,6 @@ static const unsigned int txConfEUD = 0x10; /* Enable Uni-Data packets */
|
||||
static const unsigned int txConfKey = 0x02; /* Scramble data packets */
|
||||
static const unsigned int txConfLoop = 0x01; /* Loopback mode */
|
||||
|
||||
/*
|
||||
All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
|
||||
you do not define PCMCIA_DEBUG at all, all the debug code will be
|
||||
left out. If you compile with PCMCIA_DEBUG=0, the debug code will
|
||||
be present but disabled -- but it can then be enabled for specific
|
||||
modules at load time with a 'pc_debug=#' option to insmod.
|
||||
*/
|
||||
|
||||
#ifdef PCMCIA_DEBUG
|
||||
static int pc_debug = PCMCIA_DEBUG;
|
||||
module_param(pc_debug, int, 0);
|
||||
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
|
||||
static char *version =
|
||||
"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n";
|
||||
#else
|
||||
#define DEBUG(n, args...)
|
||||
#endif
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
@ -383,7 +366,7 @@ static int netwave_probe(struct pcmcia_device *link)
|
||||
struct net_device *dev;
|
||||
netwave_private *priv;
|
||||
|
||||
DEBUG(0, "netwave_attach()\n");
|
||||
dev_dbg(&link->dev, "netwave_attach()\n");
|
||||
|
||||
/* Initialize the struct pcmcia_device structure */
|
||||
dev = alloc_etherdev(sizeof(netwave_private));
|
||||
@ -438,7 +421,7 @@ static void netwave_detach(struct pcmcia_device *link)
|
||||
{
|
||||
struct net_device *dev = link->priv;
|
||||
|
||||
DEBUG(0, "netwave_detach(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "netwave_detach\n");
|
||||
|
||||
netwave_release(link);
|
||||
|
||||
@ -725,18 +708,15 @@ static const struct iw_handler_def netwave_handler_def =
|
||||
*
|
||||
*/
|
||||
|
||||
#define CS_CHECK(fn, ret) \
|
||||
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
|
||||
|
||||
static int netwave_pcmcia_config(struct pcmcia_device *link) {
|
||||
struct net_device *dev = link->priv;
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
int i, j, last_ret, last_fn;
|
||||
int i, j, ret;
|
||||
win_req_t req;
|
||||
memreq_t mem;
|
||||
u_char __iomem *ramBase = NULL;
|
||||
|
||||
DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "netwave_pcmcia_config\n");
|
||||
|
||||
/*
|
||||
* Try allocating IO ports. This tries a few fixed addresses.
|
||||
@ -749,22 +729,24 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
|
||||
if (i == 0)
|
||||
break;
|
||||
}
|
||||
if (i != 0) {
|
||||
cs_error(link, RequestIO, i);
|
||||
if (i != 0)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/*
|
||||
* Now allocate an interrupt line. Note that this does not
|
||||
* actually assign a handler to the interrupt.
|
||||
*/
|
||||
CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
|
||||
ret = pcmcia_request_irq(link, &link->irq);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/*
|
||||
* This actually configures the PCMCIA socket -- setting up
|
||||
* the I/O windows and the interrupt mapping.
|
||||
*/
|
||||
CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/*
|
||||
* Allocate a 32K memory window. Note that the struct pcmcia_device
|
||||
@ -772,14 +754,18 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
|
||||
* device needs several windows, you'll need to keep track of
|
||||
* the handles in your private data structure, dev->priv.
|
||||
*/
|
||||
DEBUG(1, "Setting mem speed of %d\n", mem_speed);
|
||||
dev_dbg(&link->dev, "Setting mem speed of %d\n", mem_speed);
|
||||
|
||||
req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_CM|WIN_ENABLE;
|
||||
req.Base = 0; req.Size = 0x8000;
|
||||
req.AccessSpeed = mem_speed;
|
||||
CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win));
|
||||
ret = pcmcia_request_window(&link, &req, &link->win);
|
||||
if (ret)
|
||||
goto failed;
|
||||
mem.CardOffset = 0x20000; mem.Page = 0;
|
||||
CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem));
|
||||
ret = pcmcia_map_mem_page(link->win, &mem);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/* Store base address of the common window frame */
|
||||
ramBase = ioremap(req.Base, 0x8000);
|
||||
@ -818,8 +804,6 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
|
||||
get_uint16(ramBase + NETWAVE_EREG_ARW+2));
|
||||
return 0;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
failed:
|
||||
netwave_release(link);
|
||||
return -ENODEV;
|
||||
@ -837,7 +821,7 @@ static void netwave_release(struct pcmcia_device *link)
|
||||
struct net_device *dev = link->priv;
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
|
||||
DEBUG(0, "netwave_release(0x%p)\n", link);
|
||||
dev_dbg(&link->dev, "netwave_release\n");
|
||||
|
||||
pcmcia_disable_device(link);
|
||||
if (link->win)
|
||||
@ -892,7 +876,7 @@ static void netwave_reset(struct net_device *dev) {
|
||||
u_char __iomem *ramBase = priv->ramBase;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
|
||||
DEBUG(0, "netwave_reset: Done with hardware reset\n");
|
||||
pr_debug("netwave_reset: Done with hardware reset\n");
|
||||
|
||||
priv->timeoutCounter = 0;
|
||||
|
||||
@ -988,7 +972,7 @@ static int netwave_hw_xmit(unsigned char* data, int len,
|
||||
|
||||
dev->stats.tx_bytes += len;
|
||||
|
||||
DEBUG(3, "Transmitting with SPCQ %x SPU %x LIF %x ISPLQ %x\n",
|
||||
pr_debug("Transmitting with SPCQ %x SPU %x LIF %x ISPLQ %x\n",
|
||||
readb(ramBase + NETWAVE_EREG_SPCQ),
|
||||
readb(ramBase + NETWAVE_EREG_SPU),
|
||||
readb(ramBase + NETWAVE_EREG_LIF),
|
||||
@ -1000,7 +984,7 @@ static int netwave_hw_xmit(unsigned char* data, int len,
|
||||
MaxData = get_uint16(ramBase + NETWAVE_EREG_TDP+2);
|
||||
DataOffset = get_uint16(ramBase + NETWAVE_EREG_TDP+4);
|
||||
|
||||
DEBUG(3, "TxFreeList %x, MaxData %x, DataOffset %x\n",
|
||||
pr_debug("TxFreeList %x, MaxData %x, DataOffset %x\n",
|
||||
TxFreeList, MaxData, DataOffset);
|
||||
|
||||
/* Copy packet to the adapter fragment buffers */
|
||||
@ -1088,7 +1072,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id)
|
||||
status = inb(iobase + NETWAVE_REG_ASR);
|
||||
|
||||
if (!pcmcia_dev_present(link)) {
|
||||
DEBUG(1, "netwave_interrupt: Interrupt with status 0x%x "
|
||||
pr_debug("netwave_interrupt: Interrupt with status 0x%x "
|
||||
"from removed or suspended card!\n", status);
|
||||
break;
|
||||
}
|
||||
@ -1132,7 +1116,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id)
|
||||
int txStatus;
|
||||
|
||||
txStatus = readb(ramBase + NETWAVE_EREG_TSER);
|
||||
DEBUG(3, "Transmit done. TSER = %x id %x\n",
|
||||
pr_debug("Transmit done. TSER = %x id %x\n",
|
||||
txStatus, readb(ramBase + NETWAVE_EREG_TSER + 1));
|
||||
|
||||
if (txStatus & 0x20) {
|
||||
@ -1156,7 +1140,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id)
|
||||
* TxGU and TxNOAP is set. (Those are the only ones
|
||||
* to set TxErr).
|
||||
*/
|
||||
DEBUG(3, "netwave_interrupt: TxDN with error status %x\n",
|
||||
pr_debug("netwave_interrupt: TxDN with error status %x\n",
|
||||
txStatus);
|
||||
|
||||
/* Clear out TxGU, TxNOAP, TxErr and TxTrys */
|
||||
@ -1164,7 +1148,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id)
|
||||
writeb(0xdf & txStatus, ramBase+NETWAVE_EREG_TSER+4);
|
||||
++dev->stats.tx_errors;
|
||||
}
|
||||
DEBUG(3, "New status is TSER %x ASR %x\n",
|
||||
pr_debug("New status is TSER %x ASR %x\n",
|
||||
readb(ramBase + NETWAVE_EREG_TSER),
|
||||
inb(iobase + NETWAVE_REG_ASR));
|
||||
|
||||
@ -1172,7 +1156,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id)
|
||||
}
|
||||
/* TxBA, this would trigger on all error packets received */
|
||||
/* if (status & 0x01) {
|
||||
DEBUG(4, "Transmit buffers available, %x\n", status);
|
||||
pr_debug("Transmit buffers available, %x\n", status);
|
||||
}
|
||||
*/
|
||||
}
|
||||
@ -1190,7 +1174,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id)
|
||||
*/
|
||||
static void netwave_watchdog(struct net_device *dev) {
|
||||
|
||||
DEBUG(1, "%s: netwave_watchdog: watchdog timer expired\n", dev->name);
|
||||
pr_debug("%s: netwave_watchdog: watchdog timer expired\n", dev->name);
|
||||
netwave_reset(dev);
|
||||
dev->trans_start = jiffies;
|
||||
netif_wake_queue(dev);
|
||||
@ -1211,7 +1195,7 @@ static int netwave_rx(struct net_device *dev)
|
||||
int i;
|
||||
u_char *ptr;
|
||||
|
||||
DEBUG(3, "xinw_rx: Receiving ... \n");
|
||||
pr_debug("xinw_rx: Receiving ... \n");
|
||||
|
||||
/* Receive max 10 packets for now. */
|
||||
for (i = 0; i < 10; i++) {
|
||||
@ -1237,7 +1221,7 @@ static int netwave_rx(struct net_device *dev)
|
||||
|
||||
skb = dev_alloc_skb(rcvLen+5);
|
||||
if (skb == NULL) {
|
||||
DEBUG(1, "netwave_rx: Could not allocate an sk_buff of "
|
||||
pr_debug("netwave_rx: Could not allocate an sk_buff of "
|
||||
"length %d\n", rcvLen);
|
||||
++dev->stats.rx_dropped;
|
||||
/* Tell the adapter to skip the packet */
|
||||
@ -1279,7 +1263,7 @@ static int netwave_rx(struct net_device *dev)
|
||||
wait_WOC(iobase);
|
||||
writeb(NETWAVE_CMD_SRP, ramBase + NETWAVE_EREG_CB + 0);
|
||||
writeb(NETWAVE_CMD_EOC, ramBase + NETWAVE_EREG_CB + 1);
|
||||
DEBUG(3, "Packet reception ok\n");
|
||||
pr_debug("Packet reception ok\n");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -1288,7 +1272,7 @@ static int netwave_open(struct net_device *dev) {
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
struct pcmcia_device *link = priv->p_dev;
|
||||
|
||||
DEBUG(1, "netwave_open: starting.\n");
|
||||
dev_dbg(&link->dev, "netwave_open: starting.\n");
|
||||
|
||||
if (!pcmcia_dev_present(link))
|
||||
return -ENODEV;
|
||||
@ -1305,7 +1289,7 @@ static int netwave_close(struct net_device *dev) {
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
struct pcmcia_device *link = priv->p_dev;
|
||||
|
||||
DEBUG(1, "netwave_close: finishing.\n");
|
||||
dev_dbg(&link->dev, "netwave_close: finishing.\n");
|
||||
|
||||
link->open--;
|
||||
netif_stop_queue(dev);
|
||||
@ -1358,11 +1342,11 @@ static void set_multicast_list(struct net_device *dev)
|
||||
u_char rcvMode = 0;
|
||||
|
||||
#ifdef PCMCIA_DEBUG
|
||||
if (pc_debug > 2) {
|
||||
static int old;
|
||||
{
|
||||
xstatic int old;
|
||||
if (old != dev->mc_count) {
|
||||
old = dev->mc_count;
|
||||
DEBUG(0, "%s: setting Rx mode to %d addresses.\n",
|
||||
pr_debug("%s: setting Rx mode to %d addresses.\n",
|
||||
dev->name, dev->mc_count);
|
||||
}
|
||||
}
|
||||
|
||||
@ -160,12 +160,6 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
|
||||
* device available to the system.
|
||||
*/
|
||||
|
||||
#define CS_CHECK(fn, ret) do { \
|
||||
last_fn = (fn); \
|
||||
if ((last_ret = (ret)) != 0) \
|
||||
goto cs_failed; \
|
||||
} while (0)
|
||||
|
||||
static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cfg,
|
||||
cistpl_cftable_entry_t *dflt,
|
||||
@ -240,7 +234,7 @@ orinoco_cs_config(struct pcmcia_device *link)
|
||||
struct orinoco_private *priv = link->priv;
|
||||
struct orinoco_pccard *card = priv->card;
|
||||
hermes_t *hw = &priv->hw;
|
||||
int last_fn, last_ret;
|
||||
int ret;
|
||||
void __iomem *mem;
|
||||
|
||||
/*
|
||||
@ -257,13 +251,12 @@ orinoco_cs_config(struct pcmcia_device *link)
|
||||
* and most client drivers will only use the CIS to fill in
|
||||
* implementation-defined details.
|
||||
*/
|
||||
last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);
|
||||
if (last_ret) {
|
||||
ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);
|
||||
if (ret) {
|
||||
if (!ignore_cis_vcc)
|
||||
printk(KERN_ERR PFX "GetNextTuple(): No matching "
|
||||
"CIS configuration. Maybe you need the "
|
||||
"ignore_cis_vcc=1 parameter.\n");
|
||||
cs_error(link, RequestIO, last_ret);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -272,14 +265,16 @@ orinoco_cs_config(struct pcmcia_device *link)
|
||||
* a handler to the interrupt, unless the 'Handler' member of
|
||||
* the irq structure is initialized.
|
||||
*/
|
||||
CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
|
||||
ret = pcmcia_request_irq(link, &link->irq);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/* We initialize the hermes structure before completing PCMCIA
|
||||
* configuration just in case the interrupt handler gets
|
||||
* called. */
|
||||
mem = ioport_map(link->io.BasePort1, link->io.NumPorts1);
|
||||
if (!mem)
|
||||
goto cs_failed;
|
||||
goto failed;
|
||||
|
||||
hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
|
||||
|
||||
@ -288,8 +283,9 @@ orinoco_cs_config(struct pcmcia_device *link)
|
||||
* the I/O windows and the interrupt mapping, and putting the
|
||||
* card and host interface into "Memory and IO" mode.
|
||||
*/
|
||||
CS_CHECK(RequestConfiguration,
|
||||
pcmcia_request_configuration(link, &link->conf));
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/* Ok, we have the configuration, prepare to register the netdev */
|
||||
card->node.major = card->node.minor = 0;
|
||||
@ -315,9 +311,6 @@ orinoco_cs_config(struct pcmcia_device *link)
|
||||
* net_device has been registered */
|
||||
return 0;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
|
||||
failed:
|
||||
orinoco_cs_release(link);
|
||||
return -ENODEV;
|
||||
|
||||
@ -73,9 +73,6 @@ static void spectrum_cs_release(struct pcmcia_device *link);
|
||||
#define HCR_MEM16 0x10 /* memory width bit, should be preserved */
|
||||
|
||||
|
||||
#define CS_CHECK(fn, ret) \
|
||||
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
|
||||
|
||||
/*
|
||||
* Reset the card using configuration registers COR and CCSR.
|
||||
* If IDLE is 1, stop the firmware, so that it can be safely rewritten.
|
||||
@ -83,7 +80,7 @@ static void spectrum_cs_release(struct pcmcia_device *link);
|
||||
static int
|
||||
spectrum_reset(struct pcmcia_device *link, int idle)
|
||||
{
|
||||
int last_ret, last_fn;
|
||||
int ret;
|
||||
conf_reg_t reg;
|
||||
u_int save_cor;
|
||||
|
||||
@ -95,23 +92,26 @@ spectrum_reset(struct pcmcia_device *link, int idle)
|
||||
reg.Function = 0;
|
||||
reg.Action = CS_READ;
|
||||
reg.Offset = CISREG_COR;
|
||||
CS_CHECK(AccessConfigurationRegister,
|
||||
pcmcia_access_configuration_register(link, ®));
|
||||
ret = pcmcia_access_configuration_register(link, ®);
|
||||
if (ret)
|
||||
goto failed;
|
||||
save_cor = reg.Value;
|
||||
|
||||
/* Soft-Reset card */
|
||||
reg.Action = CS_WRITE;
|
||||
reg.Offset = CISREG_COR;
|
||||
reg.Value = (save_cor | COR_SOFT_RESET);
|
||||
CS_CHECK(AccessConfigurationRegister,
|
||||
pcmcia_access_configuration_register(link, ®));
|
||||
ret = pcmcia_access_configuration_register(link, ®);
|
||||
if (ret)
|
||||
goto failed;
|
||||
udelay(1000);
|
||||
|
||||
/* Read CCSR */
|
||||
reg.Action = CS_READ;
|
||||
reg.Offset = CISREG_CCSR;
|
||||
CS_CHECK(AccessConfigurationRegister,
|
||||
pcmcia_access_configuration_register(link, ®));
|
||||
ret = pcmcia_access_configuration_register(link, ®);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/*
|
||||
* Start or stop the firmware. Memory width bit should be
|
||||
@ -120,21 +120,22 @@ spectrum_reset(struct pcmcia_device *link, int idle)
|
||||
reg.Action = CS_WRITE;
|
||||
reg.Offset = CISREG_CCSR;
|
||||
reg.Value = (idle ? HCR_IDLE : HCR_RUN) | (reg.Value & HCR_MEM16);
|
||||
CS_CHECK(AccessConfigurationRegister,
|
||||
pcmcia_access_configuration_register(link, ®));
|
||||
ret = pcmcia_access_configuration_register(link, ®);
|
||||
if (ret)
|
||||
goto failed;
|
||||
udelay(1000);
|
||||
|
||||
/* Restore original COR configuration index */
|
||||
reg.Action = CS_WRITE;
|
||||
reg.Offset = CISREG_COR;
|
||||
reg.Value = (save_cor & ~COR_SOFT_RESET);
|
||||
CS_CHECK(AccessConfigurationRegister,
|
||||
pcmcia_access_configuration_register(link, ®));
|
||||
ret = pcmcia_access_configuration_register(link, ®);
|
||||
if (ret)
|
||||
goto failed;
|
||||
udelay(1000);
|
||||
return 0;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
failed:
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@ -307,7 +308,7 @@ spectrum_cs_config(struct pcmcia_device *link)
|
||||
struct orinoco_private *priv = link->priv;
|
||||
struct orinoco_pccard *card = priv->card;
|
||||
hermes_t *hw = &priv->hw;
|
||||
int last_fn, last_ret;
|
||||
int ret;
|
||||
void __iomem *mem;
|
||||
|
||||
/*
|
||||
@ -324,13 +325,12 @@ spectrum_cs_config(struct pcmcia_device *link)
|
||||
* and most client drivers will only use the CIS to fill in
|
||||
* implementation-defined details.
|
||||
*/
|
||||
last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);
|
||||
if (last_ret) {
|
||||
ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);
|
||||
if (ret) {
|
||||
if (!ignore_cis_vcc)
|
||||
printk(KERN_ERR PFX "GetNextTuple(): No matching "
|
||||
"CIS configuration. Maybe you need the "
|
||||
"ignore_cis_vcc=1 parameter.\n");
|
||||
cs_error(link, RequestIO, last_ret);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -339,14 +339,16 @@ spectrum_cs_config(struct pcmcia_device *link)
|
||||
* a handler to the interrupt, unless the 'Handler' member of
|
||||
* the irq structure is initialized.
|
||||
*/
|
||||
CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
|
||||
ret = pcmcia_request_irq(link, &link->irq);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/* We initialize the hermes structure before completing PCMCIA
|
||||
* configuration just in case the interrupt handler gets
|
||||
* called. */
|
||||
mem = ioport_map(link->io.BasePort1, link->io.NumPorts1);
|
||||
if (!mem)
|
||||
goto cs_failed;
|
||||
goto failed;
|
||||
|
||||
hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
|
||||
|
||||
@ -355,8 +357,9 @@ spectrum_cs_config(struct pcmcia_device *link)
|
||||
* the I/O windows and the interrupt mapping, and putting the
|
||||
* card and host interface into "Memory and IO" mode.
|
||||
*/
|
||||
CS_CHECK(RequestConfiguration,
|
||||
pcmcia_request_configuration(link, &link->conf));
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/* Ok, we have the configuration, prepare to register the netdev */
|
||||
card->node.major = card->node.minor = 0;
|
||||
@ -386,9 +389,6 @@ spectrum_cs_config(struct pcmcia_device *link)
|
||||
* net_device has been registered */
|
||||
return 0;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
|
||||
failed:
|
||||
spectrum_cs_release(link);
|
||||
return -ENODEV;
|
||||
|
||||
@ -3656,10 +3656,7 @@ wv_pcmcia_reset(struct net_device * dev)
|
||||
|
||||
i = pcmcia_access_configuration_register(link, ®);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, AccessConfigurationRegister, i);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_CONFIG_INFO
|
||||
printk(KERN_DEBUG "%s: wavelan_pcmcia_reset(): Config reg is 0x%x\n",
|
||||
@ -3670,19 +3667,13 @@ wv_pcmcia_reset(struct net_device * dev)
|
||||
reg.Value = reg.Value | COR_SW_RESET;
|
||||
i = pcmcia_access_configuration_register(link, ®);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, AccessConfigurationRegister, i);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
reg.Action = CS_WRITE;
|
||||
reg.Value = COR_LEVEL_IRQ | COR_CONFIG;
|
||||
i = pcmcia_access_configuration_register(link, ®);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, AccessConfigurationRegister, i);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_CONFIG_TRACE
|
||||
printk(KERN_DEBUG "%s: <-wv_pcmcia_reset()\n", dev->name);
|
||||
@ -3857,10 +3848,7 @@ wv_pcmcia_config(struct pcmcia_device * link)
|
||||
{
|
||||
i = pcmcia_request_io(link, &link->io);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, RequestIO, i);
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Now allocate an interrupt line. Note that this does not
|
||||
@ -3868,10 +3856,7 @@ wv_pcmcia_config(struct pcmcia_device * link)
|
||||
*/
|
||||
i = pcmcia_request_irq(link, &link->irq);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, RequestIRQ, i);
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* This actually configures the PCMCIA socket -- setting up
|
||||
@ -3880,10 +3865,7 @@ wv_pcmcia_config(struct pcmcia_device * link)
|
||||
link->conf.ConfigIndex = 1;
|
||||
i = pcmcia_request_configuration(link, &link->conf);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, RequestConfiguration, i);
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Allocate a small memory window. Note that the struct pcmcia_device
|
||||
@ -3896,10 +3878,7 @@ wv_pcmcia_config(struct pcmcia_device * link)
|
||||
req.AccessSpeed = mem_speed;
|
||||
i = pcmcia_request_window(&link, &req, &link->win);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, RequestWindow, i);
|
||||
break;
|
||||
}
|
||||
|
||||
lp->mem = ioremap(req.Base, req.Size);
|
||||
dev->mem_start = (u_long)lp->mem;
|
||||
@ -3908,10 +3887,7 @@ wv_pcmcia_config(struct pcmcia_device * link)
|
||||
mem.CardOffset = 0; mem.Page = 0;
|
||||
i = pcmcia_map_mem_page(link->win, &mem);
|
||||
if (i != 0)
|
||||
{
|
||||
cs_error(link, MapMemPage, i);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Feed device with this info... */
|
||||
dev->irq = link->irq.AssignedIRQ;
|
||||
|
||||
@ -67,23 +67,7 @@
|
||||
/* For rough constant delay */
|
||||
#define WL3501_NOPLOOP(n) { int x = 0; while (x++ < n) slow_down_io(); }
|
||||
|
||||
/*
|
||||
* All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If you do not
|
||||
* define PCMCIA_DEBUG at all, all the debug code will be left out. If you
|
||||
* compile with PCMCIA_DEBUG=0, the debug code will be present but disabled --
|
||||
* but it can then be enabled for specific modules at load time with a
|
||||
* 'pc_debug=#' option to insmod.
|
||||
*/
|
||||
#define PCMCIA_DEBUG 0
|
||||
#ifdef PCMCIA_DEBUG
|
||||
static int pc_debug = PCMCIA_DEBUG;
|
||||
module_param(pc_debug, int, 0);
|
||||
#define dprintk(n, format, args...) \
|
||||
{ if (pc_debug > (n)) \
|
||||
printk(KERN_INFO "%s: " format "\n", __func__ , ##args); }
|
||||
#else
|
||||
#define dprintk(n, format, args...)
|
||||
#endif
|
||||
|
||||
|
||||
#define wl3501_outb(a, b) { outb(a, b); slow_down_io(); }
|
||||
#define wl3501_outb_p(a, b) { outb_p(a, b); slow_down_io(); }
|
||||
@ -684,10 +668,10 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
|
||||
int matchflag = 0;
|
||||
struct wl3501_scan_confirm sig;
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
|
||||
if (sig.status == WL3501_STATUS_SUCCESS) {
|
||||
dprintk(3, "success");
|
||||
pr_debug("success");
|
||||
if ((this->net_type == IW_MODE_INFRA &&
|
||||
(sig.cap_info & WL3501_MGMT_CAPABILITY_ESS)) ||
|
||||
(this->net_type == IW_MODE_ADHOC &&
|
||||
@ -722,7 +706,7 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
|
||||
}
|
||||
}
|
||||
} else if (sig.status == WL3501_STATUS_TIMEOUT) {
|
||||
dprintk(3, "timeout");
|
||||
pr_debug("timeout");
|
||||
this->join_sta_bss = 0;
|
||||
for (i = this->join_sta_bss; i < this->bss_cnt; i++)
|
||||
if (!wl3501_mgmt_join(this, i))
|
||||
@ -879,7 +863,7 @@ static int wl3501_mgmt_auth(struct wl3501_card *this)
|
||||
.timeout = 1000,
|
||||
};
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
memcpy(sig.mac_addr, this->bssid, ETH_ALEN);
|
||||
return wl3501_esbq_exec(this, &sig, sizeof(sig));
|
||||
}
|
||||
@ -893,7 +877,7 @@ static int wl3501_mgmt_association(struct wl3501_card *this)
|
||||
.cap_info = this->cap_info,
|
||||
};
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
memcpy(sig.mac_addr, this->bssid, ETH_ALEN);
|
||||
return wl3501_esbq_exec(this, &sig, sizeof(sig));
|
||||
}
|
||||
@ -903,7 +887,7 @@ static void wl3501_mgmt_join_confirm(struct net_device *dev, u16 addr)
|
||||
struct wl3501_card *this = netdev_priv(dev);
|
||||
struct wl3501_join_confirm sig;
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
|
||||
if (sig.status == WL3501_STATUS_SUCCESS) {
|
||||
if (this->net_type == IW_MODE_INFRA) {
|
||||
@ -962,7 +946,7 @@ static inline void wl3501_md_confirm_interrupt(struct net_device *dev,
|
||||
{
|
||||
struct wl3501_md_confirm sig;
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
|
||||
wl3501_free_tx_buffer(this, sig.data);
|
||||
if (netif_queue_stopped(dev))
|
||||
@ -1017,7 +1001,7 @@ static inline void wl3501_md_ind_interrupt(struct net_device *dev,
|
||||
static inline void wl3501_get_confirm_interrupt(struct wl3501_card *this,
|
||||
u16 addr, void *sig, int size)
|
||||
{
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
wl3501_get_from_wla(this, addr, &this->sig_get_confirm,
|
||||
sizeof(this->sig_get_confirm));
|
||||
wake_up(&this->wait);
|
||||
@ -1029,7 +1013,7 @@ static inline void wl3501_start_confirm_interrupt(struct net_device *dev,
|
||||
{
|
||||
struct wl3501_start_confirm sig;
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
|
||||
if (sig.status == WL3501_STATUS_SUCCESS)
|
||||
netif_wake_queue(dev);
|
||||
@ -1041,7 +1025,7 @@ static inline void wl3501_assoc_confirm_interrupt(struct net_device *dev,
|
||||
struct wl3501_card *this = netdev_priv(dev);
|
||||
struct wl3501_assoc_confirm sig;
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
|
||||
|
||||
if (sig.status == WL3501_STATUS_SUCCESS)
|
||||
@ -1053,7 +1037,7 @@ static inline void wl3501_auth_confirm_interrupt(struct wl3501_card *this,
|
||||
{
|
||||
struct wl3501_auth_confirm sig;
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
|
||||
|
||||
if (sig.status == WL3501_STATUS_SUCCESS)
|
||||
@ -1069,7 +1053,7 @@ static inline void wl3501_rx_interrupt(struct net_device *dev)
|
||||
u8 sig_id;
|
||||
struct wl3501_card *this = netdev_priv(dev);
|
||||
|
||||
dprintk(3, "entry");
|
||||
pr_debug("entry");
|
||||
loop:
|
||||
morepkts = 0;
|
||||
if (!wl3501_esbq_confirm(this))
|
||||
@ -1302,7 +1286,7 @@ static int wl3501_reset(struct net_device *dev)
|
||||
wl3501_ack_interrupt(this);
|
||||
wl3501_unblock_interrupt(this);
|
||||
wl3501_mgmt_scan(this, 100);
|
||||
dprintk(1, "%s: device reset", dev->name);
|
||||
pr_debug("%s: device reset", dev->name);
|
||||
rc = 0;
|
||||
out:
|
||||
return rc;
|
||||
@ -1376,7 +1360,7 @@ static int wl3501_open(struct net_device *dev)
|
||||
link->open++;
|
||||
|
||||
/* Initial WL3501 firmware */
|
||||
dprintk(1, "%s: Initialize WL3501 firmware...", dev->name);
|
||||
pr_debug("%s: Initialize WL3501 firmware...", dev->name);
|
||||
if (wl3501_init_firmware(this))
|
||||
goto fail;
|
||||
/* Initial device variables */
|
||||
@ -1388,7 +1372,7 @@ static int wl3501_open(struct net_device *dev)
|
||||
wl3501_unblock_interrupt(this);
|
||||
wl3501_mgmt_scan(this, 100);
|
||||
rc = 0;
|
||||
dprintk(1, "%s: WL3501 opened", dev->name);
|
||||
pr_debug("%s: WL3501 opened", dev->name);
|
||||
printk(KERN_INFO "%s: Card Name: %s\n"
|
||||
"%s: Firmware Date: %s\n",
|
||||
dev->name, this->card_name,
|
||||
@ -1945,9 +1929,6 @@ out_link:
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
#define CS_CHECK(fn, ret) \
|
||||
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
|
||||
|
||||
/**
|
||||
* wl3501_config - configure the PCMCIA socket and make eth device available
|
||||
* @link - FILL_IN
|
||||
@ -1959,7 +1940,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
|
||||
static int wl3501_config(struct pcmcia_device *link)
|
||||
{
|
||||
struct net_device *dev = link->priv;
|
||||
int i = 0, j, last_fn, last_ret;
|
||||
int i = 0, j, ret;
|
||||
struct wl3501_card *this;
|
||||
|
||||
/* Try allocating IO ports. This tries a few fixed addresses. If you
|
||||
@ -1975,20 +1956,22 @@ static int wl3501_config(struct pcmcia_device *link)
|
||||
if (i == 0)
|
||||
break;
|
||||
}
|
||||
if (i != 0) {
|
||||
cs_error(link, RequestIO, i);
|
||||
if (i != 0)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/* Now allocate an interrupt line. Note that this does not actually
|
||||
* assign a handler to the interrupt. */
|
||||
|
||||
CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
|
||||
ret = pcmcia_request_irq(link, &link->irq);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/* This actually configures the PCMCIA socket -- setting up the I/O
|
||||
* windows and the interrupt mapping. */
|
||||
|
||||
CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
dev->irq = link->irq.AssignedIRQ;
|
||||
dev->base_addr = link->io.BasePort1;
|
||||
@ -2041,8 +2024,6 @@ static int wl3501_config(struct pcmcia_device *link)
|
||||
netif_start_queue(dev);
|
||||
return 0;
|
||||
|
||||
cs_failed:
|
||||
cs_error(link, last_fn, last_ret);
|
||||
failed:
|
||||
wl3501_release(link);
|
||||
return -ENODEV;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user