diff options
Diffstat (limited to 'drivers/char/pcmcia/cm4040_cs.c')
-rw-r--r-- | drivers/char/pcmcia/cm4040_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index 38790db561a1..a6a70e476bea 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "cm4040_cs.h" | 39 | #include "cm4040_cs.h" |
40 | 40 | ||
41 | 41 | ||
42 | #define reader_to_dev(x) (&handle_to_dev(x->p_dev)) | 42 | #define reader_to_dev(x) (&x->p_dev->dev) |
43 | 43 | ||
44 | /* n (debug level) is ignored */ | 44 | /* n (debug level) is ignored */ |
45 | /* additional debug output may be enabled by re-compiling with | 45 | /* additional debug output may be enabled by re-compiling with |
@@ -539,7 +539,7 @@ static int cm4040_config_check(struct pcmcia_device *p_dev, | |||
539 | p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; | 539 | p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; |
540 | 540 | ||
541 | rc = pcmcia_request_io(p_dev, &p_dev->io); | 541 | rc = pcmcia_request_io(p_dev, &p_dev->io); |
542 | dev_printk(KERN_INFO, &handle_to_dev(p_dev), | 542 | dev_printk(KERN_INFO, &p_dev->dev, |
543 | "pcmcia_request_io returned 0x%x\n", rc); | 543 | "pcmcia_request_io returned 0x%x\n", rc); |
544 | return rc; | 544 | return rc; |
545 | } | 545 | } |
@@ -561,7 +561,7 @@ static int reader_config(struct pcmcia_device *link, int devno) | |||
561 | 561 | ||
562 | fail_rc = pcmcia_request_configuration(link, &link->conf); | 562 | fail_rc = pcmcia_request_configuration(link, &link->conf); |
563 | if (fail_rc != 0) { | 563 | if (fail_rc != 0) { |
564 | dev_printk(KERN_INFO, &handle_to_dev(link), | 564 | dev_printk(KERN_INFO, &link->dev, |
565 | "pcmcia_request_configuration failed 0x%x\n", | 565 | "pcmcia_request_configuration failed 0x%x\n", |
566 | fail_rc); | 566 | fail_rc); |
567 | goto cs_release; | 567 | goto cs_release; |