Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 169104
b: refs/heads/master
c: d50dbec
h: refs/heads/master
v: v3
  • Loading branch information
Dominik Brodowski committed Nov 8, 2009
1 parent bbaa8fb commit 2e62a96
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 175 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 18a7a19b37838789452e0bd2855a51475628b971
refs/heads/master: d50dbec3ce52e1608636b8a624d087da9ced8cde
4 changes: 2 additions & 2 deletions trunk/drivers/pcmcia/cardbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static u_int xlate_rom_addr(void __iomem *b, u_int addr)
static void cb_release_cis_mem(struct pcmcia_socket * s)
{
if (s->cb_cis_virt) {
cs_dbg(s, 1, "cb_release_cis_mem()\n");
dev_dbg(&s->dev, "cb_release_cis_mem()\n");
iounmap(s->cb_cis_virt);
s->cb_cis_virt = NULL;
s->cb_cis_res = NULL;
Expand Down Expand Up @@ -132,7 +132,7 @@ int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void
struct pci_dev *dev;
struct resource *res;

cs_dbg(s, 3, "read_cb_mem(%d, %#x, %u)\n", space, addr, len);
dev_dbg(&s->dev, "read_cb_mem(%d, %#x, %u)\n", space, addr, len);

dev = pci_get_slot(s->cb_dev->subordinate, 0);
if (!dev)
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/pcmcia/cistpl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
void __iomem *sys, *end;
unsigned char *buf = ptr;

cs_dbg(s, 3, "pcmcia_read_cis_mem(%d, %#x, %u)\n", attr, addr, len);
dev_dbg(&s->dev, "pcmcia_read_cis_mem(%d, %#x, %u)\n", attr, addr, len);

if (attr & IS_INDIRECT) {
/* Indirect accesses use a bunch of special registers at fixed
Expand Down Expand Up @@ -190,7 +190,7 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
addr = 0;
}
}
cs_dbg(s, 3, " %#2.2x %#2.2x %#2.2x %#2.2x ...\n",
dev_dbg(&s->dev, " %#2.2x %#2.2x %#2.2x %#2.2x ...\n",
*(u_char *)(ptr+0), *(u_char *)(ptr+1),
*(u_char *)(ptr+2), *(u_char *)(ptr+3));
return 0;
Expand All @@ -204,7 +204,7 @@ void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
void __iomem *sys, *end;
unsigned char *buf = ptr;

cs_dbg(s, 3, "pcmcia_write_cis_mem(%d, %#x, %u)\n", attr, addr, len);
dev_dbg(&s->dev, "pcmcia_write_cis_mem(%d, %#x, %u)\n", attr, addr, len);

if (attr & IS_INDIRECT) {
/* Indirect accesses use a bunch of special registers at fixed
Expand Down Expand Up @@ -584,7 +584,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
ofs += link[1] + 2;
}
if (i == MAX_TUPLES) {
cs_dbg(s, 1, "cs: overrun in pcmcia_get_next_tuple\n");
dev_dbg(&s->dev, "cs: overrun in pcmcia_get_next_tuple\n");
return -ENOSPC;
}

Expand Down Expand Up @@ -1440,7 +1440,7 @@ int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse)
break;
}
if (ret)
__cs_dbg(0, "parse_tuple failed %d\n", ret);
pr_debug("parse_tuple failed %d\n", ret);
return ret;
}
EXPORT_SYMBOL(pcmcia_parse_tuple);
Expand Down
57 changes: 24 additions & 33 deletions trunk/drivers/pcmcia/cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,6 @@ INT_MODULE_PARM(unreset_limit, 30); /* unreset_check's */
/* Access speed for attribute memory windows */
INT_MODULE_PARM(cis_speed, 300); /* ns */

#ifdef CONFIG_PCMCIA_DEBUG
static int pc_debug;

module_param(pc_debug, int, 0644);

int cs_debug_level(int level)
{
return pc_debug > level;
}
#endif


socket_state_t dead_socket = {
.csc_mask = SS_DETECT,
Expand Down Expand Up @@ -182,7 +171,7 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
if (!socket || !socket->ops || !socket->dev.parent || !socket->resource_ops)
return -EINVAL;

cs_dbg(socket, 0, "pcmcia_register_socket(0x%p)\n", socket->ops);
dev_dbg(&socket->dev, "pcmcia_register_socket(0x%p)\n", socket->ops);

spin_lock_init(&socket->lock);

Expand Down Expand Up @@ -274,7 +263,7 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
if (!socket)
return;

cs_dbg(socket, 0, "pcmcia_unregister_socket(0x%p)\n", socket->ops);
dev_dbg(&socket->dev, "pcmcia_unregister_socket(0x%p)\n", socket->ops);

if (socket->thread)
kthread_stop(socket->thread);
Expand Down Expand Up @@ -327,7 +316,7 @@ static int send_event(struct pcmcia_socket *s, event_t event, int priority)
if (s->state & SOCKET_CARDBUS)
return 0;

cs_dbg(s, 1, "send_event(event %d, pri %d, callback 0x%p)\n",
dev_dbg(&s->dev, "send_event(event %d, pri %d, callback 0x%p)\n",
event, priority, s->callback);

if (!s->callback)
Expand All @@ -344,7 +333,7 @@ static int send_event(struct pcmcia_socket *s, event_t event, int priority)

static void socket_remove_drivers(struct pcmcia_socket *skt)
{
cs_dbg(skt, 4, "remove_drivers\n");
dev_dbg(&skt->dev, "remove_drivers\n");

send_event(skt, CS_EVENT_CARD_REMOVAL, CS_EVENT_PRI_HIGH);
}
Expand All @@ -353,7 +342,7 @@ static int socket_reset(struct pcmcia_socket *skt)
{
int status, i;

cs_dbg(skt, 4, "reset\n");
dev_dbg(&skt->dev, "reset\n");

skt->socket.flags |= SS_OUTPUT_ENA | SS_RESET;
skt->ops->set_socket(skt, &skt->socket);
Expand All @@ -375,7 +364,7 @@ static int socket_reset(struct pcmcia_socket *skt)
msleep(unreset_check * 10);
}

cs_err(skt, "time out after reset.\n");
dev_printk(KERN_ERR, &skt->dev, "time out after reset.\n");
return -ETIMEDOUT;
}

Expand All @@ -389,7 +378,7 @@ static void socket_shutdown(struct pcmcia_socket *s)
{
int status;

cs_dbg(s, 4, "shutdown\n");
dev_dbg(&s->dev, "shutdown\n");

socket_remove_drivers(s);
s->state &= SOCKET_INUSE | SOCKET_PRESENT;
Expand Down Expand Up @@ -424,7 +413,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
{
int status, i;

cs_dbg(skt, 4, "setup\n");
dev_dbg(&skt->dev, "setup\n");

skt->ops->get_status(skt, &status);
if (!(status & SS_DETECT))
Expand All @@ -444,13 +433,15 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
}

if (status & SS_PENDING) {
cs_err(skt, "voltage interrogation timed out.\n");
dev_printk(KERN_ERR, &skt->dev,
"voltage interrogation timed out.\n");
return -ETIMEDOUT;
}

if (status & SS_CARDBUS) {
if (!(skt->features & SS_CAP_CARDBUS)) {
cs_err(skt, "cardbus cards are not supported.\n");
dev_printk(KERN_ERR, &skt->dev,
"cardbus cards are not supported.\n");
return -EINVAL;
}
skt->state |= SOCKET_CARDBUS;
Expand All @@ -464,7 +455,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
else if (!(status & SS_XVCARD))
skt->socket.Vcc = skt->socket.Vpp = 50;
else {
cs_err(skt, "unsupported voltage key.\n");
dev_printk(KERN_ERR, &skt->dev, "unsupported voltage key.\n");
return -EIO;
}

Expand All @@ -481,7 +472,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)

skt->ops->get_status(skt, &status);
if (!(status & SS_POWERON)) {
cs_err(skt, "unable to apply power.\n");
dev_printk(KERN_ERR, &skt->dev, "unable to apply power.\n");
return -EIO;
}

Expand All @@ -501,7 +492,7 @@ static int socket_insert(struct pcmcia_socket *skt)
{
int ret;

cs_dbg(skt, 4, "insert\n");
dev_dbg(&skt->dev, "insert\n");

if (!cs_socket_get(skt))
return -ENODEV;
Expand All @@ -521,7 +512,7 @@ static int socket_insert(struct pcmcia_socket *skt)
skt->state |= SOCKET_CARDBUS_CONFIG;
}
#endif
cs_dbg(skt, 4, "insert done\n");
dev_dbg(&skt->dev, "insert done\n");

send_event(skt, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW);
} else {
Expand Down Expand Up @@ -573,7 +564,7 @@ static int socket_resume(struct pcmcia_socket *skt)
* FIXME: need a better check here for cardbus cards.
*/
if (verify_cis_cache(skt) != 0) {
cs_dbg(skt, 4, "cis mismatch - different card\n");
dev_dbg(&skt->dev, "cis mismatch - different card\n");
socket_remove_drivers(skt);
destroy_cis_cache(skt);
/*
Expand All @@ -584,7 +575,7 @@ static int socket_resume(struct pcmcia_socket *skt)
msleep(200);
send_event(skt, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW);
} else {
cs_dbg(skt, 4, "cis matches cache\n");
dev_dbg(&skt->dev, "cis matches cache\n");
send_event(skt, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW);
}
} else {
Expand Down Expand Up @@ -706,7 +697,7 @@ static int pccardd(void *__skt)
void pcmcia_parse_events(struct pcmcia_socket *s, u_int events)
{
unsigned long flags;
cs_dbg(s, 4, "parse_events: events %08x\n", events);
dev_dbg(&s->dev, "parse_events: events %08x\n", events);
if (s->thread) {
spin_lock_irqsave(&s->thread_lock, flags);
s->thread_events |= events;
Expand Down Expand Up @@ -756,7 +747,7 @@ int pcmcia_reset_card(struct pcmcia_socket *skt)
{
int ret;

cs_dbg(skt, 1, "resetting socket\n");
dev_dbg(&skt->dev, "resetting socket\n");

mutex_lock(&skt->skt_mutex);
do {
Expand Down Expand Up @@ -801,7 +792,7 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt)
{
int ret;

cs_dbg(skt, 1, "suspending socket\n");
dev_dbg(&skt->dev, "suspending socket\n");

mutex_lock(&skt->skt_mutex);
do {
Expand Down Expand Up @@ -831,7 +822,7 @@ int pcmcia_resume_card(struct pcmcia_socket *skt)
{
int ret;

cs_dbg(skt, 1, "waking up socket\n");
dev_dbg(&skt->dev, "waking up socket\n");

mutex_lock(&skt->skt_mutex);
do {
Expand Down Expand Up @@ -859,7 +850,7 @@ int pcmcia_eject_card(struct pcmcia_socket *skt)
{
int ret;

cs_dbg(skt, 1, "user eject request\n");
dev_dbg(&skt->dev, "user eject request\n");

mutex_lock(&skt->skt_mutex);
do {
Expand Down Expand Up @@ -888,7 +879,7 @@ int pcmcia_insert_card(struct pcmcia_socket *skt)
{
int ret;

cs_dbg(skt, 1, "user insert request\n");
dev_dbg(&skt->dev, "user insert request\n");

mutex_lock(&skt->skt_mutex);
do {
Expand Down
22 changes: 0 additions & 22 deletions trunk/drivers/pcmcia/cs_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,28 +107,6 @@ static inline void cs_socket_put(struct pcmcia_socket *skt)
}
}

#ifdef CONFIG_PCMCIA_DEBUG
extern int cs_debug_level(int);

#define cs_dbg(skt, lvl, fmt, arg...) do { \
if (cs_debug_level(lvl)) \
dev_printk(KERN_DEBUG, &skt->dev, \
"cs: " fmt, ## arg); \
} while (0)
#define __cs_dbg(lvl, fmt, arg...) do { \
if (cs_debug_level(lvl)) \
printk(KERN_DEBUG \
"cs: " fmt, ## arg); \
} while (0)

#else
#define cs_dbg(skt, lvl, fmt, arg...) do { } while (0)
#define __cs_dbg(lvl, fmt, arg...) do { } while (0)
#endif

#define cs_err(skt, fmt, arg...) \
dev_printk(KERN_ERR, &skt->dev, "cs: " fmt, ## arg)


/*
* Stuff internal to module "pcmcia_core":
Expand Down
Loading

0 comments on commit 2e62a96

Please sign in to comment.