diff options
Diffstat (limited to 'drivers')
102 files changed, 2997 insertions, 4495 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index dc99e26f8e5b..1b392c9e8531 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -177,9 +177,6 @@ static struct ata_port_operations pcmcia_8bit_port_ops = { | |||
177 | .drain_fifo = pcmcia_8bit_drain_fifo, | 177 | .drain_fifo = pcmcia_8bit_drain_fifo, |
178 | }; | 178 | }; |
179 | 179 | ||
180 | #define CS_CHECK(fn, ret) \ | ||
181 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
182 | |||
183 | 180 | ||
184 | struct pcmcia_config_check { | 181 | struct pcmcia_config_check { |
185 | unsigned long ctl_base; | 182 | unsigned long ctl_base; |
@@ -252,7 +249,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
252 | struct ata_port *ap; | 249 | struct ata_port *ap; |
253 | struct ata_pcmcia_info *info; | 250 | struct ata_pcmcia_info *info; |
254 | struct pcmcia_config_check *stk = NULL; | 251 | struct pcmcia_config_check *stk = NULL; |
255 | int last_ret = 0, last_fn = 0, is_kme = 0, ret = -ENOMEM, p; | 252 | int is_kme = 0, ret = -ENOMEM, p; |
256 | unsigned long io_base, ctl_base; | 253 | unsigned long io_base, ctl_base; |
257 | void __iomem *io_addr, *ctl_addr; | 254 | void __iomem *io_addr, *ctl_addr; |
258 | int n_ports = 1; | 255 | int n_ports = 1; |
@@ -271,7 +268,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
271 | pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 268 | pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
272 | pdev->io.IOAddrLines = 3; | 269 | pdev->io.IOAddrLines = 3; |
273 | pdev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 270 | pdev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
274 | pdev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
275 | pdev->conf.Attributes = CONF_ENABLE_IRQ; | 271 | pdev->conf.Attributes = CONF_ENABLE_IRQ; |
276 | pdev->conf.IntType = INT_MEMORY_AND_IO; | 272 | pdev->conf.IntType = INT_MEMORY_AND_IO; |
277 | 273 | ||
@@ -296,8 +292,13 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
296 | } | 292 | } |
297 | io_base = pdev->io.BasePort1; | 293 | io_base = pdev->io.BasePort1; |
298 | ctl_base = stk->ctl_base; | 294 | ctl_base = stk->ctl_base; |
299 | CS_CHECK(RequestIRQ, pcmcia_request_irq(pdev, &pdev->irq)); | 295 | ret = pcmcia_request_irq(pdev, &pdev->irq); |
300 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(pdev, &pdev->conf)); | 296 | if (ret) |
297 | goto failed; | ||
298 | |||
299 | ret = pcmcia_request_configuration(pdev, &pdev->conf); | ||
300 | if (ret) | ||
301 | goto failed; | ||
301 | 302 | ||
302 | /* iomap */ | 303 | /* iomap */ |
303 | ret = -ENOMEM; | 304 | ret = -ENOMEM; |
@@ -351,8 +352,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
351 | kfree(stk); | 352 | kfree(stk); |
352 | return 0; | 353 | return 0; |
353 | 354 | ||
354 | cs_failed: | ||
355 | cs_error(pdev, last_fn, last_ret); | ||
356 | failed: | 355 | failed: |
357 | kfree(stk); | 356 | kfree(stk); |
358 | info->ndev = 0; | 357 | info->ndev = 0; |
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index b0e569ba730d..2acdc605cb4b 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -867,11 +867,9 @@ static int bluecard_probe(struct pcmcia_device *link) | |||
867 | 867 | ||
868 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 868 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
869 | link->io.NumPorts1 = 8; | 869 | link->io.NumPorts1 = 8; |
870 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 870 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
871 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
872 | 871 | ||
873 | link->irq.Handler = bluecard_interrupt; | 872 | link->irq.Handler = bluecard_interrupt; |
874 | link->irq.Instance = info; | ||
875 | 873 | ||
876 | link->conf.Attributes = CONF_ENABLE_IRQ; | 874 | link->conf.Attributes = CONF_ENABLE_IRQ; |
877 | link->conf.IntType = INT_MEMORY_AND_IO; | 875 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -905,22 +903,16 @@ static int bluecard_config(struct pcmcia_device *link) | |||
905 | break; | 903 | break; |
906 | } | 904 | } |
907 | 905 | ||
908 | if (i != 0) { | 906 | if (i != 0) |
909 | cs_error(link, RequestIO, i); | ||
910 | goto failed; | 907 | goto failed; |
911 | } | ||
912 | 908 | ||
913 | i = pcmcia_request_irq(link, &link->irq); | 909 | i = pcmcia_request_irq(link, &link->irq); |
914 | if (i != 0) { | 910 | if (i != 0) |
915 | cs_error(link, RequestIRQ, i); | ||
916 | link->irq.AssignedIRQ = 0; | 911 | link->irq.AssignedIRQ = 0; |
917 | } | ||
918 | 912 | ||
919 | i = pcmcia_request_configuration(link, &link->conf); | 913 | i = pcmcia_request_configuration(link, &link->conf); |
920 | if (i != 0) { | 914 | if (i != 0) |
921 | cs_error(link, RequestConfiguration, i); | ||
922 | goto failed; | 915 | goto failed; |
923 | } | ||
924 | 916 | ||
925 | if (bluecard_open(info) != 0) | 917 | if (bluecard_open(info) != 0) |
926 | goto failed; | 918 | goto failed; |
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index d58e22b9f06a..d814a2755ccb 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -659,11 +659,9 @@ static int bt3c_probe(struct pcmcia_device *link) | |||
659 | 659 | ||
660 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 660 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
661 | link->io.NumPorts1 = 8; | 661 | link->io.NumPorts1 = 8; |
662 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 662 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
663 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
664 | 663 | ||
665 | link->irq.Handler = bt3c_interrupt; | 664 | link->irq.Handler = bt3c_interrupt; |
666 | link->irq.Instance = info; | ||
667 | 665 | ||
668 | link->conf.Attributes = CONF_ENABLE_IRQ; | 666 | link->conf.Attributes = CONF_ENABLE_IRQ; |
669 | link->conf.IntType = INT_MEMORY_AND_IO; | 667 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -740,21 +738,16 @@ static int bt3c_config(struct pcmcia_device *link) | |||
740 | goto found_port; | 738 | goto found_port; |
741 | 739 | ||
742 | BT_ERR("No usable port range found"); | 740 | BT_ERR("No usable port range found"); |
743 | cs_error(link, RequestIO, -ENODEV); | ||
744 | goto failed; | 741 | goto failed; |
745 | 742 | ||
746 | found_port: | 743 | found_port: |
747 | i = pcmcia_request_irq(link, &link->irq); | 744 | i = pcmcia_request_irq(link, &link->irq); |
748 | if (i != 0) { | 745 | if (i != 0) |
749 | cs_error(link, RequestIRQ, i); | ||
750 | link->irq.AssignedIRQ = 0; | 746 | link->irq.AssignedIRQ = 0; |
751 | } | ||
752 | 747 | ||
753 | i = pcmcia_request_configuration(link, &link->conf); | 748 | i = pcmcia_request_configuration(link, &link->conf); |
754 | if (i != 0) { | 749 | if (i != 0) |
755 | cs_error(link, RequestConfiguration, i); | ||
756 | goto failed; | 750 | goto failed; |
757 | } | ||
758 | 751 | ||
759 | if (bt3c_open(info) != 0) | 752 | if (bt3c_open(info) != 0) |
760 | goto failed; | 753 | goto failed; |
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index efd689a062eb..d339464dc15e 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -588,11 +588,9 @@ static int btuart_probe(struct pcmcia_device *link) | |||
588 | 588 | ||
589 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 589 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
590 | link->io.NumPorts1 = 8; | 590 | link->io.NumPorts1 = 8; |
591 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 591 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
592 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
593 | 592 | ||
594 | link->irq.Handler = btuart_interrupt; | 593 | link->irq.Handler = btuart_interrupt; |
595 | link->irq.Instance = info; | ||
596 | 594 | ||
597 | link->conf.Attributes = CONF_ENABLE_IRQ; | 595 | link->conf.Attributes = CONF_ENABLE_IRQ; |
598 | link->conf.IntType = INT_MEMORY_AND_IO; | 596 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -669,21 +667,16 @@ static int btuart_config(struct pcmcia_device *link) | |||
669 | goto found_port; | 667 | goto found_port; |
670 | 668 | ||
671 | BT_ERR("No usable port range found"); | 669 | BT_ERR("No usable port range found"); |
672 | cs_error(link, RequestIO, -ENODEV); | ||
673 | goto failed; | 670 | goto failed; |
674 | 671 | ||
675 | found_port: | 672 | found_port: |
676 | i = pcmcia_request_irq(link, &link->irq); | 673 | i = pcmcia_request_irq(link, &link->irq); |
677 | if (i != 0) { | 674 | if (i != 0) |
678 | cs_error(link, RequestIRQ, i); | ||
679 | link->irq.AssignedIRQ = 0; | 675 | link->irq.AssignedIRQ = 0; |
680 | } | ||
681 | 676 | ||
682 | i = pcmcia_request_configuration(link, &link->conf); | 677 | i = pcmcia_request_configuration(link, &link->conf); |
683 | if (i != 0) { | 678 | if (i != 0) |
684 | cs_error(link, RequestConfiguration, i); | ||
685 | goto failed; | 679 | goto failed; |
686 | } | ||
687 | 680 | ||
688 | if (btuart_open(info) != 0) | 681 | if (btuart_open(info) != 0) |
689 | goto failed; | 682 | goto failed; |
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index b881a9cd8741..4f02a6f3c980 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -573,11 +573,9 @@ static int dtl1_probe(struct pcmcia_device *link) | |||
573 | 573 | ||
574 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 574 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
575 | link->io.NumPorts1 = 8; | 575 | link->io.NumPorts1 = 8; |
576 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 576 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
577 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
578 | 577 | ||
579 | link->irq.Handler = dtl1_interrupt; | 578 | link->irq.Handler = dtl1_interrupt; |
580 | link->irq.Instance = info; | ||
581 | 579 | ||
582 | link->conf.Attributes = CONF_ENABLE_IRQ; | 580 | link->conf.Attributes = CONF_ENABLE_IRQ; |
583 | link->conf.IntType = INT_MEMORY_AND_IO; | 581 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -622,16 +620,12 @@ static int dtl1_config(struct pcmcia_device *link) | |||
622 | goto failed; | 620 | goto failed; |
623 | 621 | ||
624 | i = pcmcia_request_irq(link, &link->irq); | 622 | i = pcmcia_request_irq(link, &link->irq); |
625 | if (i != 0) { | 623 | if (i != 0) |
626 | cs_error(link, RequestIRQ, i); | ||
627 | link->irq.AssignedIRQ = 0; | 624 | link->irq.AssignedIRQ = 0; |
628 | } | ||
629 | 625 | ||
630 | i = pcmcia_request_configuration(link, &link->conf); | 626 | i = pcmcia_request_configuration(link, &link->conf); |
631 | if (i != 0) { | 627 | if (i != 0) |
632 | cs_error(link, RequestConfiguration, i); | ||
633 | goto failed; | 628 | goto failed; |
634 | } | ||
635 | 629 | ||
636 | if (dtl1_open(info) != 0) | 630 | if (dtl1_open(info) != 0) |
637 | goto failed; | 631 | goto failed; |
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index c250a31efa53..2db4c0a29b05 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -23,8 +23,6 @@ | |||
23 | * All rights reserved. Licensed under dual BSD/GPL license. | 23 | * All rights reserved. Licensed under dual BSD/GPL license. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* #define PCMCIA_DEBUG 6 */ | ||
27 | |||
28 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
29 | #include <linux/module.h> | 27 | #include <linux/module.h> |
30 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
@@ -47,18 +45,17 @@ | |||
47 | 45 | ||
48 | /* #define ATR_CSUM */ | 46 | /* #define ATR_CSUM */ |
49 | 47 | ||
50 | #ifdef PCMCIA_DEBUG | 48 | #define reader_to_dev(x) (&x->p_dev->dev) |
51 | #define reader_to_dev(x) (&handle_to_dev(x->p_dev)) | 49 | |
52 | static int pc_debug = PCMCIA_DEBUG; | 50 | /* n (debug level) is ignored */ |
53 | module_param(pc_debug, int, 0600); | 51 | /* additional debug output may be enabled by re-compiling with |
54 | #define DEBUGP(n, rdr, x, args...) do { \ | 52 | * CM4000_DEBUG set */ |
55 | if (pc_debug >= (n)) \ | 53 | /* #define CM4000_DEBUG */ |
56 | dev_printk(KERN_DEBUG, reader_to_dev(rdr), "%s:" x, \ | 54 | #define DEBUGP(n, rdr, x, args...) do { \ |
57 | __func__ , ## args); \ | 55 | dev_dbg(reader_to_dev(rdr), "%s:" x, \ |
56 | __func__ , ## args); \ | ||
58 | } while (0) | 57 | } while (0) |
59 | #else | 58 | |
60 | #define DEBUGP(n, rdr, x, args...) | ||
61 | #endif | ||
62 | static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte"; | 59 | static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte"; |
63 | 60 | ||
64 | #define T_1SEC (HZ) | 61 | #define T_1SEC (HZ) |
@@ -174,14 +171,13 @@ static unsigned char fi_di_table[10][14] = { | |||
174 | /* 9 */ {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9} | 171 | /* 9 */ {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9} |
175 | }; | 172 | }; |
176 | 173 | ||
177 | #ifndef PCMCIA_DEBUG | 174 | #ifndef CM4000_DEBUG |
178 | #define xoutb outb | 175 | #define xoutb outb |
179 | #define xinb inb | 176 | #define xinb inb |
180 | #else | 177 | #else |
181 | static inline void xoutb(unsigned char val, unsigned short port) | 178 | static inline void xoutb(unsigned char val, unsigned short port) |
182 | { | 179 | { |
183 | if (pc_debug >= 7) | 180 | pr_debug("outb(val=%.2x,port=%.4x)\n", val, port); |
184 | printk(KERN_DEBUG "outb(val=%.2x,port=%.4x)\n", val, port); | ||
185 | outb(val, port); | 181 | outb(val, port); |
186 | } | 182 | } |
187 | static inline unsigned char xinb(unsigned short port) | 183 | static inline unsigned char xinb(unsigned short port) |
@@ -189,8 +185,7 @@ static inline unsigned char xinb(unsigned short port) | |||
189 | unsigned char val; | 185 | unsigned char val; |
190 | 186 | ||
191 | val = inb(port); | 187 | val = inb(port); |
192 | if (pc_debug >= 7) | 188 | pr_debug("%.2x=inb(%.4x)\n", val, port); |
193 | printk(KERN_DEBUG "%.2x=inb(%.4x)\n", val, port); | ||
194 | 189 | ||
195 | return val; | 190 | return val; |
196 | } | 191 | } |
@@ -514,12 +509,10 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq) | |||
514 | for (i = 0; i < 4; i++) { | 509 | for (i = 0; i < 4; i++) { |
515 | xoutb(i, REG_BUF_ADDR(iobase)); | 510 | xoutb(i, REG_BUF_ADDR(iobase)); |
516 | xoutb(dev->pts[i], REG_BUF_DATA(iobase)); /* buf data */ | 511 | xoutb(dev->pts[i], REG_BUF_DATA(iobase)); /* buf data */ |
517 | #ifdef PCMCIA_DEBUG | 512 | #ifdef CM4000_DEBUG |
518 | if (pc_debug >= 5) | 513 | pr_debug("0x%.2x ", dev->pts[i]); |
519 | printk("0x%.2x ", dev->pts[i]); | ||
520 | } | 514 | } |
521 | if (pc_debug >= 5) | 515 | pr_debug("\n"); |
522 | printk("\n"); | ||
523 | #else | 516 | #else |
524 | } | 517 | } |
525 | #endif | 518 | #endif |
@@ -579,14 +572,13 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq) | |||
579 | pts_reply[i] = inb(REG_BUF_DATA(iobase)); | 572 | pts_reply[i] = inb(REG_BUF_DATA(iobase)); |
580 | } | 573 | } |
581 | 574 | ||
582 | #ifdef PCMCIA_DEBUG | 575 | #ifdef CM4000_DEBUG |
583 | DEBUGP(2, dev, "PTSreply: "); | 576 | DEBUGP(2, dev, "PTSreply: "); |
584 | for (i = 0; i < num_bytes_read; i++) { | 577 | for (i = 0; i < num_bytes_read; i++) { |
585 | if (pc_debug >= 5) | 578 | pr_debug("0x%.2x ", pts_reply[i]); |
586 | printk("0x%.2x ", pts_reply[i]); | ||
587 | } | 579 | } |
588 | printk("\n"); | 580 | pr_debug("\n"); |
589 | #endif /* PCMCIA_DEBUG */ | 581 | #endif /* CM4000_DEBUG */ |
590 | 582 | ||
591 | DEBUGP(5, dev, "Clear Tactive in Flags1\n"); | 583 | DEBUGP(5, dev, "Clear Tactive in Flags1\n"); |
592 | xoutb(0x20, REG_FLAGS1(iobase)); | 584 | xoutb(0x20, REG_FLAGS1(iobase)); |
@@ -655,7 +647,7 @@ static void terminate_monitor(struct cm4000_dev *dev) | |||
655 | 647 | ||
656 | DEBUGP(5, dev, "Delete timer\n"); | 648 | DEBUGP(5, dev, "Delete timer\n"); |
657 | del_timer_sync(&dev->timer); | 649 | del_timer_sync(&dev->timer); |
658 | #ifdef PCMCIA_DEBUG | 650 | #ifdef CM4000_DEBUG |
659 | dev->monitor_running = 0; | 651 | dev->monitor_running = 0; |
660 | #endif | 652 | #endif |
661 | 653 | ||
@@ -898,7 +890,7 @@ static void monitor_card(unsigned long p) | |||
898 | DEBUGP(4, dev, "ATR checksum (0x%.2x, should " | 890 | DEBUGP(4, dev, "ATR checksum (0x%.2x, should " |
899 | "be zero) failed\n", dev->atr_csum); | 891 | "be zero) failed\n", dev->atr_csum); |
900 | } | 892 | } |
901 | #ifdef PCMCIA_DEBUG | 893 | #ifdef CM4000_DEBUG |
902 | else if (test_bit(IS_BAD_LENGTH, &dev->flags)) { | 894 | else if (test_bit(IS_BAD_LENGTH, &dev->flags)) { |
903 | DEBUGP(4, dev, "ATR length error\n"); | 895 | DEBUGP(4, dev, "ATR length error\n"); |
904 | } else { | 896 | } else { |
@@ -1415,7 +1407,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
1415 | int size; | 1407 | int size; |
1416 | int rc; | 1408 | int rc; |
1417 | void __user *argp = (void __user *)arg; | 1409 | void __user *argp = (void __user *)arg; |
1418 | #ifdef PCMCIA_DEBUG | 1410 | #ifdef CM4000_DEBUG |
1419 | char *ioctl_names[CM_IOC_MAXNR + 1] = { | 1411 | char *ioctl_names[CM_IOC_MAXNR + 1] = { |
1420 | [_IOC_NR(CM_IOCGSTATUS)] "CM_IOCGSTATUS", | 1412 | [_IOC_NR(CM_IOCGSTATUS)] "CM_IOCGSTATUS", |
1421 | [_IOC_NR(CM_IOCGATR)] "CM_IOCGATR", | 1413 | [_IOC_NR(CM_IOCGATR)] "CM_IOCGATR", |
@@ -1423,9 +1415,9 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
1423 | [_IOC_NR(CM_IOCSPTS)] "CM_IOCSPTS", | 1415 | [_IOC_NR(CM_IOCSPTS)] "CM_IOCSPTS", |
1424 | [_IOC_NR(CM_IOSDBGLVL)] "CM4000_DBGLVL", | 1416 | [_IOC_NR(CM_IOSDBGLVL)] "CM4000_DBGLVL", |
1425 | }; | 1417 | }; |
1426 | #endif | ||
1427 | DEBUGP(3, dev, "cmm_ioctl(device=%d.%d) %s\n", imajor(inode), | 1418 | DEBUGP(3, dev, "cmm_ioctl(device=%d.%d) %s\n", imajor(inode), |
1428 | iminor(inode), ioctl_names[_IOC_NR(cmd)]); | 1419 | iminor(inode), ioctl_names[_IOC_NR(cmd)]); |
1420 | #endif | ||
1429 | 1421 | ||
1430 | lock_kernel(); | 1422 | lock_kernel(); |
1431 | rc = -ENODEV; | 1423 | rc = -ENODEV; |
@@ -1523,7 +1515,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
1523 | } | 1515 | } |
1524 | case CM_IOCARDOFF: | 1516 | case CM_IOCARDOFF: |
1525 | 1517 | ||
1526 | #ifdef PCMCIA_DEBUG | 1518 | #ifdef CM4000_DEBUG |
1527 | DEBUGP(4, dev, "... in CM_IOCARDOFF\n"); | 1519 | DEBUGP(4, dev, "... in CM_IOCARDOFF\n"); |
1528 | if (dev->flags0 & 0x01) { | 1520 | if (dev->flags0 & 0x01) { |
1529 | DEBUGP(4, dev, " Card inserted\n"); | 1521 | DEBUGP(4, dev, " Card inserted\n"); |
@@ -1625,18 +1617,9 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
1625 | 1617 | ||
1626 | } | 1618 | } |
1627 | break; | 1619 | break; |
1628 | #ifdef PCMCIA_DEBUG | 1620 | #ifdef CM4000_DEBUG |
1629 | case CM_IOSDBGLVL: /* set debug log level */ | 1621 | case CM_IOSDBGLVL: |
1630 | { | 1622 | rc = -ENOTTY; |
1631 | int old_pc_debug = 0; | ||
1632 | |||
1633 | old_pc_debug = pc_debug; | ||
1634 | if (copy_from_user(&pc_debug, argp, sizeof(int))) | ||
1635 | rc = -EFAULT; | ||
1636 | else if (old_pc_debug != pc_debug) | ||
1637 | DEBUGP(0, dev, "Changed debug log level " | ||
1638 | "to %i\n", pc_debug); | ||
1639 | } | ||
1640 | break; | 1623 | break; |
1641 | #endif | 1624 | #endif |
1642 | default: | 1625 | default: |
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index 4f0723b07974..a6a70e476bea 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c | |||
@@ -17,8 +17,6 @@ | |||
17 | * All rights reserved, Dual BSD/GPL Licensed. | 17 | * All rights reserved, Dual BSD/GPL Licensed. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /* #define PCMCIA_DEBUG 6 */ | ||
21 | |||
22 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
23 | #include <linux/module.h> | 21 | #include <linux/module.h> |
24 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
@@ -41,18 +39,16 @@ | |||
41 | #include "cm4040_cs.h" | 39 | #include "cm4040_cs.h" |
42 | 40 | ||
43 | 41 | ||
44 | #ifdef PCMCIA_DEBUG | 42 | #define reader_to_dev(x) (&x->p_dev->dev) |
45 | #define reader_to_dev(x) (&handle_to_dev(x->p_dev)) | 43 | |
46 | static int pc_debug = PCMCIA_DEBUG; | 44 | /* n (debug level) is ignored */ |
47 | module_param(pc_debug, int, 0600); | 45 | /* additional debug output may be enabled by re-compiling with |
48 | #define DEBUGP(n, rdr, x, args...) do { \ | 46 | * CM4040_DEBUG set */ |
49 | if (pc_debug >= (n)) \ | 47 | /* #define CM4040_DEBUG */ |
50 | dev_printk(KERN_DEBUG, reader_to_dev(rdr), "%s:" x, \ | 48 | #define DEBUGP(n, rdr, x, args...) do { \ |
51 | __func__ , ##args); \ | 49 | dev_dbg(reader_to_dev(rdr), "%s:" x, \ |
50 | __func__ , ## args); \ | ||
52 | } while (0) | 51 | } while (0) |
53 | #else | ||
54 | #define DEBUGP(n, rdr, x, args...) | ||
55 | #endif | ||
56 | 52 | ||
57 | static char *version = | 53 | static char *version = |
58 | "OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte"; | 54 | "OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte"; |
@@ -90,14 +86,13 @@ struct reader_dev { | |||
90 | 86 | ||
91 | static struct pcmcia_device *dev_table[CM_MAX_DEV]; | 87 | static struct pcmcia_device *dev_table[CM_MAX_DEV]; |
92 | 88 | ||
93 | #ifndef PCMCIA_DEBUG | 89 | #ifndef CM4040_DEBUG |
94 | #define xoutb outb | 90 | #define xoutb outb |
95 | #define xinb inb | 91 | #define xinb inb |
96 | #else | 92 | #else |
97 | static inline void xoutb(unsigned char val, unsigned short port) | 93 | static inline void xoutb(unsigned char val, unsigned short port) |
98 | { | 94 | { |
99 | if (pc_debug >= 7) | 95 | pr_debug("outb(val=%.2x,port=%.4x)\n", val, port); |
100 | printk(KERN_DEBUG "outb(val=%.2x,port=%.4x)\n", val, port); | ||
101 | outb(val, port); | 96 | outb(val, port); |
102 | } | 97 | } |
103 | 98 | ||
@@ -106,8 +101,7 @@ static inline unsigned char xinb(unsigned short port) | |||
106 | unsigned char val; | 101 | unsigned char val; |
107 | 102 | ||
108 | val = inb(port); | 103 | val = inb(port); |
109 | if (pc_debug >= 7) | 104 | pr_debug("%.2x=inb(%.4x)\n", val, port); |
110 | printk(KERN_DEBUG "%.2x=inb(%.4x)\n", val, port); | ||
111 | return val; | 105 | return val; |
112 | } | 106 | } |
113 | #endif | 107 | #endif |
@@ -260,23 +254,22 @@ static ssize_t cm4040_read(struct file *filp, char __user *buf, | |||
260 | return -EIO; | 254 | return -EIO; |
261 | } | 255 | } |
262 | dev->r_buf[i] = xinb(iobase + REG_OFFSET_BULK_IN); | 256 | dev->r_buf[i] = xinb(iobase + REG_OFFSET_BULK_IN); |
263 | #ifdef PCMCIA_DEBUG | 257 | #ifdef CM4040_DEBUG |
264 | if (pc_debug >= 6) | 258 | pr_debug("%lu:%2x ", i, dev->r_buf[i]); |
265 | printk(KERN_DEBUG "%lu:%2x ", i, dev->r_buf[i]); | ||
266 | } | 259 | } |
267 | printk("\n"); | 260 | pr_debug("\n"); |
268 | #else | 261 | #else |
269 | } | 262 | } |
270 | #endif | 263 | #endif |
271 | 264 | ||
272 | bytes_to_read = 5 + le32_to_cpu(*(__le32 *)&dev->r_buf[1]); | 265 | bytes_to_read = 5 + le32_to_cpu(*(__le32 *)&dev->r_buf[1]); |
273 | 266 | ||
274 | DEBUGP(6, dev, "BytesToRead=%lu\n", bytes_to_read); | 267 | DEBUGP(6, dev, "BytesToRead=%zu\n", bytes_to_read); |
275 | 268 | ||
276 | min_bytes_to_read = min(count, bytes_to_read + 5); | 269 | min_bytes_to_read = min(count, bytes_to_read + 5); |
277 | min_bytes_to_read = min_t(size_t, min_bytes_to_read, READ_WRITE_BUFFER_SIZE); | 270 | min_bytes_to_read = min_t(size_t, min_bytes_to_read, READ_WRITE_BUFFER_SIZE); |
278 | 271 | ||
279 | DEBUGP(6, dev, "Min=%lu\n", min_bytes_to_read); | 272 | DEBUGP(6, dev, "Min=%zu\n", min_bytes_to_read); |
280 | 273 | ||
281 | for (i = 0; i < (min_bytes_to_read-5); i++) { | 274 | for (i = 0; i < (min_bytes_to_read-5); i++) { |
282 | rc = wait_for_bulk_in_ready(dev); | 275 | rc = wait_for_bulk_in_ready(dev); |
@@ -288,11 +281,10 @@ static ssize_t cm4040_read(struct file *filp, char __user *buf, | |||
288 | return -EIO; | 281 | return -EIO; |
289 | } | 282 | } |
290 | dev->r_buf[i+5] = xinb(iobase + REG_OFFSET_BULK_IN); | 283 | dev->r_buf[i+5] = xinb(iobase + REG_OFFSET_BULK_IN); |
291 | #ifdef PCMCIA_DEBUG | 284 | #ifdef CM4040_DEBUG |
292 | if (pc_debug >= 6) | 285 | pr_debug("%lu:%2x ", i, dev->r_buf[i]); |
293 | printk(KERN_DEBUG "%lu:%2x ", i, dev->r_buf[i]); | ||
294 | } | 286 | } |
295 | printk("\n"); | 287 | pr_debug("\n"); |
296 | #else | 288 | #else |
297 | } | 289 | } |
298 | #endif | 290 | #endif |
@@ -547,7 +539,7 @@ static int cm4040_config_check(struct pcmcia_device *p_dev, | |||
547 | p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; | 539 | p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; |
548 | 540 | ||
549 | rc = pcmcia_request_io(p_dev, &p_dev->io); | 541 | rc = pcmcia_request_io(p_dev, &p_dev->io); |
550 | dev_printk(KERN_INFO, &handle_to_dev(p_dev), | 542 | dev_printk(KERN_INFO, &p_dev->dev, |
551 | "pcmcia_request_io returned 0x%x\n", rc); | 543 | "pcmcia_request_io returned 0x%x\n", rc); |
552 | return rc; | 544 | return rc; |
553 | } | 545 | } |
@@ -569,7 +561,7 @@ static int reader_config(struct pcmcia_device *link, int devno) | |||
569 | 561 | ||
570 | fail_rc = pcmcia_request_configuration(link, &link->conf); | 562 | fail_rc = pcmcia_request_configuration(link, &link->conf); |
571 | if (fail_rc != 0) { | 563 | if (fail_rc != 0) { |
572 | dev_printk(KERN_INFO, &handle_to_dev(link), | 564 | dev_printk(KERN_INFO, &link->dev, |
573 | "pcmcia_request_configuration failed 0x%x\n", | 565 | "pcmcia_request_configuration failed 0x%x\n", |
574 | fail_rc); | 566 | fail_rc); |
575 | goto cs_release; | 567 | goto cs_release; |
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c index 4c1820cad712..99cffdab1056 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.c +++ b/drivers/char/pcmcia/ipwireless/hardware.c | |||
@@ -1213,12 +1213,12 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq, | |||
1213 | 1213 | ||
1214 | irqreturn_t ipwireless_interrupt(int irq, void *dev_id) | 1214 | irqreturn_t ipwireless_interrupt(int irq, void *dev_id) |
1215 | { | 1215 | { |
1216 | struct ipw_hardware *hw = dev_id; | 1216 | struct ipw_dev *ipw = dev_id; |
1217 | 1217 | ||
1218 | if (hw->hw_version == HW_VERSION_1) | 1218 | if (ipw->hardware->hw_version == HW_VERSION_1) |
1219 | return ipwireless_handle_v1_interrupt(irq, hw); | 1219 | return ipwireless_handle_v1_interrupt(irq, ipw->hardware); |
1220 | else | 1220 | else |
1221 | return ipwireless_handle_v2_v3_interrupt(irq, hw); | 1221 | return ipwireless_handle_v2_v3_interrupt(irq, ipw->hardware); |
1222 | } | 1222 | } |
1223 | 1223 | ||
1224 | static void flush_packets_to_hw(struct ipw_hardware *hw) | 1224 | static void flush_packets_to_hw(struct ipw_hardware *hw) |
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index 5216fce0c62d..dff24dae1485 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
@@ -65,10 +65,7 @@ static void signalled_reboot_work(struct work_struct *work_reboot) | |||
65 | struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev, | 65 | struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev, |
66 | work_reboot); | 66 | work_reboot); |
67 | struct pcmcia_device *link = ipw->link; | 67 | struct pcmcia_device *link = ipw->link; |
68 | int ret = pcmcia_reset_card(link->socket); | 68 | pcmcia_reset_card(link->socket); |
69 | |||
70 | if (ret != 0) | ||
71 | cs_error(link, ResetCard, ret); | ||
72 | } | 69 | } |
73 | 70 | ||
74 | static void signalled_reboot_callback(void *callback_data) | 71 | static void signalled_reboot_callback(void *callback_data) |
@@ -79,208 +76,127 @@ static void signalled_reboot_callback(void *callback_data) | |||
79 | schedule_work(&ipw->work_reboot); | 76 | schedule_work(&ipw->work_reboot); |
80 | } | 77 | } |
81 | 78 | ||
82 | static int config_ipwireless(struct ipw_dev *ipw) | 79 | static int ipwireless_probe(struct pcmcia_device *p_dev, |
80 | cistpl_cftable_entry_t *cfg, | ||
81 | cistpl_cftable_entry_t *dflt, | ||
82 | unsigned int vcc, | ||
83 | void *priv_data) | ||
83 | { | 84 | { |
84 | struct pcmcia_device *link = ipw->link; | 85 | struct ipw_dev *ipw = priv_data; |
85 | int ret; | 86 | struct resource *io_resource; |
86 | tuple_t tuple; | ||
87 | unsigned short buf[64]; | ||
88 | cisparse_t parse; | ||
89 | unsigned short cor_value; | ||
90 | memreq_t memreq_attr_memory; | 87 | memreq_t memreq_attr_memory; |
91 | memreq_t memreq_common_memory; | 88 | memreq_t memreq_common_memory; |
89 | int ret; | ||
92 | 90 | ||
93 | ipw->is_v2_card = 0; | 91 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
94 | 92 | p_dev->io.BasePort1 = cfg->io.win[0].base; | |
95 | tuple.Attributes = 0; | 93 | p_dev->io.NumPorts1 = cfg->io.win[0].len; |
96 | tuple.TupleData = (cisdata_t *) buf; | 94 | p_dev->io.IOAddrLines = 16; |
97 | tuple.TupleDataMax = sizeof(buf); | ||
98 | tuple.TupleOffset = 0; | ||
99 | |||
100 | tuple.DesiredTuple = RETURN_FIRST_TUPLE; | ||
101 | |||
102 | ret = pcmcia_get_first_tuple(link, &tuple); | ||
103 | |||
104 | while (ret == 0) { | ||
105 | ret = pcmcia_get_tuple_data(link, &tuple); | ||
106 | |||
107 | if (ret != 0) { | ||
108 | cs_error(link, GetTupleData, ret); | ||
109 | goto exit0; | ||
110 | } | ||
111 | ret = pcmcia_get_next_tuple(link, &tuple); | ||
112 | } | ||
113 | |||
114 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
115 | |||
116 | ret = pcmcia_get_first_tuple(link, &tuple); | ||
117 | |||
118 | if (ret != 0) { | ||
119 | cs_error(link, GetFirstTuple, ret); | ||
120 | goto exit0; | ||
121 | } | ||
122 | |||
123 | ret = pcmcia_get_tuple_data(link, &tuple); | ||
124 | |||
125 | if (ret != 0) { | ||
126 | cs_error(link, GetTupleData, ret); | ||
127 | goto exit0; | ||
128 | } | ||
129 | |||
130 | ret = pcmcia_parse_tuple(&tuple, &parse); | ||
131 | |||
132 | if (ret != 0) { | ||
133 | cs_error(link, ParseTuple, ret); | ||
134 | goto exit0; | ||
135 | } | ||
136 | |||
137 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
138 | link->io.BasePort1 = parse.cftable_entry.io.win[0].base; | ||
139 | link->io.NumPorts1 = parse.cftable_entry.io.win[0].len; | ||
140 | link->io.IOAddrLines = 16; | ||
141 | |||
142 | link->irq.IRQInfo1 = parse.cftable_entry.irq.IRQInfo1; | ||
143 | 95 | ||
144 | /* 0x40 causes it to generate level mode interrupts. */ | 96 | /* 0x40 causes it to generate level mode interrupts. */ |
145 | /* 0x04 enables IREQ pin. */ | 97 | /* 0x04 enables IREQ pin. */ |
146 | cor_value = parse.cftable_entry.index | 0x44; | 98 | p_dev->conf.ConfigIndex = cfg->index | 0x44; |
147 | link->conf.ConfigIndex = cor_value; | 99 | ret = pcmcia_request_io(p_dev, &p_dev->io); |
100 | if (ret) | ||
101 | return ret; | ||
148 | 102 | ||
149 | /* IRQ and I/O settings */ | 103 | io_resource = request_region(p_dev->io.BasePort1, p_dev->io.NumPorts1, |
150 | tuple.DesiredTuple = CISTPL_CONFIG; | 104 | IPWIRELESS_PCCARD_NAME); |
151 | 105 | ||
152 | ret = pcmcia_get_first_tuple(link, &tuple); | 106 | if (cfg->mem.nwin == 0) |
107 | return 0; | ||
153 | 108 | ||
154 | if (ret != 0) { | 109 | ipw->request_common_memory.Attributes = |
155 | cs_error(link, GetFirstTuple, ret); | 110 | WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE; |
156 | goto exit0; | 111 | ipw->request_common_memory.Base = cfg->mem.win[0].host_addr; |
157 | } | 112 | ipw->request_common_memory.Size = cfg->mem.win[0].len; |
113 | if (ipw->request_common_memory.Size < 0x1000) | ||
114 | ipw->request_common_memory.Size = 0x1000; | ||
115 | ipw->request_common_memory.AccessSpeed = 0; | ||
158 | 116 | ||
159 | ret = pcmcia_get_tuple_data(link, &tuple); | 117 | ret = pcmcia_request_window(p_dev, &ipw->request_common_memory, |
160 | 118 | &ipw->handle_common_memory); | |
161 | if (ret != 0) { | ||
162 | cs_error(link, GetTupleData, ret); | ||
163 | goto exit0; | ||
164 | } | ||
165 | 119 | ||
166 | ret = pcmcia_parse_tuple(&tuple, &parse); | 120 | if (ret != 0) |
121 | goto exit1; | ||
167 | 122 | ||
168 | if (ret != 0) { | 123 | memreq_common_memory.CardOffset = cfg->mem.win[0].card_addr; |
169 | cs_error(link, GetTupleData, ret); | 124 | memreq_common_memory.Page = 0; |
170 | goto exit0; | ||
171 | } | ||
172 | link->conf.Attributes = CONF_ENABLE_IRQ; | ||
173 | link->conf.ConfigBase = parse.config.base; | ||
174 | link->conf.Present = parse.config.rmask[0]; | ||
175 | link->conf.IntType = INT_MEMORY_AND_IO; | ||
176 | 125 | ||
177 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 126 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory, |
178 | link->irq.Handler = ipwireless_interrupt; | 127 | &memreq_common_memory); |
179 | link->irq.Instance = ipw->hardware; | ||
180 | 128 | ||
181 | ret = pcmcia_request_io(link, &link->io); | 129 | if (ret != 0) |
130 | goto exit2; | ||
182 | 131 | ||
183 | if (ret != 0) { | 132 | ipw->is_v2_card = cfg->mem.win[0].len == 0x100; |
184 | cs_error(link, RequestIO, ret); | ||
185 | goto exit0; | ||
186 | } | ||
187 | 133 | ||
188 | request_region(link->io.BasePort1, link->io.NumPorts1, | 134 | ipw->common_memory = ioremap(ipw->request_common_memory.Base, |
135 | ipw->request_common_memory.Size); | ||
136 | request_mem_region(ipw->request_common_memory.Base, | ||
137 | ipw->request_common_memory.Size, | ||
189 | IPWIRELESS_PCCARD_NAME); | 138 | IPWIRELESS_PCCARD_NAME); |
190 | 139 | ||
191 | /* memory settings */ | 140 | ipw->request_attr_memory.Attributes = |
192 | 141 | WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE; | |
193 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 142 | ipw->request_attr_memory.Base = 0; |
194 | 143 | ipw->request_attr_memory.Size = 0; /* this used to be 0x1000 */ | |
195 | ret = pcmcia_get_first_tuple(link, &tuple); | 144 | ipw->request_attr_memory.AccessSpeed = 0; |
196 | |||
197 | if (ret != 0) { | ||
198 | cs_error(link, GetFirstTuple, ret); | ||
199 | goto exit1; | ||
200 | } | ||
201 | |||
202 | ret = pcmcia_get_tuple_data(link, &tuple); | ||
203 | 145 | ||
204 | if (ret != 0) { | 146 | ret = pcmcia_request_window(p_dev, &ipw->request_attr_memory, |
205 | cs_error(link, GetTupleData, ret); | 147 | &ipw->handle_attr_memory); |
206 | goto exit1; | ||
207 | } | ||
208 | |||
209 | ret = pcmcia_parse_tuple(&tuple, &parse); | ||
210 | |||
211 | if (ret != 0) { | ||
212 | cs_error(link, ParseTuple, ret); | ||
213 | goto exit1; | ||
214 | } | ||
215 | 148 | ||
216 | if (parse.cftable_entry.mem.nwin > 0) { | 149 | if (ret != 0) |
217 | ipw->request_common_memory.Attributes = | 150 | goto exit2; |
218 | WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE; | ||
219 | ipw->request_common_memory.Base = | ||
220 | parse.cftable_entry.mem.win[0].host_addr; | ||
221 | ipw->request_common_memory.Size = parse.cftable_entry.mem.win[0].len; | ||
222 | if (ipw->request_common_memory.Size < 0x1000) | ||
223 | ipw->request_common_memory.Size = 0x1000; | ||
224 | ipw->request_common_memory.AccessSpeed = 0; | ||
225 | |||
226 | ret = pcmcia_request_window(&link, &ipw->request_common_memory, | ||
227 | &ipw->handle_common_memory); | ||
228 | 151 | ||
229 | if (ret != 0) { | 152 | memreq_attr_memory.CardOffset = 0; |
230 | cs_error(link, RequestWindow, ret); | 153 | memreq_attr_memory.Page = 0; |
231 | goto exit1; | ||
232 | } | ||
233 | 154 | ||
234 | memreq_common_memory.CardOffset = | 155 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, |
235 | parse.cftable_entry.mem.win[0].card_addr; | 156 | &memreq_attr_memory); |
236 | memreq_common_memory.Page = 0; | ||
237 | 157 | ||
238 | ret = pcmcia_map_mem_page(ipw->handle_common_memory, | 158 | if (ret != 0) |
239 | &memreq_common_memory); | 159 | goto exit3; |
240 | 160 | ||
241 | if (ret != 0) { | 161 | ipw->attr_memory = ioremap(ipw->request_attr_memory.Base, |
242 | cs_error(link, MapMemPage, ret); | 162 | ipw->request_attr_memory.Size); |
243 | goto exit1; | 163 | request_mem_region(ipw->request_attr_memory.Base, |
244 | } | 164 | ipw->request_attr_memory.Size, IPWIRELESS_PCCARD_NAME); |
245 | 165 | ||
246 | ipw->is_v2_card = | 166 | return 0; |
247 | parse.cftable_entry.mem.win[0].len == 0x100; | ||
248 | 167 | ||
249 | ipw->common_memory = ioremap(ipw->request_common_memory.Base, | 168 | exit3: |
169 | pcmcia_release_window(p_dev, ipw->handle_attr_memory); | ||
170 | exit2: | ||
171 | if (ipw->common_memory) { | ||
172 | release_mem_region(ipw->request_common_memory.Base, | ||
250 | ipw->request_common_memory.Size); | 173 | ipw->request_common_memory.Size); |
251 | request_mem_region(ipw->request_common_memory.Base, | 174 | iounmap(ipw->common_memory); |
252 | ipw->request_common_memory.Size, IPWIRELESS_PCCARD_NAME); | 175 | pcmcia_release_window(p_dev, ipw->handle_common_memory); |
253 | 176 | } else | |
254 | ipw->request_attr_memory.Attributes = | 177 | pcmcia_release_window(p_dev, ipw->handle_common_memory); |
255 | WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE; | 178 | exit1: |
256 | ipw->request_attr_memory.Base = 0; | 179 | release_resource(io_resource); |
257 | ipw->request_attr_memory.Size = 0; /* this used to be 0x1000 */ | 180 | pcmcia_disable_device(p_dev); |
258 | ipw->request_attr_memory.AccessSpeed = 0; | 181 | return -1; |
259 | 182 | } | |
260 | ret = pcmcia_request_window(&link, &ipw->request_attr_memory, | ||
261 | &ipw->handle_attr_memory); | ||
262 | 183 | ||
263 | if (ret != 0) { | 184 | static int config_ipwireless(struct ipw_dev *ipw) |
264 | cs_error(link, RequestWindow, ret); | 185 | { |
265 | goto exit2; | 186 | struct pcmcia_device *link = ipw->link; |
266 | } | 187 | int ret = 0; |
267 | 188 | ||
268 | memreq_attr_memory.CardOffset = 0; | 189 | ipw->is_v2_card = 0; |
269 | memreq_attr_memory.Page = 0; | ||
270 | 190 | ||
271 | ret = pcmcia_map_mem_page(ipw->handle_attr_memory, | 191 | ret = pcmcia_loop_config(link, ipwireless_probe, ipw); |
272 | &memreq_attr_memory); | 192 | if (ret != 0) |
193 | return ret; | ||
273 | 194 | ||
274 | if (ret != 0) { | 195 | link->conf.Attributes = CONF_ENABLE_IRQ; |
275 | cs_error(link, MapMemPage, ret); | 196 | link->conf.IntType = INT_MEMORY_AND_IO; |
276 | goto exit2; | ||
277 | } | ||
278 | 197 | ||
279 | ipw->attr_memory = ioremap(ipw->request_attr_memory.Base, | 198 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
280 | ipw->request_attr_memory.Size); | 199 | link->irq.Handler = ipwireless_interrupt; |
281 | request_mem_region(ipw->request_attr_memory.Base, ipw->request_attr_memory.Size, | ||
282 | IPWIRELESS_PCCARD_NAME); | ||
283 | } | ||
284 | 200 | ||
285 | INIT_WORK(&ipw->work_reboot, signalled_reboot_work); | 201 | INIT_WORK(&ipw->work_reboot, signalled_reboot_work); |
286 | 202 | ||
@@ -291,10 +207,8 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
291 | 207 | ||
292 | ret = pcmcia_request_irq(link, &link->irq); | 208 | ret = pcmcia_request_irq(link, &link->irq); |
293 | 209 | ||
294 | if (ret != 0) { | 210 | if (ret != 0) |
295 | cs_error(link, RequestIRQ, ret); | 211 | goto exit; |
296 | goto exit3; | ||
297 | } | ||
298 | 212 | ||
299 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n", | 213 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n", |
300 | ipw->is_v2_card ? "V2/V3" : "V1"); | 214 | ipw->is_v2_card ? "V2/V3" : "V1"); |
@@ -316,12 +230,12 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
316 | 230 | ||
317 | ipw->network = ipwireless_network_create(ipw->hardware); | 231 | ipw->network = ipwireless_network_create(ipw->hardware); |
318 | if (!ipw->network) | 232 | if (!ipw->network) |
319 | goto exit3; | 233 | goto exit; |
320 | 234 | ||
321 | ipw->tty = ipwireless_tty_create(ipw->hardware, ipw->network, | 235 | ipw->tty = ipwireless_tty_create(ipw->hardware, ipw->network, |
322 | ipw->nodes); | 236 | ipw->nodes); |
323 | if (!ipw->tty) | 237 | if (!ipw->tty) |
324 | goto exit3; | 238 | goto exit; |
325 | 239 | ||
326 | ipwireless_init_hardware_v2_v3(ipw->hardware); | 240 | ipwireless_init_hardware_v2_v3(ipw->hardware); |
327 | 241 | ||
@@ -331,35 +245,27 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
331 | */ | 245 | */ |
332 | ret = pcmcia_request_configuration(link, &link->conf); | 246 | ret = pcmcia_request_configuration(link, &link->conf); |
333 | 247 | ||
334 | if (ret != 0) { | 248 | if (ret != 0) |
335 | cs_error(link, RequestConfiguration, ret); | 249 | goto exit; |
336 | goto exit4; | ||
337 | } | ||
338 | 250 | ||
339 | link->dev_node = &ipw->nodes[0]; | 251 | link->dev_node = &ipw->nodes[0]; |
340 | 252 | ||
341 | return 0; | 253 | return 0; |
342 | 254 | ||
343 | exit4: | 255 | exit: |
344 | pcmcia_disable_device(link); | ||
345 | exit3: | ||
346 | if (ipw->attr_memory) { | 256 | if (ipw->attr_memory) { |
347 | release_mem_region(ipw->request_attr_memory.Base, | 257 | release_mem_region(ipw->request_attr_memory.Base, |
348 | ipw->request_attr_memory.Size); | 258 | ipw->request_attr_memory.Size); |
349 | iounmap(ipw->attr_memory); | 259 | iounmap(ipw->attr_memory); |
350 | pcmcia_release_window(ipw->handle_attr_memory); | 260 | pcmcia_release_window(link, ipw->handle_attr_memory); |
351 | pcmcia_disable_device(link); | ||
352 | } | 261 | } |
353 | exit2: | ||
354 | if (ipw->common_memory) { | 262 | if (ipw->common_memory) { |
355 | release_mem_region(ipw->request_common_memory.Base, | 263 | release_mem_region(ipw->request_common_memory.Base, |
356 | ipw->request_common_memory.Size); | 264 | ipw->request_common_memory.Size); |
357 | iounmap(ipw->common_memory); | 265 | iounmap(ipw->common_memory); |
358 | pcmcia_release_window(ipw->handle_common_memory); | 266 | pcmcia_release_window(link, ipw->handle_common_memory); |
359 | } | 267 | } |
360 | exit1: | ||
361 | pcmcia_disable_device(link); | 268 | pcmcia_disable_device(link); |
362 | exit0: | ||
363 | return -1; | 269 | return -1; |
364 | } | 270 | } |
365 | 271 | ||
@@ -378,9 +284,9 @@ static void release_ipwireless(struct ipw_dev *ipw) | |||
378 | iounmap(ipw->attr_memory); | 284 | iounmap(ipw->attr_memory); |
379 | } | 285 | } |
380 | if (ipw->common_memory) | 286 | if (ipw->common_memory) |
381 | pcmcia_release_window(ipw->handle_common_memory); | 287 | pcmcia_release_window(ipw->link, ipw->handle_common_memory); |
382 | if (ipw->attr_memory) | 288 | if (ipw->attr_memory) |
383 | pcmcia_release_window(ipw->handle_attr_memory); | 289 | pcmcia_release_window(ipw->link, ipw->handle_attr_memory); |
384 | 290 | ||
385 | /* Break the link with Card Services */ | 291 | /* Break the link with Card Services */ |
386 | pcmcia_disable_device(ipw->link); | 292 | pcmcia_disable_device(ipw->link); |
@@ -406,7 +312,6 @@ static int ipwireless_attach(struct pcmcia_device *link) | |||
406 | 312 | ||
407 | ipw->link = link; | 313 | ipw->link = link; |
408 | link->priv = ipw; | 314 | link->priv = ipw; |
409 | link->irq.Instance = ipw; | ||
410 | 315 | ||
411 | /* Link this device into our device list. */ | 316 | /* Link this device into our device list. */ |
412 | link->dev_node = &ipw->nodes[0]; | 317 | link->dev_node = &ipw->nodes[0]; |
@@ -421,7 +326,6 @@ static int ipwireless_attach(struct pcmcia_device *link) | |||
421 | ret = config_ipwireless(ipw); | 326 | ret = config_ipwireless(ipw); |
422 | 327 | ||
423 | if (ret != 0) { | 328 | if (ret != 0) { |
424 | cs_error(link, RegisterClient, ret); | ||
425 | ipwireless_detach(link); | 329 | ipwireless_detach(link); |
426 | return ret; | 330 | return ret; |
427 | } | 331 | } |
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index caf6e4d19469..c31a0d913d37 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -554,7 +554,6 @@ static int mgslpc_probe(struct pcmcia_device *link) | |||
554 | 554 | ||
555 | /* Interrupt setup */ | 555 | /* Interrupt setup */ |
556 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 556 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
557 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
558 | link->irq.Handler = NULL; | 557 | link->irq.Handler = NULL; |
559 | 558 | ||
560 | link->conf.Attributes = 0; | 559 | link->conf.Attributes = 0; |
@@ -572,69 +571,51 @@ static int mgslpc_probe(struct pcmcia_device *link) | |||
572 | /* Card has been inserted. | 571 | /* Card has been inserted. |
573 | */ | 572 | */ |
574 | 573 | ||
575 | #define CS_CHECK(fn, ret) \ | 574 | static int mgslpc_ioprobe(struct pcmcia_device *p_dev, |
576 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | 575 | cistpl_cftable_entry_t *cfg, |
576 | cistpl_cftable_entry_t *dflt, | ||
577 | unsigned int vcc, | ||
578 | void *priv_data) | ||
579 | { | ||
580 | if (cfg->io.nwin > 0) { | ||
581 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
582 | if (!(cfg->io.flags & CISTPL_IO_8BIT)) | ||
583 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
584 | if (!(cfg->io.flags & CISTPL_IO_16BIT)) | ||
585 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
586 | p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; | ||
587 | p_dev->io.BasePort1 = cfg->io.win[0].base; | ||
588 | p_dev->io.NumPorts1 = cfg->io.win[0].len; | ||
589 | return pcmcia_request_io(p_dev, &p_dev->io); | ||
590 | } | ||
591 | return -ENODEV; | ||
592 | } | ||
577 | 593 | ||
578 | static int mgslpc_config(struct pcmcia_device *link) | 594 | static int mgslpc_config(struct pcmcia_device *link) |
579 | { | 595 | { |
580 | MGSLPC_INFO *info = link->priv; | 596 | MGSLPC_INFO *info = link->priv; |
581 | tuple_t tuple; | 597 | int ret; |
582 | cisparse_t parse; | ||
583 | int last_fn, last_ret; | ||
584 | u_char buf[64]; | ||
585 | cistpl_cftable_entry_t dflt = { 0 }; | ||
586 | cistpl_cftable_entry_t *cfg; | ||
587 | 598 | ||
588 | if (debug_level >= DEBUG_LEVEL_INFO) | 599 | if (debug_level >= DEBUG_LEVEL_INFO) |
589 | printk("mgslpc_config(0x%p)\n", link); | 600 | printk("mgslpc_config(0x%p)\n", link); |
590 | 601 | ||
591 | tuple.Attributes = 0; | 602 | ret = pcmcia_loop_config(link, mgslpc_ioprobe, NULL); |
592 | tuple.TupleData = buf; | 603 | if (ret != 0) |
593 | tuple.TupleDataMax = sizeof(buf); | 604 | goto failed; |
594 | tuple.TupleOffset = 0; | ||
595 | |||
596 | /* get CIS configuration entry */ | ||
597 | |||
598 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
599 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); | ||
600 | |||
601 | cfg = &(parse.cftable_entry); | ||
602 | CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple)); | ||
603 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse)); | ||
604 | |||
605 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg; | ||
606 | if (cfg->index == 0) | ||
607 | goto cs_failed; | ||
608 | |||
609 | link->conf.ConfigIndex = cfg->index; | ||
610 | link->conf.Attributes |= CONF_ENABLE_IRQ; | ||
611 | |||
612 | /* IO window settings */ | ||
613 | link->io.NumPorts1 = 0; | ||
614 | if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { | ||
615 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; | ||
616 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
617 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
618 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
619 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
620 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
621 | link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
622 | link->io.BasePort1 = io->win[0].base; | ||
623 | link->io.NumPorts1 = io->win[0].len; | ||
624 | CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); | ||
625 | } | ||
626 | 605 | ||
627 | link->conf.Attributes = CONF_ENABLE_IRQ; | 606 | link->conf.Attributes = CONF_ENABLE_IRQ; |
628 | link->conf.IntType = INT_MEMORY_AND_IO; | 607 | link->conf.IntType = INT_MEMORY_AND_IO; |
629 | link->conf.ConfigIndex = 8; | 608 | link->conf.ConfigIndex = 8; |
630 | link->conf.Present = PRESENT_OPTION; | 609 | link->conf.Present = PRESENT_OPTION; |
631 | 610 | ||
632 | link->irq.Attributes |= IRQ_HANDLE_PRESENT; | ||
633 | link->irq.Handler = mgslpc_isr; | 611 | link->irq.Handler = mgslpc_isr; |
634 | link->irq.Instance = info; | ||
635 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | ||
636 | 612 | ||
637 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 613 | ret = pcmcia_request_irq(link, &link->irq); |
614 | if (ret) | ||
615 | goto failed; | ||
616 | ret = pcmcia_request_configuration(link, &link->conf); | ||
617 | if (ret) | ||
618 | goto failed; | ||
638 | 619 | ||
639 | info->io_base = link->io.BasePort1; | 620 | info->io_base = link->io.BasePort1; |
640 | info->irq_level = link->irq.AssignedIRQ; | 621 | info->irq_level = link->irq.AssignedIRQ; |
@@ -654,8 +635,7 @@ static int mgslpc_config(struct pcmcia_device *link) | |||
654 | printk("\n"); | 635 | printk("\n"); |
655 | return 0; | 636 | return 0; |
656 | 637 | ||
657 | cs_failed: | 638 | failed: |
658 | cs_error(link, last_fn, last_ret); | ||
659 | mgslpc_release((u_long)link); | 639 | mgslpc_release((u_long)link); |
660 | return -ENODEV; | 640 | return -ENODEV; |
661 | } | 641 | } |
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c index 063b933d864a..dd6396384c25 100644 --- a/drivers/ide/ide-cs.c +++ b/drivers/ide/ide-cs.c | |||
@@ -60,15 +60,6 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>"); | |||
60 | MODULE_DESCRIPTION("PCMCIA ATA/IDE card driver"); | 60 | MODULE_DESCRIPTION("PCMCIA ATA/IDE card driver"); |
61 | MODULE_LICENSE("Dual MPL/GPL"); | 61 | MODULE_LICENSE("Dual MPL/GPL"); |
62 | 62 | ||
63 | #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0) | ||
64 | |||
65 | #ifdef CONFIG_PCMCIA_DEBUG | ||
66 | INT_MODULE_PARM(pc_debug, 0); | ||
67 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
68 | #else | ||
69 | #define DEBUG(n, args...) | ||
70 | #endif | ||
71 | |||
72 | /*====================================================================*/ | 63 | /*====================================================================*/ |
73 | 64 | ||
74 | typedef struct ide_info_t { | 65 | typedef struct ide_info_t { |
@@ -98,7 +89,7 @@ static int ide_probe(struct pcmcia_device *link) | |||
98 | { | 89 | { |
99 | ide_info_t *info; | 90 | ide_info_t *info; |
100 | 91 | ||
101 | DEBUG(0, "ide_attach()\n"); | 92 | dev_dbg(&link->dev, "ide_attach()\n"); |
102 | 93 | ||
103 | /* Create new ide device */ | 94 | /* Create new ide device */ |
104 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 95 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
@@ -112,7 +103,6 @@ static int ide_probe(struct pcmcia_device *link) | |||
112 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 103 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
113 | link->io.IOAddrLines = 3; | 104 | link->io.IOAddrLines = 3; |
114 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 105 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
115 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
116 | link->conf.Attributes = CONF_ENABLE_IRQ; | 106 | link->conf.Attributes = CONF_ENABLE_IRQ; |
117 | link->conf.IntType = INT_MEMORY_AND_IO; | 107 | link->conf.IntType = INT_MEMORY_AND_IO; |
118 | 108 | ||
@@ -134,7 +124,7 @@ static void ide_detach(struct pcmcia_device *link) | |||
134 | ide_hwif_t *hwif = info->host->ports[0]; | 124 | ide_hwif_t *hwif = info->host->ports[0]; |
135 | unsigned long data_addr, ctl_addr; | 125 | unsigned long data_addr, ctl_addr; |
136 | 126 | ||
137 | DEBUG(0, "ide_detach(0x%p)\n", link); | 127 | dev_dbg(&link->dev, "ide_detach(0x%p)\n", link); |
138 | 128 | ||
139 | data_addr = hwif->io_ports.data_addr; | 129 | data_addr = hwif->io_ports.data_addr; |
140 | ctl_addr = hwif->io_ports.ctl_addr; | 130 | ctl_addr = hwif->io_ports.ctl_addr; |
@@ -217,9 +207,6 @@ out_release: | |||
217 | 207 | ||
218 | ======================================================================*/ | 208 | ======================================================================*/ |
219 | 209 | ||
220 | #define CS_CHECK(fn, ret) \ | ||
221 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
222 | |||
223 | struct pcmcia_config_check { | 210 | struct pcmcia_config_check { |
224 | unsigned long ctl_base; | 211 | unsigned long ctl_base; |
225 | int skip_vcc; | 212 | int skip_vcc; |
@@ -282,11 +269,11 @@ static int ide_config(struct pcmcia_device *link) | |||
282 | { | 269 | { |
283 | ide_info_t *info = link->priv; | 270 | ide_info_t *info = link->priv; |
284 | struct pcmcia_config_check *stk = NULL; | 271 | struct pcmcia_config_check *stk = NULL; |
285 | int last_ret = 0, last_fn = 0, is_kme = 0; | 272 | int ret = 0, is_kme = 0; |
286 | unsigned long io_base, ctl_base; | 273 | unsigned long io_base, ctl_base; |
287 | struct ide_host *host; | 274 | struct ide_host *host; |
288 | 275 | ||
289 | DEBUG(0, "ide_config(0x%p)\n", link); | 276 | dev_dbg(&link->dev, "ide_config(0x%p)\n", link); |
290 | 277 | ||
291 | is_kme = ((link->manf_id == MANFID_KME) && | 278 | is_kme = ((link->manf_id == MANFID_KME) && |
292 | ((link->card_id == PRODID_KME_KXLC005_A) || | 279 | ((link->card_id == PRODID_KME_KXLC005_A) || |
@@ -306,8 +293,12 @@ static int ide_config(struct pcmcia_device *link) | |||
306 | io_base = link->io.BasePort1; | 293 | io_base = link->io.BasePort1; |
307 | ctl_base = stk->ctl_base; | 294 | ctl_base = stk->ctl_base; |
308 | 295 | ||
309 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 296 | ret = pcmcia_request_irq(link, &link->irq); |
310 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 297 | if (ret) |
298 | goto failed; | ||
299 | ret = pcmcia_request_configuration(link, &link->conf); | ||
300 | if (ret) | ||
301 | goto failed; | ||
311 | 302 | ||
312 | /* disable drive interrupts during IDE probe */ | 303 | /* disable drive interrupts during IDE probe */ |
313 | outb(0x02, ctl_base); | 304 | outb(0x02, ctl_base); |
@@ -342,8 +333,6 @@ err_mem: | |||
342 | printk(KERN_NOTICE "ide-cs: ide_config failed memory allocation\n"); | 333 | printk(KERN_NOTICE "ide-cs: ide_config failed memory allocation\n"); |
343 | goto failed; | 334 | goto failed; |
344 | 335 | ||
345 | cs_failed: | ||
346 | cs_error(link, last_fn, last_ret); | ||
347 | failed: | 336 | failed: |
348 | kfree(stk); | 337 | kfree(stk); |
349 | ide_release(link); | 338 | ide_release(link); |
@@ -363,7 +352,7 @@ static void ide_release(struct pcmcia_device *link) | |||
363 | ide_info_t *info = link->priv; | 352 | ide_info_t *info = link->priv; |
364 | struct ide_host *host = info->host; | 353 | struct ide_host *host = info->host; |
365 | 354 | ||
366 | DEBUG(0, "ide_release(0x%p)\n", link); | 355 | dev_dbg(&link->dev, "ide_release(0x%p)\n", link); |
367 | 356 | ||
368 | if (info->ndev) | 357 | if (info->ndev) |
369 | /* FIXME: if this fails we need to queue the cleanup somehow | 358 | /* FIXME: if this fails we need to queue the cleanup somehow |
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index c72565520e41..5a6ae646a636 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c | |||
@@ -111,8 +111,6 @@ static int avmcs_probe(struct pcmcia_device *p_dev) | |||
111 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 111 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
112 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 112 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
113 | 113 | ||
114 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
115 | |||
116 | /* General socket configuration */ | 114 | /* General socket configuration */ |
117 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 115 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
118 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 116 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
@@ -198,7 +196,6 @@ static int avmcs_config(struct pcmcia_device *link) | |||
198 | */ | 196 | */ |
199 | i = pcmcia_request_irq(link, &link->irq); | 197 | i = pcmcia_request_irq(link, &link->irq); |
200 | if (i != 0) { | 198 | if (i != 0) { |
201 | cs_error(link, RequestIRQ, i); | ||
202 | /* undo */ | 199 | /* undo */ |
203 | pcmcia_disable_device(link); | 200 | pcmcia_disable_device(link); |
204 | break; | 201 | break; |
@@ -209,7 +206,6 @@ static int avmcs_config(struct pcmcia_device *link) | |||
209 | */ | 206 | */ |
210 | i = pcmcia_request_configuration(link, &link->conf); | 207 | i = pcmcia_request_configuration(link, &link->conf); |
211 | if (i != 0) { | 208 | if (i != 0) { |
212 | cs_error(link, RequestConfiguration, i); | ||
213 | pcmcia_disable_device(link); | 209 | pcmcia_disable_device(link); |
214 | break; | 210 | break; |
215 | } | 211 | } |
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index 23560c897ec3..f9bdff39cf4a 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c | |||
@@ -30,22 +30,6 @@ MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for AVM A1/Fritz!PCMCIA car | |||
30 | MODULE_AUTHOR("Carsten Paeth"); | 30 | MODULE_AUTHOR("Carsten Paeth"); |
31 | MODULE_LICENSE("GPL"); | 31 | MODULE_LICENSE("GPL"); |
32 | 32 | ||
33 | /* | ||
34 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
35 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
36 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
37 | be present but disabled -- but it can then be enabled for specific | ||
38 | modules at load time with a 'pc_debug=#' option to insmod. | ||
39 | */ | ||
40 | #ifdef PCMCIA_DEBUG | ||
41 | static int pc_debug = PCMCIA_DEBUG; | ||
42 | module_param(pc_debug, int, 0); | ||
43 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); | ||
44 | static char *version = | ||
45 | "avma1_cs.c 1.00 1998/01/23 10:00:00 (Carsten Paeth)"; | ||
46 | #else | ||
47 | #define DEBUG(n, args...) | ||
48 | #endif | ||
49 | 33 | ||
50 | /*====================================================================*/ | 34 | /*====================================================================*/ |
51 | 35 | ||
@@ -119,7 +103,7 @@ static int avma1cs_probe(struct pcmcia_device *p_dev) | |||
119 | { | 103 | { |
120 | local_info_t *local; | 104 | local_info_t *local; |
121 | 105 | ||
122 | DEBUG(0, "avma1cs_attach()\n"); | 106 | dev_dbg(&p_dev->dev, "avma1cs_attach()\n"); |
123 | 107 | ||
124 | /* Allocate space for private device-specific data */ | 108 | /* Allocate space for private device-specific data */ |
125 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); | 109 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); |
@@ -139,8 +123,6 @@ static int avma1cs_probe(struct pcmcia_device *p_dev) | |||
139 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 123 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
140 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 124 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
141 | 125 | ||
142 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
143 | |||
144 | /* General socket configuration */ | 126 | /* General socket configuration */ |
145 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 127 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
146 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 128 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
@@ -161,7 +143,7 @@ static int avma1cs_probe(struct pcmcia_device *p_dev) | |||
161 | 143 | ||
162 | static void avma1cs_detach(struct pcmcia_device *link) | 144 | static void avma1cs_detach(struct pcmcia_device *link) |
163 | { | 145 | { |
164 | DEBUG(0, "avma1cs_detach(0x%p)\n", link); | 146 | dev_dbg(&link->dev, "avma1cs_detach(0x%p)\n", link); |
165 | avma1cs_release(link); | 147 | avma1cs_release(link); |
166 | kfree(link->priv); | 148 | kfree(link->priv); |
167 | } /* avma1cs_detach */ | 149 | } /* avma1cs_detach */ |
@@ -203,7 +185,7 @@ static int avma1cs_config(struct pcmcia_device *link) | |||
203 | 185 | ||
204 | dev = link->priv; | 186 | dev = link->priv; |
205 | 187 | ||
206 | DEBUG(0, "avma1cs_config(0x%p)\n", link); | 188 | dev_dbg(&link->dev, "avma1cs_config(0x%p)\n", link); |
207 | 189 | ||
208 | devname[0] = 0; | 190 | devname[0] = 0; |
209 | if (link->prod_id[1]) | 191 | if (link->prod_id[1]) |
@@ -218,7 +200,6 @@ static int avma1cs_config(struct pcmcia_device *link) | |||
218 | */ | 200 | */ |
219 | i = pcmcia_request_irq(link, &link->irq); | 201 | i = pcmcia_request_irq(link, &link->irq); |
220 | if (i != 0) { | 202 | if (i != 0) { |
221 | cs_error(link, RequestIRQ, i); | ||
222 | /* undo */ | 203 | /* undo */ |
223 | pcmcia_disable_device(link); | 204 | pcmcia_disable_device(link); |
224 | break; | 205 | break; |
@@ -229,7 +210,6 @@ static int avma1cs_config(struct pcmcia_device *link) | |||
229 | */ | 210 | */ |
230 | i = pcmcia_request_configuration(link, &link->conf); | 211 | i = pcmcia_request_configuration(link, &link->conf); |
231 | if (i != 0) { | 212 | if (i != 0) { |
232 | cs_error(link, RequestConfiguration, i); | ||
233 | pcmcia_disable_device(link); | 213 | pcmcia_disable_device(link); |
234 | break; | 214 | break; |
235 | } | 215 | } |
@@ -281,7 +261,7 @@ static void avma1cs_release(struct pcmcia_device *link) | |||
281 | { | 261 | { |
282 | local_info_t *local = link->priv; | 262 | local_info_t *local = link->priv; |
283 | 263 | ||
284 | DEBUG(0, "avma1cs_release(0x%p)\n", link); | 264 | dev_dbg(&link->dev, "avma1cs_release(0x%p)\n", link); |
285 | 265 | ||
286 | /* now unregister function with hisax */ | 266 | /* now unregister function with hisax */ |
287 | HiSax_closecard(local->node.minor); | 267 | HiSax_closecard(local->node.minor); |
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index f4d0fe29bcf8..a2f709f53974 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c | |||
@@ -57,23 +57,6 @@ MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for Elsa PCM cards"); | |||
57 | MODULE_AUTHOR("Klaus Lichtenwalder"); | 57 | MODULE_AUTHOR("Klaus Lichtenwalder"); |
58 | MODULE_LICENSE("Dual MPL/GPL"); | 58 | MODULE_LICENSE("Dual MPL/GPL"); |
59 | 59 | ||
60 | /* | ||
61 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
62 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
63 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
64 | be present but disabled -- but it can then be enabled for specific | ||
65 | modules at load time with a 'pc_debug=#' option to insmod. | ||
66 | */ | ||
67 | |||
68 | #ifdef PCMCIA_DEBUG | ||
69 | static int pc_debug = PCMCIA_DEBUG; | ||
70 | module_param(pc_debug, int, 0); | ||
71 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); | ||
72 | static char *version = | ||
73 | "elsa_cs.c $Revision: 1.2.2.4 $ $Date: 2004/01/25 15:07:06 $ (K.Lichtenwalder)"; | ||
74 | #else | ||
75 | #define DEBUG(n, args...) | ||
76 | #endif | ||
77 | 60 | ||
78 | /*====================================================================*/ | 61 | /*====================================================================*/ |
79 | 62 | ||
@@ -142,7 +125,7 @@ static int elsa_cs_probe(struct pcmcia_device *link) | |||
142 | { | 125 | { |
143 | local_info_t *local; | 126 | local_info_t *local; |
144 | 127 | ||
145 | DEBUG(0, "elsa_cs_attach()\n"); | 128 | dev_dbg(&link->dev, "elsa_cs_attach()\n"); |
146 | 129 | ||
147 | /* Allocate space for private device-specific data */ | 130 | /* Allocate space for private device-specific data */ |
148 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); | 131 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); |
@@ -155,7 +138,6 @@ static int elsa_cs_probe(struct pcmcia_device *link) | |||
155 | 138 | ||
156 | /* Interrupt setup */ | 139 | /* Interrupt setup */ |
157 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 140 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
158 | link->irq.IRQInfo1 = IRQ_LEVEL_ID|IRQ_SHARE_ID; | ||
159 | link->irq.Handler = NULL; | 141 | link->irq.Handler = NULL; |
160 | 142 | ||
161 | /* | 143 | /* |
@@ -188,7 +170,7 @@ static void elsa_cs_detach(struct pcmcia_device *link) | |||
188 | { | 170 | { |
189 | local_info_t *info = link->priv; | 171 | local_info_t *info = link->priv; |
190 | 172 | ||
191 | DEBUG(0, "elsa_cs_detach(0x%p)\n", link); | 173 | dev_dbg(&link->dev, "elsa_cs_detach(0x%p)\n", link); |
192 | 174 | ||
193 | info->busy = 1; | 175 | info->busy = 1; |
194 | elsa_cs_release(link); | 176 | elsa_cs_release(link); |
@@ -231,30 +213,25 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev, | |||
231 | static int elsa_cs_config(struct pcmcia_device *link) | 213 | static int elsa_cs_config(struct pcmcia_device *link) |
232 | { | 214 | { |
233 | local_info_t *dev; | 215 | local_info_t *dev; |
234 | int i, last_fn; | 216 | int i; |
235 | IsdnCard_t icard; | 217 | IsdnCard_t icard; |
236 | 218 | ||
237 | DEBUG(0, "elsa_config(0x%p)\n", link); | 219 | dev_dbg(&link->dev, "elsa_config(0x%p)\n", link); |
238 | dev = link->priv; | 220 | dev = link->priv; |
239 | 221 | ||
240 | i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL); | 222 | i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL); |
241 | if (i != 0) { | 223 | if (i != 0) |
242 | last_fn = RequestIO; | 224 | goto failed; |
243 | goto cs_failed; | ||
244 | } | ||
245 | 225 | ||
246 | i = pcmcia_request_irq(link, &link->irq); | 226 | i = pcmcia_request_irq(link, &link->irq); |
247 | if (i != 0) { | 227 | if (i != 0) { |
248 | link->irq.AssignedIRQ = 0; | 228 | link->irq.AssignedIRQ = 0; |
249 | last_fn = RequestIRQ; | 229 | goto failed; |
250 | goto cs_failed; | ||
251 | } | 230 | } |
252 | 231 | ||
253 | i = pcmcia_request_configuration(link, &link->conf); | 232 | i = pcmcia_request_configuration(link, &link->conf); |
254 | if (i != 0) { | 233 | if (i != 0) |
255 | last_fn = RequestConfiguration; | 234 | goto failed; |
256 | goto cs_failed; | ||
257 | } | ||
258 | 235 | ||
259 | /* At this point, the dev_node_t structure(s) should be | 236 | /* At this point, the dev_node_t structure(s) should be |
260 | initialized and arranged in a linked list at link->dev. *//* */ | 237 | initialized and arranged in a linked list at link->dev. *//* */ |
@@ -290,8 +267,7 @@ static int elsa_cs_config(struct pcmcia_device *link) | |||
290 | ((local_info_t*)link->priv)->cardnr = i; | 267 | ((local_info_t*)link->priv)->cardnr = i; |
291 | 268 | ||
292 | return 0; | 269 | return 0; |
293 | cs_failed: | 270 | failed: |
294 | cs_error(link, last_fn, i); | ||
295 | elsa_cs_release(link); | 271 | elsa_cs_release(link); |
296 | return -ENODEV; | 272 | return -ENODEV; |
297 | } /* elsa_cs_config */ | 273 | } /* elsa_cs_config */ |
@@ -308,7 +284,7 @@ static void elsa_cs_release(struct pcmcia_device *link) | |||
308 | { | 284 | { |
309 | local_info_t *local = link->priv; | 285 | local_info_t *local = link->priv; |
310 | 286 | ||
311 | DEBUG(0, "elsa_cs_release(0x%p)\n", link); | 287 | dev_dbg(&link->dev, "elsa_cs_release(0x%p)\n", link); |
312 | 288 | ||
313 | if (local) { | 289 | if (local) { |
314 | if (local->cardnr >= 0) { | 290 | if (local->cardnr >= 0) { |
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c index 9a3c9f5e4fe8..af5d393cc2d0 100644 --- a/drivers/isdn/hisax/sedlbauer_cs.c +++ b/drivers/isdn/hisax/sedlbauer_cs.c | |||
@@ -57,24 +57,6 @@ MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for Sedlbauer cards"); | |||
57 | MODULE_AUTHOR("Marcus Niemann"); | 57 | MODULE_AUTHOR("Marcus Niemann"); |
58 | MODULE_LICENSE("Dual MPL/GPL"); | 58 | MODULE_LICENSE("Dual MPL/GPL"); |
59 | 59 | ||
60 | /* | ||
61 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
62 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
63 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
64 | be present but disabled -- but it can then be enabled for specific | ||
65 | modules at load time with a 'pc_debug=#' option to insmod. | ||
66 | */ | ||
67 | |||
68 | #ifdef PCMCIA_DEBUG | ||
69 | static int pc_debug = PCMCIA_DEBUG; | ||
70 | module_param(pc_debug, int, 0); | ||
71 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); | ||
72 | static char *version = | ||
73 | "sedlbauer_cs.c 1.1a 2001/01/28 15:04:04 (M.Niemann)"; | ||
74 | #else | ||
75 | #define DEBUG(n, args...) | ||
76 | #endif | ||
77 | |||
78 | 60 | ||
79 | /*====================================================================*/ | 61 | /*====================================================================*/ |
80 | 62 | ||
@@ -151,7 +133,7 @@ static int sedlbauer_probe(struct pcmcia_device *link) | |||
151 | { | 133 | { |
152 | local_info_t *local; | 134 | local_info_t *local; |
153 | 135 | ||
154 | DEBUG(0, "sedlbauer_attach()\n"); | 136 | dev_dbg(&link->dev, "sedlbauer_attach()\n"); |
155 | 137 | ||
156 | /* Allocate space for private device-specific data */ | 138 | /* Allocate space for private device-specific data */ |
157 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); | 139 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); |
@@ -163,7 +145,6 @@ static int sedlbauer_probe(struct pcmcia_device *link) | |||
163 | 145 | ||
164 | /* Interrupt setup */ | 146 | /* Interrupt setup */ |
165 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 147 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
166 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
167 | link->irq.Handler = NULL; | 148 | link->irq.Handler = NULL; |
168 | 149 | ||
169 | /* | 150 | /* |
@@ -198,7 +179,7 @@ static int sedlbauer_probe(struct pcmcia_device *link) | |||
198 | 179 | ||
199 | static void sedlbauer_detach(struct pcmcia_device *link) | 180 | static void sedlbauer_detach(struct pcmcia_device *link) |
200 | { | 181 | { |
201 | DEBUG(0, "sedlbauer_detach(0x%p)\n", link); | 182 | dev_dbg(&link->dev, "sedlbauer_detach(0x%p)\n", link); |
202 | 183 | ||
203 | ((local_info_t *)link->priv)->stop = 1; | 184 | ((local_info_t *)link->priv)->stop = 1; |
204 | sedlbauer_release(link); | 185 | sedlbauer_release(link); |
@@ -214,9 +195,6 @@ static void sedlbauer_detach(struct pcmcia_device *link) | |||
214 | device available to the system. | 195 | device available to the system. |
215 | 196 | ||
216 | ======================================================================*/ | 197 | ======================================================================*/ |
217 | #define CS_CHECK(fn, ret) \ | ||
218 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
219 | |||
220 | static int sedlbauer_config_check(struct pcmcia_device *p_dev, | 198 | static int sedlbauer_config_check(struct pcmcia_device *p_dev, |
221 | cistpl_cftable_entry_t *cfg, | 199 | cistpl_cftable_entry_t *cfg, |
222 | cistpl_cftable_entry_t *dflt, | 200 | cistpl_cftable_entry_t *dflt, |
@@ -293,11 +271,11 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, | |||
293 | req->Base = mem->win[0].host_addr; | 271 | req->Base = mem->win[0].host_addr; |
294 | req->Size = mem->win[0].len; | 272 | req->Size = mem->win[0].len; |
295 | req->AccessSpeed = 0; | 273 | req->AccessSpeed = 0; |
296 | if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0) | 274 | if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0) |
297 | return -ENODEV; | 275 | return -ENODEV; |
298 | map.Page = 0; | 276 | map.Page = 0; |
299 | map.CardOffset = mem->win[0].card_addr; | 277 | map.CardOffset = mem->win[0].card_addr; |
300 | if (pcmcia_map_mem_page(p_dev->win, &map) != 0) | 278 | if (pcmcia_map_mem_page(p_dev, p_dev->win, &map) != 0) |
301 | return -ENODEV; | 279 | return -ENODEV; |
302 | } | 280 | } |
303 | return 0; | 281 | return 0; |
@@ -309,10 +287,10 @@ static int sedlbauer_config(struct pcmcia_device *link) | |||
309 | { | 287 | { |
310 | local_info_t *dev = link->priv; | 288 | local_info_t *dev = link->priv; |
311 | win_req_t *req; | 289 | win_req_t *req; |
312 | int last_fn, last_ret; | 290 | int ret; |
313 | IsdnCard_t icard; | 291 | IsdnCard_t icard; |
314 | 292 | ||
315 | DEBUG(0, "sedlbauer_config(0x%p)\n", link); | 293 | dev_dbg(&link->dev, "sedlbauer_config(0x%p)\n", link); |
316 | 294 | ||
317 | req = kzalloc(sizeof(win_req_t), GFP_KERNEL); | 295 | req = kzalloc(sizeof(win_req_t), GFP_KERNEL); |
318 | if (!req) | 296 | if (!req) |
@@ -330,8 +308,8 @@ static int sedlbauer_config(struct pcmcia_device *link) | |||
330 | these things without consulting the CIS, and most client drivers | 308 | these things without consulting the CIS, and most client drivers |
331 | will only use the CIS to fill in implementation-defined details. | 309 | will only use the CIS to fill in implementation-defined details. |
332 | */ | 310 | */ |
333 | last_ret = pcmcia_loop_config(link, sedlbauer_config_check, req); | 311 | ret = pcmcia_loop_config(link, sedlbauer_config_check, req); |
334 | if (last_ret) | 312 | if (ret) |
335 | goto failed; | 313 | goto failed; |
336 | 314 | ||
337 | /* | 315 | /* |
@@ -339,15 +317,20 @@ static int sedlbauer_config(struct pcmcia_device *link) | |||
339 | handler to the interrupt, unless the 'Handler' member of the | 317 | handler to the interrupt, unless the 'Handler' member of the |
340 | irq structure is initialized. | 318 | irq structure is initialized. |
341 | */ | 319 | */ |
342 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 320 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
343 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 321 | ret = pcmcia_request_irq(link, &link->irq); |
322 | if (ret) | ||
323 | goto failed; | ||
324 | } | ||
344 | 325 | ||
345 | /* | 326 | /* |
346 | This actually configures the PCMCIA socket -- setting up | 327 | This actually configures the PCMCIA socket -- setting up |
347 | the I/O windows and the interrupt mapping, and putting the | 328 | the I/O windows and the interrupt mapping, and putting the |
348 | card and host interface into "Memory and IO" mode. | 329 | card and host interface into "Memory and IO" mode. |
349 | */ | 330 | */ |
350 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 331 | ret = pcmcia_request_configuration(link, &link->conf); |
332 | if (ret) | ||
333 | goto failed; | ||
351 | 334 | ||
352 | /* | 335 | /* |
353 | At this point, the dev_node_t structure(s) need to be | 336 | At this point, the dev_node_t structure(s) need to be |
@@ -380,19 +363,18 @@ static int sedlbauer_config(struct pcmcia_device *link) | |||
380 | icard.protocol = protocol; | 363 | icard.protocol = protocol; |
381 | icard.typ = ISDN_CTYPE_SEDLBAUER_PCMCIA; | 364 | icard.typ = ISDN_CTYPE_SEDLBAUER_PCMCIA; |
382 | 365 | ||
383 | last_ret = hisax_init_pcmcia(link, &(((local_info_t*)link->priv)->stop), &icard); | 366 | ret = hisax_init_pcmcia(link, |
384 | if (last_ret < 0) { | 367 | &(((local_info_t *)link->priv)->stop), &icard); |
385 | printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n", | 368 | if (ret < 0) { |
386 | last_ret, link->io.BasePort1); | 369 | printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n", |
370 | ret, link->io.BasePort1); | ||
387 | sedlbauer_release(link); | 371 | sedlbauer_release(link); |
388 | return -ENODEV; | 372 | return -ENODEV; |
389 | } else | 373 | } else |
390 | ((local_info_t*)link->priv)->cardnr = last_ret; | 374 | ((local_info_t *)link->priv)->cardnr = ret; |
391 | 375 | ||
392 | return 0; | 376 | return 0; |
393 | 377 | ||
394 | cs_failed: | ||
395 | cs_error(link, last_fn, last_ret); | ||
396 | failed: | 378 | failed: |
397 | sedlbauer_release(link); | 379 | sedlbauer_release(link); |
398 | return -ENODEV; | 380 | return -ENODEV; |
@@ -410,7 +392,7 @@ failed: | |||
410 | static void sedlbauer_release(struct pcmcia_device *link) | 392 | static void sedlbauer_release(struct pcmcia_device *link) |
411 | { | 393 | { |
412 | local_info_t *local = link->priv; | 394 | local_info_t *local = link->priv; |
413 | DEBUG(0, "sedlbauer_release(0x%p)\n", link); | 395 | dev_dbg(&link->dev, "sedlbauer_release(0x%p)\n", link); |
414 | 396 | ||
415 | if (local) { | 397 | if (local) { |
416 | if (local->cardnr >= 0) { | 398 | if (local->cardnr >= 0) { |
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index 623d111544d4..ea705394ce2b 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c | |||
@@ -38,23 +38,6 @@ MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for Teles PCMCIA cards"); | |||
38 | MODULE_AUTHOR("Christof Petig, christof.petig@wtal.de, Karsten Keil, kkeil@suse.de"); | 38 | MODULE_AUTHOR("Christof Petig, christof.petig@wtal.de, Karsten Keil, kkeil@suse.de"); |
39 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
40 | 40 | ||
41 | /* | ||
42 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
43 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
44 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
45 | be present but disabled -- but it can then be enabled for specific | ||
46 | modules at load time with a 'pc_debug=#' option to insmod. | ||
47 | */ | ||
48 | |||
49 | #ifdef PCMCIA_DEBUG | ||
50 | static int pc_debug = PCMCIA_DEBUG; | ||
51 | module_param(pc_debug, int, 0); | ||
52 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); | ||
53 | static char *version = | ||
54 | "teles_cs.c 2.10 2002/07/30 22:23:34 kkeil"; | ||
55 | #else | ||
56 | #define DEBUG(n, args...) | ||
57 | #endif | ||
58 | 41 | ||
59 | /*====================================================================*/ | 42 | /*====================================================================*/ |
60 | 43 | ||
@@ -133,7 +116,7 @@ static int teles_probe(struct pcmcia_device *link) | |||
133 | { | 116 | { |
134 | local_info_t *local; | 117 | local_info_t *local; |
135 | 118 | ||
136 | DEBUG(0, "teles_attach()\n"); | 119 | dev_dbg(&link->dev, "teles_attach()\n"); |
137 | 120 | ||
138 | /* Allocate space for private device-specific data */ | 121 | /* Allocate space for private device-specific data */ |
139 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); | 122 | local = kzalloc(sizeof(local_info_t), GFP_KERNEL); |
@@ -145,7 +128,6 @@ static int teles_probe(struct pcmcia_device *link) | |||
145 | 128 | ||
146 | /* Interrupt setup */ | 129 | /* Interrupt setup */ |
147 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 130 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
148 | link->irq.IRQInfo1 = IRQ_LEVEL_ID|IRQ_SHARE_ID; | ||
149 | link->irq.Handler = NULL; | 131 | link->irq.Handler = NULL; |
150 | 132 | ||
151 | /* | 133 | /* |
@@ -178,7 +160,7 @@ static void teles_detach(struct pcmcia_device *link) | |||
178 | { | 160 | { |
179 | local_info_t *info = link->priv; | 161 | local_info_t *info = link->priv; |
180 | 162 | ||
181 | DEBUG(0, "teles_detach(0x%p)\n", link); | 163 | dev_dbg(&link->dev, "teles_detach(0x%p)\n", link); |
182 | 164 | ||
183 | info->busy = 1; | 165 | info->busy = 1; |
184 | teles_cs_release(link); | 166 | teles_cs_release(link); |
@@ -221,30 +203,25 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev, | |||
221 | static int teles_cs_config(struct pcmcia_device *link) | 203 | static int teles_cs_config(struct pcmcia_device *link) |
222 | { | 204 | { |
223 | local_info_t *dev; | 205 | local_info_t *dev; |
224 | int i, last_fn; | 206 | int i; |
225 | IsdnCard_t icard; | 207 | IsdnCard_t icard; |
226 | 208 | ||
227 | DEBUG(0, "teles_config(0x%p)\n", link); | 209 | dev_dbg(&link->dev, "teles_config(0x%p)\n", link); |
228 | dev = link->priv; | 210 | dev = link->priv; |
229 | 211 | ||
230 | i = pcmcia_loop_config(link, teles_cs_configcheck, NULL); | 212 | i = pcmcia_loop_config(link, teles_cs_configcheck, NULL); |
231 | if (i != 0) { | 213 | if (i != 0) |
232 | last_fn = RequestIO; | ||
233 | goto cs_failed; | 214 | goto cs_failed; |
234 | } | ||
235 | 215 | ||
236 | i = pcmcia_request_irq(link, &link->irq); | 216 | i = pcmcia_request_irq(link, &link->irq); |
237 | if (i != 0) { | 217 | if (i != 0) { |
238 | link->irq.AssignedIRQ = 0; | 218 | link->irq.AssignedIRQ = 0; |
239 | last_fn = RequestIRQ; | ||
240 | goto cs_failed; | 219 | goto cs_failed; |
241 | } | 220 | } |
242 | 221 | ||
243 | i = pcmcia_request_configuration(link, &link->conf); | 222 | i = pcmcia_request_configuration(link, &link->conf); |
244 | if (i != 0) { | 223 | if (i != 0) |
245 | last_fn = RequestConfiguration; | ||
246 | goto cs_failed; | 224 | goto cs_failed; |
247 | } | ||
248 | 225 | ||
249 | /* At this point, the dev_node_t structure(s) should be | 226 | /* At this point, the dev_node_t structure(s) should be |
250 | initialized and arranged in a linked list at link->dev. *//* */ | 227 | initialized and arranged in a linked list at link->dev. *//* */ |
@@ -283,7 +260,6 @@ static int teles_cs_config(struct pcmcia_device *link) | |||
283 | return 0; | 260 | return 0; |
284 | 261 | ||
285 | cs_failed: | 262 | cs_failed: |
286 | cs_error(link, last_fn, i); | ||
287 | teles_cs_release(link); | 263 | teles_cs_release(link); |
288 | return -ENODEV; | 264 | return -ENODEV; |
289 | } /* teles_cs_config */ | 265 | } /* teles_cs_config */ |
@@ -300,7 +276,7 @@ static void teles_cs_release(struct pcmcia_device *link) | |||
300 | { | 276 | { |
301 | local_info_t *local = link->priv; | 277 | local_info_t *local = link->priv; |
302 | 278 | ||
303 | DEBUG(0, "teles_cs_release(0x%p)\n", link); | 279 | dev_dbg(&link->dev, "teles_cs_release(0x%p)\n", link); |
304 | 280 | ||
305 | if (local) { | 281 | if (local) { |
306 | if (local->cardnr >= 0) { | 282 | if (local->cardnr >= 0) { |
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index d600c2deff73..689d6a79ffc0 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -118,11 +118,9 @@ static caddr_t remap_window(struct map_info *map, unsigned long to) | |||
118 | DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x", | 118 | DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x", |
119 | dev->offset, mrq.CardOffset); | 119 | dev->offset, mrq.CardOffset); |
120 | mrq.Page = 0; | 120 | mrq.Page = 0; |
121 | ret = pcmcia_map_mem_page(win, &mrq); | 121 | ret = pcmcia_map_mem_page(dev->p_dev, win, &mrq); |
122 | if (ret != 0) { | 122 | if (ret != 0) |
123 | cs_error(dev->p_dev, MapMemPage, ret); | ||
124 | return NULL; | 123 | return NULL; |
125 | } | ||
126 | dev->offset = mrq.CardOffset; | 124 | dev->offset = mrq.CardOffset; |
127 | } | 125 | } |
128 | return dev->win_base + (to & (dev->win_size-1)); | 126 | return dev->win_base + (to & (dev->win_size-1)); |
@@ -327,8 +325,6 @@ static void pcmciamtd_set_vpp(struct map_info *map, int on) | |||
327 | 325 | ||
328 | DEBUG(2, "dev = %p on = %d vpp = %d\n", dev, on, dev->vpp); | 326 | DEBUG(2, "dev = %p on = %d vpp = %d\n", dev, on, dev->vpp); |
329 | ret = pcmcia_modify_configuration(link, &mod); | 327 | ret = pcmcia_modify_configuration(link, &mod); |
330 | if (ret != 0) | ||
331 | cs_error(link, ModifyConfiguration, ret); | ||
332 | } | 328 | } |
333 | 329 | ||
334 | 330 | ||
@@ -348,107 +344,116 @@ static void pcmciamtd_release(struct pcmcia_device *link) | |||
348 | iounmap(dev->win_base); | 344 | iounmap(dev->win_base); |
349 | dev->win_base = NULL; | 345 | dev->win_base = NULL; |
350 | } | 346 | } |
351 | pcmcia_release_window(link->win); | 347 | pcmcia_release_window(link, link->win); |
352 | } | 348 | } |
353 | pcmcia_disable_device(link); | 349 | pcmcia_disable_device(link); |
354 | } | 350 | } |
355 | 351 | ||
356 | 352 | ||
357 | static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, int *new_name) | 353 | #ifdef CONFIG_MTD_DEBUG |
354 | static int pcmciamtd_cistpl_format(struct pcmcia_device *p_dev, | ||
355 | tuple_t *tuple, | ||
356 | void *priv_data) | ||
358 | { | 357 | { |
359 | int rc; | ||
360 | tuple_t tuple; | ||
361 | cisparse_t parse; | 358 | cisparse_t parse; |
362 | u_char buf[64]; | ||
363 | |||
364 | tuple.Attributes = 0; | ||
365 | tuple.TupleData = (cisdata_t *)buf; | ||
366 | tuple.TupleDataMax = sizeof(buf); | ||
367 | tuple.TupleOffset = 0; | ||
368 | tuple.DesiredTuple = RETURN_FIRST_TUPLE; | ||
369 | |||
370 | rc = pcmcia_get_first_tuple(link, &tuple); | ||
371 | while (rc == 0) { | ||
372 | rc = pcmcia_get_tuple_data(link, &tuple); | ||
373 | if (rc != 0) { | ||
374 | cs_error(link, GetTupleData, rc); | ||
375 | break; | ||
376 | } | ||
377 | rc = pcmcia_parse_tuple(&tuple, &parse); | ||
378 | if (rc != 0) { | ||
379 | cs_error(link, ParseTuple, rc); | ||
380 | break; | ||
381 | } | ||
382 | 359 | ||
383 | switch(tuple.TupleCode) { | 360 | if (!pcmcia_parse_tuple(tuple, &parse)) { |
384 | case CISTPL_FORMAT: { | 361 | cistpl_format_t *t = &parse.format; |
385 | cistpl_format_t *t = &parse.format; | 362 | (void)t; /* Shut up, gcc */ |
386 | (void)t; /* Shut up, gcc */ | 363 | DEBUG(2, "Format type: %u, Error Detection: %u, offset = %u, length =%u", |
387 | DEBUG(2, "Format type: %u, Error Detection: %u, offset = %u, length =%u", | 364 | t->type, t->edc, t->offset, t->length); |
388 | t->type, t->edc, t->offset, t->length); | 365 | } |
389 | break; | 366 | return -ENOSPC; |
367 | } | ||
390 | 368 | ||
391 | } | 369 | static int pcmciamtd_cistpl_jedec(struct pcmcia_device *p_dev, |
370 | tuple_t *tuple, | ||
371 | void *priv_data) | ||
372 | { | ||
373 | cisparse_t parse; | ||
374 | int i; | ||
392 | 375 | ||
393 | case CISTPL_DEVICE: { | 376 | if (!pcmcia_parse_tuple(tuple, &parse)) { |
394 | cistpl_device_t *t = &parse.device; | 377 | cistpl_jedec_t *t = &parse.jedec; |
395 | int i; | 378 | for (i = 0; i < t->nid; i++) |
396 | DEBUG(2, "Common memory:"); | 379 | DEBUG(2, "JEDEC: 0x%02x 0x%02x", t->id[i].mfr, t->id[i].info); |
397 | dev->pcmcia_map.size = t->dev[0].size; | 380 | } |
398 | for(i = 0; i < t->ndev; i++) { | 381 | return -ENOSPC; |
399 | DEBUG(2, "Region %d, type = %u", i, t->dev[i].type); | 382 | } |
400 | DEBUG(2, "Region %d, wp = %u", i, t->dev[i].wp); | 383 | #endif |
401 | DEBUG(2, "Region %d, speed = %u ns", i, t->dev[i].speed); | ||
402 | DEBUG(2, "Region %d, size = %u bytes", i, t->dev[i].size); | ||
403 | } | ||
404 | break; | ||
405 | } | ||
406 | 384 | ||
407 | case CISTPL_VERS_1: { | 385 | static int pcmciamtd_cistpl_device(struct pcmcia_device *p_dev, |
408 | cistpl_vers_1_t *t = &parse.version_1; | 386 | tuple_t *tuple, |
409 | int i; | 387 | void *priv_data) |
410 | if(t->ns) { | 388 | { |
411 | dev->mtd_name[0] = '\0'; | 389 | struct pcmciamtd_dev *dev = priv_data; |
412 | for(i = 0; i < t->ns; i++) { | 390 | cisparse_t parse; |
413 | if(i) | 391 | cistpl_device_t *t = &parse.device; |
414 | strcat(dev->mtd_name, " "); | 392 | int i; |
415 | strcat(dev->mtd_name, t->str+t->ofs[i]); | ||
416 | } | ||
417 | } | ||
418 | DEBUG(2, "Found name: %s", dev->mtd_name); | ||
419 | break; | ||
420 | } | ||
421 | 393 | ||
422 | case CISTPL_JEDEC_C: { | 394 | if (pcmcia_parse_tuple(tuple, &parse)) |
423 | cistpl_jedec_t *t = &parse.jedec; | 395 | return -EINVAL; |
424 | int i; | 396 | |
425 | for(i = 0; i < t->nid; i++) { | 397 | DEBUG(2, "Common memory:"); |
426 | DEBUG(2, "JEDEC: 0x%02x 0x%02x", t->id[i].mfr, t->id[i].info); | 398 | dev->pcmcia_map.size = t->dev[0].size; |
427 | } | 399 | /* from here on: DEBUG only */ |
428 | break; | 400 | for (i = 0; i < t->ndev; i++) { |
429 | } | 401 | DEBUG(2, "Region %d, type = %u", i, t->dev[i].type); |
402 | DEBUG(2, "Region %d, wp = %u", i, t->dev[i].wp); | ||
403 | DEBUG(2, "Region %d, speed = %u ns", i, t->dev[i].speed); | ||
404 | DEBUG(2, "Region %d, size = %u bytes", i, t->dev[i].size); | ||
405 | } | ||
406 | return 0; | ||
407 | } | ||
430 | 408 | ||
431 | case CISTPL_DEVICE_GEO: { | 409 | static int pcmciamtd_cistpl_geo(struct pcmcia_device *p_dev, |
432 | cistpl_device_geo_t *t = &parse.device_geo; | 410 | tuple_t *tuple, |
433 | int i; | 411 | void *priv_data) |
434 | dev->pcmcia_map.bankwidth = t->geo[0].buswidth; | 412 | { |
435 | for(i = 0; i < t->ngeo; i++) { | 413 | struct pcmciamtd_dev *dev = priv_data; |
436 | DEBUG(2, "region: %d bankwidth = %u", i, t->geo[i].buswidth); | 414 | cisparse_t parse; |
437 | DEBUG(2, "region: %d erase_block = %u", i, t->geo[i].erase_block); | 415 | cistpl_device_geo_t *t = &parse.device_geo; |
438 | DEBUG(2, "region: %d read_block = %u", i, t->geo[i].read_block); | 416 | int i; |
439 | DEBUG(2, "region: %d write_block = %u", i, t->geo[i].write_block); | ||
440 | DEBUG(2, "region: %d partition = %u", i, t->geo[i].partition); | ||
441 | DEBUG(2, "region: %d interleave = %u", i, t->geo[i].interleave); | ||
442 | } | ||
443 | break; | ||
444 | } | ||
445 | 417 | ||
446 | default: | 418 | if (pcmcia_parse_tuple(tuple, &parse)) |
447 | DEBUG(2, "Unknown tuple code %d", tuple.TupleCode); | 419 | return -EINVAL; |
448 | } | 420 | |
421 | dev->pcmcia_map.bankwidth = t->geo[0].buswidth; | ||
422 | /* from here on: DEBUG only */ | ||
423 | for (i = 0; i < t->ngeo; i++) { | ||
424 | DEBUG(2, "region: %d bankwidth = %u", i, t->geo[i].buswidth); | ||
425 | DEBUG(2, "region: %d erase_block = %u", i, t->geo[i].erase_block); | ||
426 | DEBUG(2, "region: %d read_block = %u", i, t->geo[i].read_block); | ||
427 | DEBUG(2, "region: %d write_block = %u", i, t->geo[i].write_block); | ||
428 | DEBUG(2, "region: %d partition = %u", i, t->geo[i].partition); | ||
429 | DEBUG(2, "region: %d interleave = %u", i, t->geo[i].interleave); | ||
430 | } | ||
431 | return 0; | ||
432 | } | ||
433 | |||
434 | |||
435 | static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, int *new_name) | ||
436 | { | ||
437 | int i; | ||
449 | 438 | ||
450 | rc = pcmcia_get_next_tuple(link, &tuple); | 439 | if (p_dev->prod_id[0]) { |
440 | dev->mtd_name[0] = '\0'; | ||
441 | for (i = 0; i < 4; i++) { | ||
442 | if (i) | ||
443 | strcat(dev->mtd_name, " "); | ||
444 | if (p_dev->prod_id[i]) | ||
445 | strcat(dev->mtd_name, p_dev->prod_id[i]); | ||
446 | } | ||
447 | DEBUG(2, "Found name: %s", dev->mtd_name); | ||
451 | } | 448 | } |
449 | |||
450 | #ifdef CONFIG_MTD_DEBUG | ||
451 | pcmcia_loop_tuple(p_dev, CISTPL_FORMAT, pcmciamtd_cistpl_format, NULL); | ||
452 | pcmcia_loop_tuple(p_dev, CISTPL_JEDEC_C, pcmciamtd_cistpl_jedec, NULL); | ||
453 | #endif | ||
454 | pcmcia_loop_tuple(p_dev, CISTPL_DEVICE, pcmciamtd_cistpl_device, dev); | ||
455 | pcmcia_loop_tuple(p_dev, CISTPL_DEVICE_GEO, pcmciamtd_cistpl_geo, dev); | ||
456 | |||
452 | if(!dev->pcmcia_map.size) | 457 | if(!dev->pcmcia_map.size) |
453 | dev->pcmcia_map.size = MAX_PCMCIA_ADDR; | 458 | dev->pcmcia_map.size = MAX_PCMCIA_ADDR; |
454 | 459 | ||
@@ -481,16 +486,12 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, | |||
481 | * MTD device available to the system. | 486 | * MTD device available to the system. |
482 | */ | 487 | */ |
483 | 488 | ||
484 | #define CS_CHECK(fn, ret) \ | ||
485 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
486 | |||
487 | static int pcmciamtd_config(struct pcmcia_device *link) | 489 | static int pcmciamtd_config(struct pcmcia_device *link) |
488 | { | 490 | { |
489 | struct pcmciamtd_dev *dev = link->priv; | 491 | struct pcmciamtd_dev *dev = link->priv; |
490 | struct mtd_info *mtd = NULL; | 492 | struct mtd_info *mtd = NULL; |
491 | cs_status_t status; | 493 | cs_status_t status; |
492 | win_req_t req; | 494 | win_req_t req; |
493 | int last_ret = 0, last_fn = 0; | ||
494 | int ret; | 495 | int ret; |
495 | int i; | 496 | int i; |
496 | static char *probes[] = { "jedec_probe", "cfi_probe" }; | 497 | static char *probes[] = { "jedec_probe", "cfi_probe" }; |
@@ -529,7 +530,7 @@ static int pcmciamtd_config(struct pcmcia_device *link) | |||
529 | int ret; | 530 | int ret; |
530 | DEBUG(2, "requesting window with size = %dKiB memspeed = %d", | 531 | DEBUG(2, "requesting window with size = %dKiB memspeed = %d", |
531 | req.Size >> 10, req.AccessSpeed); | 532 | req.Size >> 10, req.AccessSpeed); |
532 | ret = pcmcia_request_window(&link, &req, &link->win); | 533 | ret = pcmcia_request_window(link, &req, &link->win); |
533 | DEBUG(2, "ret = %d dev->win_size = %d", ret, dev->win_size); | 534 | DEBUG(2, "ret = %d dev->win_size = %d", ret, dev->win_size); |
534 | if(ret) { | 535 | if(ret) { |
535 | req.Size >>= 1; | 536 | req.Size >>= 1; |
@@ -577,7 +578,6 @@ static int pcmciamtd_config(struct pcmcia_device *link) | |||
577 | DEBUG(2, "Setting Configuration"); | 578 | DEBUG(2, "Setting Configuration"); |
578 | ret = pcmcia_request_configuration(link, &link->conf); | 579 | ret = pcmcia_request_configuration(link, &link->conf); |
579 | if (ret != 0) { | 580 | if (ret != 0) { |
580 | cs_error(link, RequestConfiguration, ret); | ||
581 | if (dev->win_base) { | 581 | if (dev->win_base) { |
582 | iounmap(dev->win_base); | 582 | iounmap(dev->win_base); |
583 | dev->win_base = NULL; | 583 | dev->win_base = NULL; |
@@ -652,8 +652,7 @@ static int pcmciamtd_config(struct pcmcia_device *link) | |||
652 | link->dev_node = &dev->node; | 652 | link->dev_node = &dev->node; |
653 | return 0; | 653 | return 0; |
654 | 654 | ||
655 | cs_failed: | 655 | failed: |
656 | cs_error(link, last_fn, last_ret); | ||
657 | err("CS Error, exiting"); | 656 | err("CS Error, exiting"); |
658 | pcmciamtd_release(link); | 657 | pcmciamtd_release(link); |
659 | return -ENODEV; | 658 | return -ENODEV; |
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index b58965a2b3ae..17a27225cc98 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -118,14 +118,6 @@ INT_MODULE_PARM(full_duplex, 0); | |||
118 | /* Autodetect link polarity reversal? */ | 118 | /* Autodetect link polarity reversal? */ |
119 | INT_MODULE_PARM(auto_polarity, 1); | 119 | INT_MODULE_PARM(auto_polarity, 1); |
120 | 120 | ||
121 | #ifdef PCMCIA_DEBUG | ||
122 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | ||
123 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
124 | static char *version = | ||
125 | "3c574_cs.c 1.65ac1 2003/04/07 Donald Becker/David Hinds, becker@scyld.com.\n"; | ||
126 | #else | ||
127 | #define DEBUG(n, args...) | ||
128 | #endif | ||
129 | 121 | ||
130 | /*====================================================================*/ | 122 | /*====================================================================*/ |
131 | 123 | ||
@@ -278,7 +270,7 @@ static int tc574_probe(struct pcmcia_device *link) | |||
278 | struct el3_private *lp; | 270 | struct el3_private *lp; |
279 | struct net_device *dev; | 271 | struct net_device *dev; |
280 | 272 | ||
281 | DEBUG(0, "3c574_attach()\n"); | 273 | dev_dbg(&link->dev, "3c574_attach()\n"); |
282 | 274 | ||
283 | /* Create the PC card device object. */ | 275 | /* Create the PC card device object. */ |
284 | dev = alloc_etherdev(sizeof(struct el3_private)); | 276 | dev = alloc_etherdev(sizeof(struct el3_private)); |
@@ -291,10 +283,8 @@ static int tc574_probe(struct pcmcia_device *link) | |||
291 | spin_lock_init(&lp->window_lock); | 283 | spin_lock_init(&lp->window_lock); |
292 | link->io.NumPorts1 = 32; | 284 | link->io.NumPorts1 = 32; |
293 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 285 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
294 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; | 286 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
295 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
296 | link->irq.Handler = &el3_interrupt; | 287 | link->irq.Handler = &el3_interrupt; |
297 | link->irq.Instance = dev; | ||
298 | link->conf.Attributes = CONF_ENABLE_IRQ; | 288 | link->conf.Attributes = CONF_ENABLE_IRQ; |
299 | link->conf.IntType = INT_MEMORY_AND_IO; | 289 | link->conf.IntType = INT_MEMORY_AND_IO; |
300 | link->conf.ConfigIndex = 1; | 290 | link->conf.ConfigIndex = 1; |
@@ -319,7 +309,7 @@ static void tc574_detach(struct pcmcia_device *link) | |||
319 | { | 309 | { |
320 | struct net_device *dev = link->priv; | 310 | struct net_device *dev = link->priv; |
321 | 311 | ||
322 | DEBUG(0, "3c574_detach(0x%p)\n", link); | 312 | dev_dbg(&link->dev, "3c574_detach()\n"); |
323 | 313 | ||
324 | if (link->dev_node) | 314 | if (link->dev_node) |
325 | unregister_netdev(dev); | 315 | unregister_netdev(dev); |
@@ -335,26 +325,23 @@ static void tc574_detach(struct pcmcia_device *link) | |||
335 | ethernet device available to the system. | 325 | ethernet device available to the system. |
336 | */ | 326 | */ |
337 | 327 | ||
338 | #define CS_CHECK(fn, ret) \ | ||
339 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
340 | |||
341 | static const char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; | 328 | static const char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; |
342 | 329 | ||
343 | static int tc574_config(struct pcmcia_device *link) | 330 | static int tc574_config(struct pcmcia_device *link) |
344 | { | 331 | { |
345 | struct net_device *dev = link->priv; | 332 | struct net_device *dev = link->priv; |
346 | struct el3_private *lp = netdev_priv(dev); | 333 | struct el3_private *lp = netdev_priv(dev); |
347 | tuple_t tuple; | 334 | int ret, i, j; |
348 | __le16 buf[32]; | ||
349 | int last_fn, last_ret, i, j; | ||
350 | unsigned int ioaddr; | 335 | unsigned int ioaddr; |
351 | __be16 *phys_addr; | 336 | __be16 *phys_addr; |
352 | char *cardname; | 337 | char *cardname; |
353 | __u32 config; | 338 | __u32 config; |
339 | u8 *buf; | ||
340 | size_t len; | ||
354 | 341 | ||
355 | phys_addr = (__be16 *)dev->dev_addr; | 342 | phys_addr = (__be16 *)dev->dev_addr; |
356 | 343 | ||
357 | DEBUG(0, "3c574_config(0x%p)\n", link); | 344 | dev_dbg(&link->dev, "3c574_config()\n"); |
358 | 345 | ||
359 | link->io.IOAddrLines = 16; | 346 | link->io.IOAddrLines = 16; |
360 | for (i = j = 0; j < 0x400; j += 0x20) { | 347 | for (i = j = 0; j < 0x400; j += 0x20) { |
@@ -363,12 +350,16 @@ static int tc574_config(struct pcmcia_device *link) | |||
363 | if (i == 0) | 350 | if (i == 0) |
364 | break; | 351 | break; |
365 | } | 352 | } |
366 | if (i != 0) { | 353 | if (i != 0) |
367 | cs_error(link, RequestIO, i); | 354 | goto failed; |
355 | |||
356 | ret = pcmcia_request_irq(link, &link->irq); | ||
357 | if (ret) | ||
358 | goto failed; | ||
359 | |||
360 | ret = pcmcia_request_configuration(link, &link->conf); | ||
361 | if (ret) | ||
368 | goto failed; | 362 | goto failed; |
369 | } | ||
370 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | ||
371 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | ||
372 | 363 | ||
373 | dev->irq = link->irq.AssignedIRQ; | 364 | dev->irq = link->irq.AssignedIRQ; |
374 | dev->base_addr = link->io.BasePort1; | 365 | dev->base_addr = link->io.BasePort1; |
@@ -378,16 +369,14 @@ static int tc574_config(struct pcmcia_device *link) | |||
378 | /* The 3c574 normally uses an EEPROM for configuration info, including | 369 | /* The 3c574 normally uses an EEPROM for configuration info, including |
379 | the hardware address. The future products may include a modem chip | 370 | the hardware address. The future products may include a modem chip |
380 | and put the address in the CIS. */ | 371 | and put the address in the CIS. */ |
381 | tuple.Attributes = 0; | 372 | |
382 | tuple.TupleData = (cisdata_t *)buf; | 373 | len = pcmcia_get_tuple(link, 0x88, &buf); |
383 | tuple.TupleDataMax = 64; | 374 | if (buf && len >= 6) { |
384 | tuple.TupleOffset = 0; | ||
385 | tuple.DesiredTuple = 0x88; | ||
386 | if (pcmcia_get_first_tuple(link, &tuple) == 0) { | ||
387 | pcmcia_get_tuple_data(link, &tuple); | ||
388 | for (i = 0; i < 3; i++) | 375 | for (i = 0; i < 3; i++) |
389 | phys_addr[i] = htons(le16_to_cpu(buf[i])); | 376 | phys_addr[i] = htons(le16_to_cpu(buf[i * 2])); |
377 | kfree(buf); | ||
390 | } else { | 378 | } else { |
379 | kfree(buf); /* 0 < len < 6 */ | ||
391 | EL3WINDOW(0); | 380 | EL3WINDOW(0); |
392 | for (i = 0; i < 3; i++) | 381 | for (i = 0; i < 3; i++) |
393 | phys_addr[i] = htons(read_eeprom(ioaddr, i + 10)); | 382 | phys_addr[i] = htons(read_eeprom(ioaddr, i + 10)); |
@@ -435,7 +424,8 @@ static int tc574_config(struct pcmcia_device *link) | |||
435 | mii_status = mdio_read(ioaddr, phy & 0x1f, 1); | 424 | mii_status = mdio_read(ioaddr, phy & 0x1f, 1); |
436 | if (mii_status != 0xffff) { | 425 | if (mii_status != 0xffff) { |
437 | lp->phys = phy & 0x1f; | 426 | lp->phys = phy & 0x1f; |
438 | DEBUG(0, " MII transceiver at index %d, status %x.\n", | 427 | dev_dbg(&link->dev, " MII transceiver at " |
428 | "index %d, status %x.\n", | ||
439 | phy, mii_status); | 429 | phy, mii_status); |
440 | if ((mii_status & 0x0040) == 0) | 430 | if ((mii_status & 0x0040) == 0) |
441 | mii_preamble_required = 1; | 431 | mii_preamble_required = 1; |
@@ -457,7 +447,7 @@ static int tc574_config(struct pcmcia_device *link) | |||
457 | } | 447 | } |
458 | 448 | ||
459 | link->dev_node = &lp->node; | 449 | link->dev_node = &lp->node; |
460 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 450 | SET_NETDEV_DEV(dev, &link->dev); |
461 | 451 | ||
462 | if (register_netdev(dev) != 0) { | 452 | if (register_netdev(dev) != 0) { |
463 | printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n"); | 453 | printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n"); |
@@ -478,8 +468,6 @@ static int tc574_config(struct pcmcia_device *link) | |||
478 | 468 | ||
479 | return 0; | 469 | return 0; |
480 | 470 | ||
481 | cs_failed: | ||
482 | cs_error(link, last_fn, last_ret); | ||
483 | failed: | 471 | failed: |
484 | tc574_release(link); | 472 | tc574_release(link); |
485 | return -ENODEV; | 473 | return -ENODEV; |
@@ -738,7 +726,7 @@ static int el3_open(struct net_device *dev) | |||
738 | lp->media.expires = jiffies + HZ; | 726 | lp->media.expires = jiffies + HZ; |
739 | add_timer(&lp->media); | 727 | add_timer(&lp->media); |
740 | 728 | ||
741 | DEBUG(2, "%s: opened, status %4.4x.\n", | 729 | dev_dbg(&link->dev, "%s: opened, status %4.4x.\n", |
742 | dev->name, inw(dev->base_addr + EL3_STATUS)); | 730 | dev->name, inw(dev->base_addr + EL3_STATUS)); |
743 | 731 | ||
744 | return 0; | 732 | return 0; |
@@ -772,7 +760,7 @@ static void pop_tx_status(struct net_device *dev) | |||
772 | if (tx_status & 0x30) | 760 | if (tx_status & 0x30) |
773 | tc574_wait_for_completion(dev, TxReset); | 761 | tc574_wait_for_completion(dev, TxReset); |
774 | if (tx_status & 0x38) { | 762 | if (tx_status & 0x38) { |
775 | DEBUG(1, "%s: transmit error: status 0x%02x\n", | 763 | pr_debug("%s: transmit error: status 0x%02x\n", |
776 | dev->name, tx_status); | 764 | dev->name, tx_status); |
777 | outw(TxEnable, ioaddr + EL3_CMD); | 765 | outw(TxEnable, ioaddr + EL3_CMD); |
778 | dev->stats.tx_aborted_errors++; | 766 | dev->stats.tx_aborted_errors++; |
@@ -788,7 +776,7 @@ static netdev_tx_t el3_start_xmit(struct sk_buff *skb, | |||
788 | struct el3_private *lp = netdev_priv(dev); | 776 | struct el3_private *lp = netdev_priv(dev); |
789 | unsigned long flags; | 777 | unsigned long flags; |
790 | 778 | ||
791 | DEBUG(3, "%s: el3_start_xmit(length = %ld) called, " | 779 | pr_debug("%s: el3_start_xmit(length = %ld) called, " |
792 | "status %4.4x.\n", dev->name, (long)skb->len, | 780 | "status %4.4x.\n", dev->name, (long)skb->len, |
793 | inw(ioaddr + EL3_STATUS)); | 781 | inw(ioaddr + EL3_STATUS)); |
794 | 782 | ||
@@ -827,7 +815,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
827 | return IRQ_NONE; | 815 | return IRQ_NONE; |
828 | ioaddr = dev->base_addr; | 816 | ioaddr = dev->base_addr; |
829 | 817 | ||
830 | DEBUG(3, "%s: interrupt, status %4.4x.\n", | 818 | pr_debug("%s: interrupt, status %4.4x.\n", |
831 | dev->name, inw(ioaddr + EL3_STATUS)); | 819 | dev->name, inw(ioaddr + EL3_STATUS)); |
832 | 820 | ||
833 | spin_lock(&lp->window_lock); | 821 | spin_lock(&lp->window_lock); |
@@ -836,7 +824,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
836 | (IntLatch | RxComplete | RxEarly | StatsFull)) { | 824 | (IntLatch | RxComplete | RxEarly | StatsFull)) { |
837 | if (!netif_device_present(dev) || | 825 | if (!netif_device_present(dev) || |
838 | ((status & 0xe000) != 0x2000)) { | 826 | ((status & 0xe000) != 0x2000)) { |
839 | DEBUG(1, "%s: Interrupt from dead card\n", dev->name); | 827 | pr_debug("%s: Interrupt from dead card\n", dev->name); |
840 | break; | 828 | break; |
841 | } | 829 | } |
842 | 830 | ||
@@ -846,7 +834,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
846 | work_budget = el3_rx(dev, work_budget); | 834 | work_budget = el3_rx(dev, work_budget); |
847 | 835 | ||
848 | if (status & TxAvailable) { | 836 | if (status & TxAvailable) { |
849 | DEBUG(3, " TX room bit was handled.\n"); | 837 | pr_debug(" TX room bit was handled.\n"); |
850 | /* There's room in the FIFO for a full-sized packet. */ | 838 | /* There's room in the FIFO for a full-sized packet. */ |
851 | outw(AckIntr | TxAvailable, ioaddr + EL3_CMD); | 839 | outw(AckIntr | TxAvailable, ioaddr + EL3_CMD); |
852 | netif_wake_queue(dev); | 840 | netif_wake_queue(dev); |
@@ -886,7 +874,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
886 | } | 874 | } |
887 | 875 | ||
888 | if (--work_budget < 0) { | 876 | if (--work_budget < 0) { |
889 | DEBUG(0, "%s: Too much work in interrupt, " | 877 | pr_debug("%s: Too much work in interrupt, " |
890 | "status %4.4x.\n", dev->name, status); | 878 | "status %4.4x.\n", dev->name, status); |
891 | /* Clear all interrupts */ | 879 | /* Clear all interrupts */ |
892 | outw(AckIntr | 0xFF, ioaddr + EL3_CMD); | 880 | outw(AckIntr | 0xFF, ioaddr + EL3_CMD); |
@@ -896,7 +884,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
896 | outw(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD); | 884 | outw(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD); |
897 | } | 885 | } |
898 | 886 | ||
899 | DEBUG(3, "%s: exiting interrupt, status %4.4x.\n", | 887 | pr_debug("%s: exiting interrupt, status %4.4x.\n", |
900 | dev->name, inw(ioaddr + EL3_STATUS)); | 888 | dev->name, inw(ioaddr + EL3_STATUS)); |
901 | 889 | ||
902 | spin_unlock(&lp->window_lock); | 890 | spin_unlock(&lp->window_lock); |
@@ -1003,7 +991,7 @@ static void update_stats(struct net_device *dev) | |||
1003 | unsigned int ioaddr = dev->base_addr; | 991 | unsigned int ioaddr = dev->base_addr; |
1004 | u8 rx, tx, up; | 992 | u8 rx, tx, up; |
1005 | 993 | ||
1006 | DEBUG(2, "%s: updating the statistics.\n", dev->name); | 994 | pr_debug("%s: updating the statistics.\n", dev->name); |
1007 | 995 | ||
1008 | if (inw(ioaddr+EL3_STATUS) == 0xffff) /* No card. */ | 996 | if (inw(ioaddr+EL3_STATUS) == 0xffff) /* No card. */ |
1009 | return; | 997 | return; |
@@ -1039,7 +1027,7 @@ static int el3_rx(struct net_device *dev, int worklimit) | |||
1039 | unsigned int ioaddr = dev->base_addr; | 1027 | unsigned int ioaddr = dev->base_addr; |
1040 | short rx_status; | 1028 | short rx_status; |
1041 | 1029 | ||
1042 | DEBUG(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n", | 1030 | pr_debug("%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n", |
1043 | dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RxStatus)); | 1031 | dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RxStatus)); |
1044 | while (!((rx_status = inw(ioaddr + RxStatus)) & 0x8000) && | 1032 | while (!((rx_status = inw(ioaddr + RxStatus)) & 0x8000) && |
1045 | worklimit > 0) { | 1033 | worklimit > 0) { |
@@ -1061,7 +1049,7 @@ static int el3_rx(struct net_device *dev, int worklimit) | |||
1061 | 1049 | ||
1062 | skb = dev_alloc_skb(pkt_len+5); | 1050 | skb = dev_alloc_skb(pkt_len+5); |
1063 | 1051 | ||
1064 | DEBUG(3, " Receiving packet size %d status %4.4x.\n", | 1052 | pr_debug(" Receiving packet size %d status %4.4x.\n", |
1065 | pkt_len, rx_status); | 1053 | pkt_len, rx_status); |
1066 | if (skb != NULL) { | 1054 | if (skb != NULL) { |
1067 | skb_reserve(skb, 2); | 1055 | skb_reserve(skb, 2); |
@@ -1072,7 +1060,7 @@ static int el3_rx(struct net_device *dev, int worklimit) | |||
1072 | dev->stats.rx_packets++; | 1060 | dev->stats.rx_packets++; |
1073 | dev->stats.rx_bytes += pkt_len; | 1061 | dev->stats.rx_bytes += pkt_len; |
1074 | } else { | 1062 | } else { |
1075 | DEBUG(1, "%s: couldn't allocate a sk_buff of" | 1063 | pr_debug("%s: couldn't allocate a sk_buff of" |
1076 | " size %d.\n", dev->name, pkt_len); | 1064 | " size %d.\n", dev->name, pkt_len); |
1077 | dev->stats.rx_dropped++; | 1065 | dev->stats.rx_dropped++; |
1078 | } | 1066 | } |
@@ -1101,7 +1089,7 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1101 | struct mii_ioctl_data *data = if_mii(rq); | 1089 | struct mii_ioctl_data *data = if_mii(rq); |
1102 | int phy = lp->phys & 0x1f; | 1090 | int phy = lp->phys & 0x1f; |
1103 | 1091 | ||
1104 | DEBUG(2, "%s: In ioct(%-.6s, %#4.4x) %4.4x %4.4x %4.4x %4.4x.\n", | 1092 | pr_debug("%s: In ioct(%-.6s, %#4.4x) %4.4x %4.4x %4.4x %4.4x.\n", |
1105 | dev->name, rq->ifr_ifrn.ifrn_name, cmd, | 1093 | dev->name, rq->ifr_ifrn.ifrn_name, cmd, |
1106 | data->phy_id, data->reg_num, data->val_in, data->val_out); | 1094 | data->phy_id, data->reg_num, data->val_in, data->val_out); |
1107 | 1095 | ||
@@ -1178,7 +1166,7 @@ static int el3_close(struct net_device *dev) | |||
1178 | struct el3_private *lp = netdev_priv(dev); | 1166 | struct el3_private *lp = netdev_priv(dev); |
1179 | struct pcmcia_device *link = lp->p_dev; | 1167 | struct pcmcia_device *link = lp->p_dev; |
1180 | 1168 | ||
1181 | DEBUG(2, "%s: shutting down ethercard.\n", dev->name); | 1169 | dev_dbg(&link->dev, "%s: shutting down ethercard.\n", dev->name); |
1182 | 1170 | ||
1183 | if (pcmcia_dev_present(link)) { | 1171 | if (pcmcia_dev_present(link)) { |
1184 | unsigned long flags; | 1172 | unsigned long flags; |
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 569fb06793cf..6f8d7e2e5922 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -130,14 +130,6 @@ MODULE_LICENSE("GPL"); | |||
130 | /* Special hook for setting if_port when module is loaded */ | 130 | /* Special hook for setting if_port when module is loaded */ |
131 | INT_MODULE_PARM(if_port, 0); | 131 | INT_MODULE_PARM(if_port, 0); |
132 | 132 | ||
133 | #ifdef PCMCIA_DEBUG | ||
134 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | ||
135 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
136 | static char *version = | ||
137 | DRV_NAME ".c " DRV_VERSION " 2001/10/13 00:08:50 (David Hinds)"; | ||
138 | #else | ||
139 | #define DEBUG(n, args...) | ||
140 | #endif | ||
141 | 133 | ||
142 | /*====================================================================*/ | 134 | /*====================================================================*/ |
143 | 135 | ||
@@ -189,7 +181,7 @@ static int tc589_probe(struct pcmcia_device *link) | |||
189 | struct el3_private *lp; | 181 | struct el3_private *lp; |
190 | struct net_device *dev; | 182 | struct net_device *dev; |
191 | 183 | ||
192 | DEBUG(0, "3c589_attach()\n"); | 184 | dev_dbg(&link->dev, "3c589_attach()\n"); |
193 | 185 | ||
194 | /* Create new ethernet device */ | 186 | /* Create new ethernet device */ |
195 | dev = alloc_etherdev(sizeof(struct el3_private)); | 187 | dev = alloc_etherdev(sizeof(struct el3_private)); |
@@ -202,10 +194,8 @@ static int tc589_probe(struct pcmcia_device *link) | |||
202 | spin_lock_init(&lp->lock); | 194 | spin_lock_init(&lp->lock); |
203 | link->io.NumPorts1 = 16; | 195 | link->io.NumPorts1 = 16; |
204 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 196 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
205 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; | 197 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
206 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
207 | link->irq.Handler = &el3_interrupt; | 198 | link->irq.Handler = &el3_interrupt; |
208 | link->irq.Instance = dev; | ||
209 | link->conf.Attributes = CONF_ENABLE_IRQ; | 199 | link->conf.Attributes = CONF_ENABLE_IRQ; |
210 | link->conf.IntType = INT_MEMORY_AND_IO; | 200 | link->conf.IntType = INT_MEMORY_AND_IO; |
211 | link->conf.ConfigIndex = 1; | 201 | link->conf.ConfigIndex = 1; |
@@ -231,7 +221,7 @@ static void tc589_detach(struct pcmcia_device *link) | |||
231 | { | 221 | { |
232 | struct net_device *dev = link->priv; | 222 | struct net_device *dev = link->priv; |
233 | 223 | ||
234 | DEBUG(0, "3c589_detach(0x%p)\n", link); | 224 | dev_dbg(&link->dev, "3c589_detach\n"); |
235 | 225 | ||
236 | if (link->dev_node) | 226 | if (link->dev_node) |
237 | unregister_netdev(dev); | 227 | unregister_netdev(dev); |
@@ -249,29 +239,20 @@ static void tc589_detach(struct pcmcia_device *link) | |||
249 | 239 | ||
250 | ======================================================================*/ | 240 | ======================================================================*/ |
251 | 241 | ||
252 | #define CS_CHECK(fn, ret) \ | ||
253 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
254 | |||
255 | static int tc589_config(struct pcmcia_device *link) | 242 | static int tc589_config(struct pcmcia_device *link) |
256 | { | 243 | { |
257 | struct net_device *dev = link->priv; | 244 | struct net_device *dev = link->priv; |
258 | struct el3_private *lp = netdev_priv(dev); | 245 | struct el3_private *lp = netdev_priv(dev); |
259 | tuple_t tuple; | ||
260 | __le16 buf[32]; | ||
261 | __be16 *phys_addr; | 246 | __be16 *phys_addr; |
262 | int last_fn, last_ret, i, j, multi = 0, fifo; | 247 | int ret, i, j, multi = 0, fifo; |
263 | unsigned int ioaddr; | 248 | unsigned int ioaddr; |
264 | char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; | 249 | char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; |
250 | u8 *buf; | ||
251 | size_t len; | ||
265 | 252 | ||
266 | DEBUG(0, "3c589_config(0x%p)\n", link); | 253 | dev_dbg(&link->dev, "3c589_config\n"); |
267 | 254 | ||
268 | phys_addr = (__be16 *)dev->dev_addr; | 255 | phys_addr = (__be16 *)dev->dev_addr; |
269 | tuple.Attributes = 0; | ||
270 | tuple.TupleData = (cisdata_t *)buf; | ||
271 | tuple.TupleDataMax = sizeof(buf); | ||
272 | tuple.TupleOffset = 0; | ||
273 | tuple.Attributes = TUPLE_RETURN_COMMON; | ||
274 | |||
275 | /* Is this a 3c562? */ | 256 | /* Is this a 3c562? */ |
276 | if (link->manf_id != MANFID_3COM) | 257 | if (link->manf_id != MANFID_3COM) |
277 | printk(KERN_INFO "3c589_cs: hmmm, is this really a " | 258 | printk(KERN_INFO "3c589_cs: hmmm, is this really a " |
@@ -287,12 +268,16 @@ static int tc589_config(struct pcmcia_device *link) | |||
287 | if (i == 0) | 268 | if (i == 0) |
288 | break; | 269 | break; |
289 | } | 270 | } |
290 | if (i != 0) { | 271 | if (i != 0) |
291 | cs_error(link, RequestIO, i); | ||
292 | goto failed; | 272 | goto failed; |
293 | } | 273 | |
294 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 274 | ret = pcmcia_request_irq(link, &link->irq); |
295 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 275 | if (ret) |
276 | goto failed; | ||
277 | |||
278 | ret = pcmcia_request_configuration(link, &link->conf); | ||
279 | if (ret) | ||
280 | goto failed; | ||
296 | 281 | ||
297 | dev->irq = link->irq.AssignedIRQ; | 282 | dev->irq = link->irq.AssignedIRQ; |
298 | dev->base_addr = link->io.BasePort1; | 283 | dev->base_addr = link->io.BasePort1; |
@@ -301,12 +286,13 @@ static int tc589_config(struct pcmcia_device *link) | |||
301 | 286 | ||
302 | /* The 3c589 has an extra EEPROM for configuration info, including | 287 | /* The 3c589 has an extra EEPROM for configuration info, including |
303 | the hardware address. The 3c562 puts the address in the CIS. */ | 288 | the hardware address. The 3c562 puts the address in the CIS. */ |
304 | tuple.DesiredTuple = 0x88; | 289 | len = pcmcia_get_tuple(link, 0x88, &buf); |
305 | if (pcmcia_get_first_tuple(link, &tuple) == 0) { | 290 | if (buf && len >= 6) { |
306 | pcmcia_get_tuple_data(link, &tuple); | 291 | for (i = 0; i < 3; i++) |
307 | for (i = 0; i < 3; i++) | 292 | phys_addr[i] = htons(le16_to_cpu(buf[i*2])); |
308 | phys_addr[i] = htons(le16_to_cpu(buf[i])); | 293 | kfree(buf); |
309 | } else { | 294 | } else { |
295 | kfree(buf); /* 0 < len < 6 */ | ||
310 | for (i = 0; i < 3; i++) | 296 | for (i = 0; i < 3; i++) |
311 | phys_addr[i] = htons(read_eeprom(ioaddr, i)); | 297 | phys_addr[i] = htons(read_eeprom(ioaddr, i)); |
312 | if (phys_addr[0] == htons(0x6060)) { | 298 | if (phys_addr[0] == htons(0x6060)) { |
@@ -328,7 +314,7 @@ static int tc589_config(struct pcmcia_device *link) | |||
328 | printk(KERN_ERR "3c589_cs: invalid if_port requested\n"); | 314 | printk(KERN_ERR "3c589_cs: invalid if_port requested\n"); |
329 | 315 | ||
330 | link->dev_node = &lp->node; | 316 | link->dev_node = &lp->node; |
331 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 317 | SET_NETDEV_DEV(dev, &link->dev); |
332 | 318 | ||
333 | if (register_netdev(dev) != 0) { | 319 | if (register_netdev(dev) != 0) { |
334 | printk(KERN_ERR "3c589_cs: register_netdev() failed\n"); | 320 | printk(KERN_ERR "3c589_cs: register_netdev() failed\n"); |
@@ -347,8 +333,6 @@ static int tc589_config(struct pcmcia_device *link) | |||
347 | if_names[dev->if_port]); | 333 | if_names[dev->if_port]); |
348 | return 0; | 334 | return 0; |
349 | 335 | ||
350 | cs_failed: | ||
351 | cs_error(link, last_fn, last_ret); | ||
352 | failed: | 336 | failed: |
353 | tc589_release(link); | 337 | tc589_release(link); |
354 | return -ENODEV; | 338 | return -ENODEV; |
@@ -511,24 +495,8 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
511 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); | 495 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); |
512 | } | 496 | } |
513 | 497 | ||
514 | #ifdef PCMCIA_DEBUG | ||
515 | static u32 netdev_get_msglevel(struct net_device *dev) | ||
516 | { | ||
517 | return pc_debug; | ||
518 | } | ||
519 | |||
520 | static void netdev_set_msglevel(struct net_device *dev, u32 level) | ||
521 | { | ||
522 | pc_debug = level; | ||
523 | } | ||
524 | #endif /* PCMCIA_DEBUG */ | ||
525 | |||
526 | static const struct ethtool_ops netdev_ethtool_ops = { | 498 | static const struct ethtool_ops netdev_ethtool_ops = { |
527 | .get_drvinfo = netdev_get_drvinfo, | 499 | .get_drvinfo = netdev_get_drvinfo, |
528 | #ifdef PCMCIA_DEBUG | ||
529 | .get_msglevel = netdev_get_msglevel, | ||
530 | .set_msglevel = netdev_set_msglevel, | ||
531 | #endif /* PCMCIA_DEBUG */ | ||
532 | }; | 500 | }; |
533 | 501 | ||
534 | static int el3_config(struct net_device *dev, struct ifmap *map) | 502 | static int el3_config(struct net_device *dev, struct ifmap *map) |
@@ -563,7 +531,7 @@ static int el3_open(struct net_device *dev) | |||
563 | lp->media.expires = jiffies + HZ; | 531 | lp->media.expires = jiffies + HZ; |
564 | add_timer(&lp->media); | 532 | add_timer(&lp->media); |
565 | 533 | ||
566 | DEBUG(1, "%s: opened, status %4.4x.\n", | 534 | dev_dbg(&link->dev, "%s: opened, status %4.4x.\n", |
567 | dev->name, inw(dev->base_addr + EL3_STATUS)); | 535 | dev->name, inw(dev->base_addr + EL3_STATUS)); |
568 | 536 | ||
569 | return 0; | 537 | return 0; |
@@ -596,7 +564,7 @@ static void pop_tx_status(struct net_device *dev) | |||
596 | if (tx_status & 0x30) | 564 | if (tx_status & 0x30) |
597 | tc589_wait_for_completion(dev, TxReset); | 565 | tc589_wait_for_completion(dev, TxReset); |
598 | if (tx_status & 0x38) { | 566 | if (tx_status & 0x38) { |
599 | DEBUG(1, "%s: transmit error: status 0x%02x\n", | 567 | pr_debug("%s: transmit error: status 0x%02x\n", |
600 | dev->name, tx_status); | 568 | dev->name, tx_status); |
601 | outw(TxEnable, ioaddr + EL3_CMD); | 569 | outw(TxEnable, ioaddr + EL3_CMD); |
602 | dev->stats.tx_aborted_errors++; | 570 | dev->stats.tx_aborted_errors++; |
@@ -612,7 +580,7 @@ static netdev_tx_t el3_start_xmit(struct sk_buff *skb, | |||
612 | struct el3_private *priv = netdev_priv(dev); | 580 | struct el3_private *priv = netdev_priv(dev); |
613 | unsigned long flags; | 581 | unsigned long flags; |
614 | 582 | ||
615 | DEBUG(3, "%s: el3_start_xmit(length = %ld) called, " | 583 | pr_debug("%s: el3_start_xmit(length = %ld) called, " |
616 | "status %4.4x.\n", dev->name, (long)skb->len, | 584 | "status %4.4x.\n", dev->name, (long)skb->len, |
617 | inw(ioaddr + EL3_STATUS)); | 585 | inw(ioaddr + EL3_STATUS)); |
618 | 586 | ||
@@ -654,14 +622,14 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
654 | 622 | ||
655 | ioaddr = dev->base_addr; | 623 | ioaddr = dev->base_addr; |
656 | 624 | ||
657 | DEBUG(3, "%s: interrupt, status %4.4x.\n", | 625 | pr_debug("%s: interrupt, status %4.4x.\n", |
658 | dev->name, inw(ioaddr + EL3_STATUS)); | 626 | dev->name, inw(ioaddr + EL3_STATUS)); |
659 | 627 | ||
660 | spin_lock(&lp->lock); | 628 | spin_lock(&lp->lock); |
661 | while ((status = inw(ioaddr + EL3_STATUS)) & | 629 | while ((status = inw(ioaddr + EL3_STATUS)) & |
662 | (IntLatch | RxComplete | StatsFull)) { | 630 | (IntLatch | RxComplete | StatsFull)) { |
663 | if ((status & 0xe000) != 0x2000) { | 631 | if ((status & 0xe000) != 0x2000) { |
664 | DEBUG(1, "%s: interrupt from dead card\n", dev->name); | 632 | pr_debug("%s: interrupt from dead card\n", dev->name); |
665 | handled = 0; | 633 | handled = 0; |
666 | break; | 634 | break; |
667 | } | 635 | } |
@@ -670,7 +638,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
670 | el3_rx(dev); | 638 | el3_rx(dev); |
671 | 639 | ||
672 | if (status & TxAvailable) { | 640 | if (status & TxAvailable) { |
673 | DEBUG(3, " TX room bit was handled.\n"); | 641 | pr_debug(" TX room bit was handled.\n"); |
674 | /* There's room in the FIFO for a full-sized packet. */ | 642 | /* There's room in the FIFO for a full-sized packet. */ |
675 | outw(AckIntr | TxAvailable, ioaddr + EL3_CMD); | 643 | outw(AckIntr | TxAvailable, ioaddr + EL3_CMD); |
676 | netif_wake_queue(dev); | 644 | netif_wake_queue(dev); |
@@ -722,7 +690,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) | |||
722 | 690 | ||
723 | lp->last_irq = jiffies; | 691 | lp->last_irq = jiffies; |
724 | spin_unlock(&lp->lock); | 692 | spin_unlock(&lp->lock); |
725 | DEBUG(3, "%s: exiting interrupt, status %4.4x.\n", | 693 | pr_debug("%s: exiting interrupt, status %4.4x.\n", |
726 | dev->name, inw(ioaddr + EL3_STATUS)); | 694 | dev->name, inw(ioaddr + EL3_STATUS)); |
727 | return IRQ_RETVAL(handled); | 695 | return IRQ_RETVAL(handled); |
728 | } | 696 | } |
@@ -833,7 +801,7 @@ static void update_stats(struct net_device *dev) | |||
833 | { | 801 | { |
834 | unsigned int ioaddr = dev->base_addr; | 802 | unsigned int ioaddr = dev->base_addr; |
835 | 803 | ||
836 | DEBUG(2, "%s: updating the statistics.\n", dev->name); | 804 | pr_debug("%s: updating the statistics.\n", dev->name); |
837 | /* Turn off statistics updates while reading. */ | 805 | /* Turn off statistics updates while reading. */ |
838 | outw(StatsDisable, ioaddr + EL3_CMD); | 806 | outw(StatsDisable, ioaddr + EL3_CMD); |
839 | /* Switch to the stats window, and read everything. */ | 807 | /* Switch to the stats window, and read everything. */ |
@@ -861,7 +829,7 @@ static int el3_rx(struct net_device *dev) | |||
861 | int worklimit = 32; | 829 | int worklimit = 32; |
862 | short rx_status; | 830 | short rx_status; |
863 | 831 | ||
864 | DEBUG(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n", | 832 | pr_debug("%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n", |
865 | dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RX_STATUS)); | 833 | dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RX_STATUS)); |
866 | while (!((rx_status = inw(ioaddr + RX_STATUS)) & 0x8000) && | 834 | while (!((rx_status = inw(ioaddr + RX_STATUS)) & 0x8000) && |
867 | worklimit > 0) { | 835 | worklimit > 0) { |
@@ -883,7 +851,7 @@ static int el3_rx(struct net_device *dev) | |||
883 | 851 | ||
884 | skb = dev_alloc_skb(pkt_len+5); | 852 | skb = dev_alloc_skb(pkt_len+5); |
885 | 853 | ||
886 | DEBUG(3, " Receiving packet size %d status %4.4x.\n", | 854 | pr_debug(" Receiving packet size %d status %4.4x.\n", |
887 | pkt_len, rx_status); | 855 | pkt_len, rx_status); |
888 | if (skb != NULL) { | 856 | if (skb != NULL) { |
889 | skb_reserve(skb, 2); | 857 | skb_reserve(skb, 2); |
@@ -894,7 +862,7 @@ static int el3_rx(struct net_device *dev) | |||
894 | dev->stats.rx_packets++; | 862 | dev->stats.rx_packets++; |
895 | dev->stats.rx_bytes += pkt_len; | 863 | dev->stats.rx_bytes += pkt_len; |
896 | } else { | 864 | } else { |
897 | DEBUG(1, "%s: couldn't allocate a sk_buff of" | 865 | pr_debug("%s: couldn't allocate a sk_buff of" |
898 | " size %d.\n", dev->name, pkt_len); | 866 | " size %d.\n", dev->name, pkt_len); |
899 | dev->stats.rx_dropped++; | 867 | dev->stats.rx_dropped++; |
900 | } | 868 | } |
@@ -935,7 +903,7 @@ static int el3_close(struct net_device *dev) | |||
935 | struct pcmcia_device *link = lp->p_dev; | 903 | struct pcmcia_device *link = lp->p_dev; |
936 | unsigned int ioaddr = dev->base_addr; | 904 | unsigned int ioaddr = dev->base_addr; |
937 | 905 | ||
938 | DEBUG(1, "%s: shutting down ethercard.\n", dev->name); | 906 | dev_dbg(&link->dev, "%s: shutting down ethercard.\n", dev->name); |
939 | 907 | ||
940 | if (pcmcia_dev_present(link)) { | 908 | if (pcmcia_dev_present(link)) { |
941 | /* Turn off statistics ASAP. We update dev->stats below. */ | 909 | /* Turn off statistics ASAP. We update dev->stats below. */ |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 3131a59a8d32..800597b82d18 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -75,16 +75,6 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>"); | |||
75 | MODULE_DESCRIPTION("Asix AX88190 PCMCIA ethernet driver"); | 75 | MODULE_DESCRIPTION("Asix AX88190 PCMCIA ethernet driver"); |
76 | MODULE_LICENSE("GPL"); | 76 | MODULE_LICENSE("GPL"); |
77 | 77 | ||
78 | #ifdef PCMCIA_DEBUG | ||
79 | #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0) | ||
80 | |||
81 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | ||
82 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
83 | static char *version = | ||
84 | "axnet_cs.c 1.28 2002/06/29 06:27:37 (David Hinds)"; | ||
85 | #else | ||
86 | #define DEBUG(n, args...) | ||
87 | #endif | ||
88 | 78 | ||
89 | /*====================================================================*/ | 79 | /*====================================================================*/ |
90 | 80 | ||
@@ -167,7 +157,7 @@ static int axnet_probe(struct pcmcia_device *link) | |||
167 | struct net_device *dev; | 157 | struct net_device *dev; |
168 | struct ei_device *ei_local; | 158 | struct ei_device *ei_local; |
169 | 159 | ||
170 | DEBUG(0, "axnet_attach()\n"); | 160 | dev_dbg(&link->dev, "axnet_attach()\n"); |
171 | 161 | ||
172 | dev = alloc_etherdev(sizeof(struct ei_device) + sizeof(axnet_dev_t)); | 162 | dev = alloc_etherdev(sizeof(struct ei_device) + sizeof(axnet_dev_t)); |
173 | if (!dev) | 163 | if (!dev) |
@@ -180,7 +170,6 @@ static int axnet_probe(struct pcmcia_device *link) | |||
180 | info->p_dev = link; | 170 | info->p_dev = link; |
181 | link->priv = dev; | 171 | link->priv = dev; |
182 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 172 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
183 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
184 | link->conf.Attributes = CONF_ENABLE_IRQ; | 173 | link->conf.Attributes = CONF_ENABLE_IRQ; |
185 | link->conf.IntType = INT_MEMORY_AND_IO; | 174 | link->conf.IntType = INT_MEMORY_AND_IO; |
186 | 175 | ||
@@ -205,7 +194,7 @@ static void axnet_detach(struct pcmcia_device *link) | |||
205 | { | 194 | { |
206 | struct net_device *dev = link->priv; | 195 | struct net_device *dev = link->priv; |
207 | 196 | ||
208 | DEBUG(0, "axnet_detach(0x%p)\n", link); | 197 | dev_dbg(&link->dev, "axnet_detach(0x%p)\n", link); |
209 | 198 | ||
210 | if (link->dev_node) | 199 | if (link->dev_node) |
211 | unregister_netdev(dev); | 200 | unregister_netdev(dev); |
@@ -272,9 +261,6 @@ static int get_prom(struct pcmcia_device *link) | |||
272 | 261 | ||
273 | ======================================================================*/ | 262 | ======================================================================*/ |
274 | 263 | ||
275 | #define CS_CHECK(fn, ret) \ | ||
276 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
277 | |||
278 | static int try_io_port(struct pcmcia_device *link) | 264 | static int try_io_port(struct pcmcia_device *link) |
279 | { | 265 | { |
280 | int j, ret; | 266 | int j, ret; |
@@ -341,26 +327,29 @@ static int axnet_config(struct pcmcia_device *link) | |||
341 | { | 327 | { |
342 | struct net_device *dev = link->priv; | 328 | struct net_device *dev = link->priv; |
343 | axnet_dev_t *info = PRIV(dev); | 329 | axnet_dev_t *info = PRIV(dev); |
344 | int i, j, j2, last_ret, last_fn; | 330 | int i, j, j2, ret; |
345 | 331 | ||
346 | DEBUG(0, "axnet_config(0x%p)\n", link); | 332 | dev_dbg(&link->dev, "axnet_config(0x%p)\n", link); |
347 | 333 | ||
348 | /* don't trust the CIS on this; Linksys got it wrong */ | 334 | /* don't trust the CIS on this; Linksys got it wrong */ |
349 | link->conf.Present = 0x63; | 335 | link->conf.Present = 0x63; |
350 | last_ret = pcmcia_loop_config(link, axnet_configcheck, NULL); | 336 | ret = pcmcia_loop_config(link, axnet_configcheck, NULL); |
351 | if (last_ret != 0) { | 337 | if (ret != 0) |
352 | cs_error(link, RequestIO, last_ret); | ||
353 | goto failed; | 338 | goto failed; |
354 | } | ||
355 | 339 | ||
356 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 340 | ret = pcmcia_request_irq(link, &link->irq); |
341 | if (ret) | ||
342 | goto failed; | ||
357 | 343 | ||
358 | if (link->io.NumPorts2 == 8) { | 344 | if (link->io.NumPorts2 == 8) { |
359 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 345 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
360 | link->conf.Status = CCSR_AUDIO_ENA; | 346 | link->conf.Status = CCSR_AUDIO_ENA; |
361 | } | 347 | } |
362 | 348 | ||
363 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 349 | ret = pcmcia_request_configuration(link, &link->conf); |
350 | if (ret) | ||
351 | goto failed; | ||
352 | |||
364 | dev->irq = link->irq.AssignedIRQ; | 353 | dev->irq = link->irq.AssignedIRQ; |
365 | dev->base_addr = link->io.BasePort1; | 354 | dev->base_addr = link->io.BasePort1; |
366 | 355 | ||
@@ -410,7 +399,7 @@ static int axnet_config(struct pcmcia_device *link) | |||
410 | 399 | ||
411 | info->phy_id = (i < 32) ? i : -1; | 400 | info->phy_id = (i < 32) ? i : -1; |
412 | link->dev_node = &info->node; | 401 | link->dev_node = &info->node; |
413 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 402 | SET_NETDEV_DEV(dev, &link->dev); |
414 | 403 | ||
415 | if (register_netdev(dev) != 0) { | 404 | if (register_netdev(dev) != 0) { |
416 | printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n"); | 405 | printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n"); |
@@ -426,14 +415,12 @@ static int axnet_config(struct pcmcia_device *link) | |||
426 | dev->base_addr, dev->irq, | 415 | dev->base_addr, dev->irq, |
427 | dev->dev_addr); | 416 | dev->dev_addr); |
428 | if (info->phy_id != -1) { | 417 | if (info->phy_id != -1) { |
429 | DEBUG(0, " MII transceiver at index %d, status %x.\n", info->phy_id, j); | 418 | dev_dbg(&link->dev, " MII transceiver at index %d, status %x.\n", info->phy_id, j); |
430 | } else { | 419 | } else { |
431 | printk(KERN_NOTICE " No MII transceivers found!\n"); | 420 | printk(KERN_NOTICE " No MII transceivers found!\n"); |
432 | } | 421 | } |
433 | return 0; | 422 | return 0; |
434 | 423 | ||
435 | cs_failed: | ||
436 | cs_error(link, last_fn, last_ret); | ||
437 | failed: | 424 | failed: |
438 | axnet_release(link); | 425 | axnet_release(link); |
439 | return -ENODEV; | 426 | return -ENODEV; |
@@ -543,7 +530,7 @@ static int axnet_open(struct net_device *dev) | |||
543 | struct pcmcia_device *link = info->p_dev; | 530 | struct pcmcia_device *link = info->p_dev; |
544 | unsigned int nic_base = dev->base_addr; | 531 | unsigned int nic_base = dev->base_addr; |
545 | 532 | ||
546 | DEBUG(2, "axnet_open('%s')\n", dev->name); | 533 | dev_dbg(&link->dev, "axnet_open('%s')\n", dev->name); |
547 | 534 | ||
548 | if (!pcmcia_dev_present(link)) | 535 | if (!pcmcia_dev_present(link)) |
549 | return -ENODEV; | 536 | return -ENODEV; |
@@ -572,7 +559,7 @@ static int axnet_close(struct net_device *dev) | |||
572 | axnet_dev_t *info = PRIV(dev); | 559 | axnet_dev_t *info = PRIV(dev); |
573 | struct pcmcia_device *link = info->p_dev; | 560 | struct pcmcia_device *link = info->p_dev; |
574 | 561 | ||
575 | DEBUG(2, "axnet_close('%s')\n", dev->name); | 562 | dev_dbg(&link->dev, "axnet_close('%s')\n", dev->name); |
576 | 563 | ||
577 | ax_close(dev); | 564 | ax_close(dev); |
578 | free_irq(dev->irq, dev); | 565 | free_irq(dev->irq, dev); |
@@ -741,10 +728,8 @@ static void block_input(struct net_device *dev, int count, | |||
741 | int xfer_count = count; | 728 | int xfer_count = count; |
742 | char *buf = skb->data; | 729 | char *buf = skb->data; |
743 | 730 | ||
744 | #ifdef PCMCIA_DEBUG | ||
745 | if ((ei_debug > 4) && (count != 4)) | 731 | if ((ei_debug > 4) && (count != 4)) |
746 | printk(KERN_DEBUG "%s: [bi=%d]\n", dev->name, count+4); | 732 | pr_debug("%s: [bi=%d]\n", dev->name, count+4); |
747 | #endif | ||
748 | outb_p(ring_offset & 0xff, nic_base + EN0_RSARLO); | 733 | outb_p(ring_offset & 0xff, nic_base + EN0_RSARLO); |
749 | outb_p(ring_offset >> 8, nic_base + EN0_RSARHI); | 734 | outb_p(ring_offset >> 8, nic_base + EN0_RSARHI); |
750 | outb_p(E8390_RREAD+E8390_START, nic_base + AXNET_CMD); | 735 | outb_p(E8390_RREAD+E8390_START, nic_base + AXNET_CMD); |
@@ -762,10 +747,7 @@ static void block_output(struct net_device *dev, int count, | |||
762 | { | 747 | { |
763 | unsigned int nic_base = dev->base_addr; | 748 | unsigned int nic_base = dev->base_addr; |
764 | 749 | ||
765 | #ifdef PCMCIA_DEBUG | 750 | pr_debug("%s: [bo=%d]\n", dev->name, count); |
766 | if (ei_debug > 4) | ||
767 | printk(KERN_DEBUG "%s: [bo=%d]\n", dev->name, count); | ||
768 | #endif | ||
769 | 751 | ||
770 | /* Round the count up for word writes. Do we need to do this? | 752 | /* Round the count up for word writes. Do we need to do this? |
771 | What effect will an odd byte count have on the 8390? | 753 | What effect will an odd byte count have on the 8390? |
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 7b5c77b7bd27..21d9c9d815d1 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
@@ -53,11 +53,7 @@ | |||
53 | 53 | ||
54 | #define VERSION "arcnet: COM20020 PCMCIA support loaded.\n" | 54 | #define VERSION "arcnet: COM20020 PCMCIA support loaded.\n" |
55 | 55 | ||
56 | #ifdef PCMCIA_DEBUG | 56 | #ifdef DEBUG |
57 | |||
58 | static int pc_debug = PCMCIA_DEBUG; | ||
59 | module_param(pc_debug, int, 0); | ||
60 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
61 | 57 | ||
62 | static void regdump(struct net_device *dev) | 58 | static void regdump(struct net_device *dev) |
63 | { | 59 | { |
@@ -92,7 +88,6 @@ static void regdump(struct net_device *dev) | |||
92 | 88 | ||
93 | #else | 89 | #else |
94 | 90 | ||
95 | #define DEBUG(n, args...) do { } while (0) | ||
96 | static inline void regdump(struct net_device *dev) { } | 91 | static inline void regdump(struct net_device *dev) { } |
97 | 92 | ||
98 | #endif | 93 | #endif |
@@ -144,7 +139,7 @@ static int com20020_probe(struct pcmcia_device *p_dev) | |||
144 | struct net_device *dev; | 139 | struct net_device *dev; |
145 | struct arcnet_local *lp; | 140 | struct arcnet_local *lp; |
146 | 141 | ||
147 | DEBUG(0, "com20020_attach()\n"); | 142 | dev_dbg(&p_dev->dev, "com20020_attach()\n"); |
148 | 143 | ||
149 | /* Create new network device */ | 144 | /* Create new network device */ |
150 | info = kzalloc(sizeof(struct com20020_dev_t), GFP_KERNEL); | 145 | info = kzalloc(sizeof(struct com20020_dev_t), GFP_KERNEL); |
@@ -169,11 +164,10 @@ static int com20020_probe(struct pcmcia_device *p_dev) | |||
169 | p_dev->io.NumPorts1 = 16; | 164 | p_dev->io.NumPorts1 = 16; |
170 | p_dev->io.IOAddrLines = 16; | 165 | p_dev->io.IOAddrLines = 16; |
171 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 166 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
172 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
173 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 167 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
174 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 168 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
175 | 169 | ||
176 | p_dev->irq.Instance = info->dev = dev; | 170 | info->dev = dev; |
177 | p_dev->priv = info; | 171 | p_dev->priv = info; |
178 | 172 | ||
179 | return com20020_config(p_dev); | 173 | return com20020_config(p_dev); |
@@ -198,12 +192,12 @@ static void com20020_detach(struct pcmcia_device *link) | |||
198 | struct com20020_dev_t *info = link->priv; | 192 | struct com20020_dev_t *info = link->priv; |
199 | struct net_device *dev = info->dev; | 193 | struct net_device *dev = info->dev; |
200 | 194 | ||
201 | DEBUG(1,"detach...\n"); | 195 | dev_dbg(&link->dev, "detach...\n"); |
202 | 196 | ||
203 | DEBUG(0, "com20020_detach(0x%p)\n", link); | 197 | dev_dbg(&link->dev, "com20020_detach\n"); |
204 | 198 | ||
205 | if (link->dev_node) { | 199 | if (link->dev_node) { |
206 | DEBUG(1,"unregister...\n"); | 200 | dev_dbg(&link->dev, "unregister...\n"); |
207 | 201 | ||
208 | unregister_netdev(dev); | 202 | unregister_netdev(dev); |
209 | 203 | ||
@@ -218,16 +212,16 @@ static void com20020_detach(struct pcmcia_device *link) | |||
218 | com20020_release(link); | 212 | com20020_release(link); |
219 | 213 | ||
220 | /* Unlink device structure, free bits */ | 214 | /* Unlink device structure, free bits */ |
221 | DEBUG(1,"unlinking...\n"); | 215 | dev_dbg(&link->dev, "unlinking...\n"); |
222 | if (link->priv) | 216 | if (link->priv) |
223 | { | 217 | { |
224 | dev = info->dev; | 218 | dev = info->dev; |
225 | if (dev) | 219 | if (dev) |
226 | { | 220 | { |
227 | DEBUG(1,"kfree...\n"); | 221 | dev_dbg(&link->dev, "kfree...\n"); |
228 | free_netdev(dev); | 222 | free_netdev(dev); |
229 | } | 223 | } |
230 | DEBUG(1,"kfree2...\n"); | 224 | dev_dbg(&link->dev, "kfree2...\n"); |
231 | kfree(info); | 225 | kfree(info); |
232 | } | 226 | } |
233 | 227 | ||
@@ -241,25 +235,22 @@ static void com20020_detach(struct pcmcia_device *link) | |||
241 | 235 | ||
242 | ======================================================================*/ | 236 | ======================================================================*/ |
243 | 237 | ||
244 | #define CS_CHECK(fn, ret) \ | ||
245 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
246 | |||
247 | static int com20020_config(struct pcmcia_device *link) | 238 | static int com20020_config(struct pcmcia_device *link) |
248 | { | 239 | { |
249 | struct arcnet_local *lp; | 240 | struct arcnet_local *lp; |
250 | com20020_dev_t *info; | 241 | com20020_dev_t *info; |
251 | struct net_device *dev; | 242 | struct net_device *dev; |
252 | int i, last_ret, last_fn; | 243 | int i, ret; |
253 | int ioaddr; | 244 | int ioaddr; |
254 | 245 | ||
255 | info = link->priv; | 246 | info = link->priv; |
256 | dev = info->dev; | 247 | dev = info->dev; |
257 | 248 | ||
258 | DEBUG(1,"config...\n"); | 249 | dev_dbg(&link->dev, "config...\n"); |
259 | 250 | ||
260 | DEBUG(0, "com20020_config(0x%p)\n", link); | 251 | dev_dbg(&link->dev, "com20020_config\n"); |
261 | 252 | ||
262 | DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1); | 253 | dev_dbg(&link->dev, "baseport1 is %Xh\n", link->io.BasePort1); |
263 | i = -ENODEV; | 254 | i = -ENODEV; |
264 | if (!link->io.BasePort1) | 255 | if (!link->io.BasePort1) |
265 | { | 256 | { |
@@ -276,26 +267,27 @@ static int com20020_config(struct pcmcia_device *link) | |||
276 | 267 | ||
277 | if (i != 0) | 268 | if (i != 0) |
278 | { | 269 | { |
279 | DEBUG(1,"arcnet: requestIO failed totally!\n"); | 270 | dev_dbg(&link->dev, "requestIO failed totally!\n"); |
280 | goto failed; | 271 | goto failed; |
281 | } | 272 | } |
282 | 273 | ||
283 | ioaddr = dev->base_addr = link->io.BasePort1; | 274 | ioaddr = dev->base_addr = link->io.BasePort1; |
284 | DEBUG(1,"arcnet: got ioaddr %Xh\n", ioaddr); | 275 | dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr); |
285 | 276 | ||
286 | DEBUG(1,"arcnet: request IRQ %d (%Xh/%Xh)\n", | 277 | dev_dbg(&link->dev, "request IRQ %d\n", |
287 | link->irq.AssignedIRQ, | 278 | link->irq.AssignedIRQ); |
288 | link->irq.IRQInfo1, link->irq.IRQInfo2); | ||
289 | i = pcmcia_request_irq(link, &link->irq); | 279 | i = pcmcia_request_irq(link, &link->irq); |
290 | if (i != 0) | 280 | if (i != 0) |
291 | { | 281 | { |
292 | DEBUG(1,"arcnet: requestIRQ failed totally!\n"); | 282 | dev_dbg(&link->dev, "requestIRQ failed totally!\n"); |
293 | goto failed; | 283 | goto failed; |
294 | } | 284 | } |
295 | 285 | ||
296 | dev->irq = link->irq.AssignedIRQ; | 286 | dev->irq = link->irq.AssignedIRQ; |
297 | 287 | ||
298 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 288 | ret = pcmcia_request_configuration(link, &link->conf); |
289 | if (ret) | ||
290 | goto failed; | ||
299 | 291 | ||
300 | if (com20020_check(dev)) | 292 | if (com20020_check(dev)) |
301 | { | 293 | { |
@@ -308,26 +300,25 @@ static int com20020_config(struct pcmcia_device *link) | |||
308 | lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */ | 300 | lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */ |
309 | 301 | ||
310 | link->dev_node = &info->node; | 302 | link->dev_node = &info->node; |
311 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 303 | SET_NETDEV_DEV(dev, &link->dev); |
312 | 304 | ||
313 | i = com20020_found(dev, 0); /* calls register_netdev */ | 305 | i = com20020_found(dev, 0); /* calls register_netdev */ |
314 | 306 | ||
315 | if (i != 0) { | 307 | if (i != 0) { |
316 | DEBUG(1,KERN_NOTICE "com20020_cs: com20020_found() failed\n"); | 308 | dev_printk(KERN_NOTICE, &link->dev, |
309 | "com20020_cs: com20020_found() failed\n"); | ||
317 | link->dev_node = NULL; | 310 | link->dev_node = NULL; |
318 | goto failed; | 311 | goto failed; |
319 | } | 312 | } |
320 | 313 | ||
321 | strcpy(info->node.dev_name, dev->name); | 314 | strcpy(info->node.dev_name, dev->name); |
322 | 315 | ||
323 | DEBUG(1,KERN_INFO "%s: port %#3lx, irq %d\n", | 316 | dev_dbg(&link->dev,KERN_INFO "%s: port %#3lx, irq %d\n", |
324 | dev->name, dev->base_addr, dev->irq); | 317 | dev->name, dev->base_addr, dev->irq); |
325 | return 0; | 318 | return 0; |
326 | 319 | ||
327 | cs_failed: | ||
328 | cs_error(link, last_fn, last_ret); | ||
329 | failed: | 320 | failed: |
330 | DEBUG(1,"com20020_config failed...\n"); | 321 | dev_dbg(&link->dev, "com20020_config failed...\n"); |
331 | com20020_release(link); | 322 | com20020_release(link); |
332 | return -ENODEV; | 323 | return -ENODEV; |
333 | } /* com20020_config */ | 324 | } /* com20020_config */ |
@@ -342,7 +333,7 @@ failed: | |||
342 | 333 | ||
343 | static void com20020_release(struct pcmcia_device *link) | 334 | static void com20020_release(struct pcmcia_device *link) |
344 | { | 335 | { |
345 | DEBUG(0, "com20020_release(0x%p)\n", link); | 336 | dev_dbg(&link->dev, "com20020_release\n"); |
346 | pcmcia_disable_device(link); | 337 | pcmcia_disable_device(link); |
347 | } | 338 | } |
348 | 339 | ||
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 7e01fbdb87e0..6e3e1ced6db4 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -72,13 +72,6 @@ MODULE_LICENSE("GPL"); | |||
72 | /* 0:4KB*2 TX buffer else:8KB*2 TX buffer */ | 72 | /* 0:4KB*2 TX buffer else:8KB*2 TX buffer */ |
73 | INT_MODULE_PARM(sram_config, 0); | 73 | INT_MODULE_PARM(sram_config, 0); |
74 | 74 | ||
75 | #ifdef PCMCIA_DEBUG | ||
76 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | ||
77 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
78 | static char *version = DRV_NAME ".c " DRV_VERSION " 2002/03/23"; | ||
79 | #else | ||
80 | #define DEBUG(n, args...) | ||
81 | #endif | ||
82 | 75 | ||
83 | /*====================================================================*/ | 76 | /*====================================================================*/ |
84 | /* | 77 | /* |
@@ -245,7 +238,7 @@ static int fmvj18x_probe(struct pcmcia_device *link) | |||
245 | local_info_t *lp; | 238 | local_info_t *lp; |
246 | struct net_device *dev; | 239 | struct net_device *dev; |
247 | 240 | ||
248 | DEBUG(0, "fmvj18x_attach()\n"); | 241 | dev_dbg(&link->dev, "fmvj18x_attach()\n"); |
249 | 242 | ||
250 | /* Make up a FMVJ18x specific data structure */ | 243 | /* Make up a FMVJ18x specific data structure */ |
251 | dev = alloc_etherdev(sizeof(local_info_t)); | 244 | dev = alloc_etherdev(sizeof(local_info_t)); |
@@ -262,10 +255,8 @@ static int fmvj18x_probe(struct pcmcia_device *link) | |||
262 | link->io.IOAddrLines = 5; | 255 | link->io.IOAddrLines = 5; |
263 | 256 | ||
264 | /* Interrupt setup */ | 257 | /* Interrupt setup */ |
265 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; | 258 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
266 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
267 | link->irq.Handler = &fjn_interrupt; | 259 | link->irq.Handler = &fjn_interrupt; |
268 | link->irq.Instance = dev; | ||
269 | 260 | ||
270 | /* General socket configuration */ | 261 | /* General socket configuration */ |
271 | link->conf.Attributes = CONF_ENABLE_IRQ; | 262 | link->conf.Attributes = CONF_ENABLE_IRQ; |
@@ -285,7 +276,7 @@ static void fmvj18x_detach(struct pcmcia_device *link) | |||
285 | { | 276 | { |
286 | struct net_device *dev = link->priv; | 277 | struct net_device *dev = link->priv; |
287 | 278 | ||
288 | DEBUG(0, "fmvj18x_detach(0x%p)\n", link); | 279 | dev_dbg(&link->dev, "fmvj18x_detach\n"); |
289 | 280 | ||
290 | if (link->dev_node) | 281 | if (link->dev_node) |
291 | unregister_netdev(dev); | 282 | unregister_netdev(dev); |
@@ -297,9 +288,6 @@ static void fmvj18x_detach(struct pcmcia_device *link) | |||
297 | 288 | ||
298 | /*====================================================================*/ | 289 | /*====================================================================*/ |
299 | 290 | ||
300 | #define CS_CHECK(fn, ret) \ | ||
301 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
302 | |||
303 | static int mfc_try_io_port(struct pcmcia_device *link) | 291 | static int mfc_try_io_port(struct pcmcia_device *link) |
304 | { | 292 | { |
305 | int i, ret; | 293 | int i, ret; |
@@ -341,33 +329,38 @@ static int ungermann_try_io_port(struct pcmcia_device *link) | |||
341 | return ret; /* RequestIO failed */ | 329 | return ret; /* RequestIO failed */ |
342 | } | 330 | } |
343 | 331 | ||
332 | static int fmvj18x_ioprobe(struct pcmcia_device *p_dev, | ||
333 | cistpl_cftable_entry_t *cfg, | ||
334 | cistpl_cftable_entry_t *dflt, | ||
335 | unsigned int vcc, | ||
336 | void *priv_data) | ||
337 | { | ||
338 | return 0; /* strange, but that's what the code did already before... */ | ||
339 | } | ||
340 | |||
344 | static int fmvj18x_config(struct pcmcia_device *link) | 341 | static int fmvj18x_config(struct pcmcia_device *link) |
345 | { | 342 | { |
346 | struct net_device *dev = link->priv; | 343 | struct net_device *dev = link->priv; |
347 | local_info_t *lp = netdev_priv(dev); | 344 | local_info_t *lp = netdev_priv(dev); |
348 | tuple_t tuple; | 345 | int i, ret; |
349 | cisparse_t parse; | ||
350 | u_short buf[32]; | ||
351 | int i, last_fn = 0, last_ret = 0, ret; | ||
352 | unsigned int ioaddr; | 346 | unsigned int ioaddr; |
353 | cardtype_t cardtype; | 347 | cardtype_t cardtype; |
354 | char *card_name = "unknown"; | 348 | char *card_name = "unknown"; |
355 | u_char *node_id; | 349 | u8 *buf; |
350 | size_t len; | ||
351 | u_char buggybuf[32]; | ||
352 | |||
353 | dev_dbg(&link->dev, "fmvj18x_config\n"); | ||
356 | 354 | ||
357 | DEBUG(0, "fmvj18x_config(0x%p)\n", link); | 355 | len = pcmcia_get_tuple(link, CISTPL_FUNCE, &buf); |
356 | kfree(buf); | ||
358 | 357 | ||
359 | tuple.TupleData = (u_char *)buf; | 358 | if (len) { |
360 | tuple.TupleDataMax = 64; | ||
361 | tuple.TupleOffset = 0; | ||
362 | tuple.DesiredTuple = CISTPL_FUNCE; | ||
363 | tuple.TupleOffset = 0; | ||
364 | if (pcmcia_get_first_tuple(link, &tuple) == 0) { | ||
365 | /* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */ | 359 | /* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */ |
366 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 360 | ret = pcmcia_loop_config(link, fmvj18x_ioprobe, NULL); |
367 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); | 361 | if (ret != 0) |
368 | CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple)); | 362 | goto failed; |
369 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse)); | 363 | |
370 | link->conf.ConfigIndex = parse.cftable_entry.index; | ||
371 | switch (link->manf_id) { | 364 | switch (link->manf_id) { |
372 | case MANFID_TDK: | 365 | case MANFID_TDK: |
373 | cardtype = TDK; | 366 | cardtype = TDK; |
@@ -433,17 +426,24 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
433 | 426 | ||
434 | if (link->io.NumPorts2 != 0) { | 427 | if (link->io.NumPorts2 != 0) { |
435 | link->irq.Attributes = | 428 | link->irq.Attributes = |
436 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT; | 429 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
437 | ret = mfc_try_io_port(link); | 430 | ret = mfc_try_io_port(link); |
438 | if (ret != 0) goto cs_failed; | 431 | if (ret != 0) goto failed; |
439 | } else if (cardtype == UNGERMANN) { | 432 | } else if (cardtype == UNGERMANN) { |
440 | ret = ungermann_try_io_port(link); | 433 | ret = ungermann_try_io_port(link); |
441 | if (ret != 0) goto cs_failed; | 434 | if (ret != 0) goto failed; |
442 | } else { | 435 | } else { |
443 | CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); | 436 | ret = pcmcia_request_io(link, &link->io); |
437 | if (ret) | ||
438 | goto failed; | ||
444 | } | 439 | } |
445 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 440 | ret = pcmcia_request_irq(link, &link->irq); |
446 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 441 | if (ret) |
442 | goto failed; | ||
443 | ret = pcmcia_request_configuration(link, &link->conf); | ||
444 | if (ret) | ||
445 | goto failed; | ||
446 | |||
447 | dev->irq = link->irq.AssignedIRQ; | 447 | dev->irq = link->irq.AssignedIRQ; |
448 | dev->base_addr = link->io.BasePort1; | 448 | dev->base_addr = link->io.BasePort1; |
449 | 449 | ||
@@ -474,21 +474,21 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
474 | case CONTEC: | 474 | case CONTEC: |
475 | case NEC: | 475 | case NEC: |
476 | case KME: | 476 | case KME: |
477 | tuple.DesiredTuple = CISTPL_FUNCE; | ||
478 | tuple.TupleOffset = 0; | ||
479 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); | ||
480 | tuple.TupleOffset = 0; | ||
481 | CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple)); | ||
482 | if (cardtype == MBH10304) { | 477 | if (cardtype == MBH10304) { |
483 | /* MBH10304's CIS_FUNCE is corrupted */ | ||
484 | node_id = &(tuple.TupleData[5]); | ||
485 | card_name = "FMV-J182"; | 478 | card_name = "FMV-J182"; |
486 | } else { | 479 | |
487 | while (tuple.TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID ) { | 480 | len = pcmcia_get_tuple(link, CISTPL_FUNCE, &buf); |
488 | CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple)); | 481 | if (len < 11) { |
489 | CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple)); | 482 | kfree(buf); |
483 | goto failed; | ||
490 | } | 484 | } |
491 | node_id = &(tuple.TupleData[2]); | 485 | /* Read MACID from CIS */ |
486 | for (i = 5; i < 11; i++) | ||
487 | dev->dev_addr[i] = buf[i]; | ||
488 | kfree(buf); | ||
489 | } else { | ||
490 | if (pcmcia_get_mac_from_cis(link, dev)) | ||
491 | goto failed; | ||
492 | if( cardtype == TDK ) { | 492 | if( cardtype == TDK ) { |
493 | card_name = "TDK LAK-CD021"; | 493 | card_name = "TDK LAK-CD021"; |
494 | } else if( cardtype == LA501 ) { | 494 | } else if( cardtype == LA501 ) { |
@@ -501,9 +501,6 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
501 | card_name = "C-NET(PC)C"; | 501 | card_name = "C-NET(PC)C"; |
502 | } | 502 | } |
503 | } | 503 | } |
504 | /* Read MACID from CIS */ | ||
505 | for (i = 0; i < 6; i++) | ||
506 | dev->dev_addr[i] = node_id[i]; | ||
507 | break; | 504 | break; |
508 | case UNGERMANN: | 505 | case UNGERMANN: |
509 | /* Read MACID from register */ | 506 | /* Read MACID from register */ |
@@ -513,12 +510,12 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
513 | break; | 510 | break; |
514 | case XXX10304: | 511 | case XXX10304: |
515 | /* Read MACID from Buggy CIS */ | 512 | /* Read MACID from Buggy CIS */ |
516 | if (fmvj18x_get_hwinfo(link, tuple.TupleData) == -1) { | 513 | if (fmvj18x_get_hwinfo(link, buggybuf) == -1) { |
517 | printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net address.\n"); | 514 | printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net address.\n"); |
518 | goto failed; | 515 | goto failed; |
519 | } | 516 | } |
520 | for (i = 0 ; i < 6; i++) { | 517 | for (i = 0 ; i < 6; i++) { |
521 | dev->dev_addr[i] = tuple.TupleData[i]; | 518 | dev->dev_addr[i] = buggybuf[i]; |
522 | } | 519 | } |
523 | card_name = "FMV-J182"; | 520 | card_name = "FMV-J182"; |
524 | break; | 521 | break; |
@@ -533,7 +530,7 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
533 | 530 | ||
534 | lp->cardtype = cardtype; | 531 | lp->cardtype = cardtype; |
535 | link->dev_node = &lp->node; | 532 | link->dev_node = &lp->node; |
536 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 533 | SET_NETDEV_DEV(dev, &link->dev); |
537 | 534 | ||
538 | if (register_netdev(dev) != 0) { | 535 | if (register_netdev(dev) != 0) { |
539 | printk(KERN_NOTICE "fmvj18x_cs: register_netdev() failed\n"); | 536 | printk(KERN_NOTICE "fmvj18x_cs: register_netdev() failed\n"); |
@@ -551,9 +548,6 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
551 | 548 | ||
552 | return 0; | 549 | return 0; |
553 | 550 | ||
554 | cs_failed: | ||
555 | /* All Card Services errors end up here */ | ||
556 | cs_error(link, last_fn, last_ret); | ||
557 | failed: | 551 | failed: |
558 | fmvj18x_release(link); | 552 | fmvj18x_release(link); |
559 | return -ENODEV; | 553 | return -ENODEV; |
@@ -571,16 +565,14 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) | |||
571 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 565 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
572 | req.Base = 0; req.Size = 0; | 566 | req.Base = 0; req.Size = 0; |
573 | req.AccessSpeed = 0; | 567 | req.AccessSpeed = 0; |
574 | i = pcmcia_request_window(&link, &req, &link->win); | 568 | i = pcmcia_request_window(link, &req, &link->win); |
575 | if (i != 0) { | 569 | if (i != 0) |
576 | cs_error(link, RequestWindow, i); | ||
577 | return -1; | 570 | return -1; |
578 | } | ||
579 | 571 | ||
580 | base = ioremap(req.Base, req.Size); | 572 | base = ioremap(req.Base, req.Size); |
581 | mem.Page = 0; | 573 | mem.Page = 0; |
582 | mem.CardOffset = 0; | 574 | mem.CardOffset = 0; |
583 | pcmcia_map_mem_page(link->win, &mem); | 575 | pcmcia_map_mem_page(link, link->win, &mem); |
584 | 576 | ||
585 | /* | 577 | /* |
586 | * MBH10304 CISTPL_FUNCE_LAN_NODE_ID format | 578 | * MBH10304 CISTPL_FUNCE_LAN_NODE_ID format |
@@ -605,9 +597,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) | |||
605 | } | 597 | } |
606 | 598 | ||
607 | iounmap(base); | 599 | iounmap(base); |
608 | j = pcmcia_release_window(link->win); | 600 | j = pcmcia_release_window(link, link->win); |
609 | if (j != 0) | ||
610 | cs_error(link, ReleaseWindow, j); | ||
611 | return (i != 0x200) ? 0 : -1; | 601 | return (i != 0x200) ? 0 : -1; |
612 | 602 | ||
613 | } /* fmvj18x_get_hwinfo */ | 603 | } /* fmvj18x_get_hwinfo */ |
@@ -626,11 +616,9 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) | |||
626 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 616 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
627 | req.Base = 0; req.Size = 0; | 617 | req.Base = 0; req.Size = 0; |
628 | req.AccessSpeed = 0; | 618 | req.AccessSpeed = 0; |
629 | i = pcmcia_request_window(&link, &req, &link->win); | 619 | i = pcmcia_request_window(link, &req, &link->win); |
630 | if (i != 0) { | 620 | if (i != 0) |
631 | cs_error(link, RequestWindow, i); | ||
632 | return -1; | 621 | return -1; |
633 | } | ||
634 | 622 | ||
635 | lp->base = ioremap(req.Base, req.Size); | 623 | lp->base = ioremap(req.Base, req.Size); |
636 | if (lp->base == NULL) { | 624 | if (lp->base == NULL) { |
@@ -640,11 +628,10 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) | |||
640 | 628 | ||
641 | mem.Page = 0; | 629 | mem.Page = 0; |
642 | mem.CardOffset = 0; | 630 | mem.CardOffset = 0; |
643 | i = pcmcia_map_mem_page(link->win, &mem); | 631 | i = pcmcia_map_mem_page(link, link->win, &mem); |
644 | if (i != 0) { | 632 | if (i != 0) { |
645 | iounmap(lp->base); | 633 | iounmap(lp->base); |
646 | lp->base = NULL; | 634 | lp->base = NULL; |
647 | cs_error(link, MapMemPage, i); | ||
648 | return -1; | 635 | return -1; |
649 | } | 636 | } |
650 | 637 | ||
@@ -671,15 +658,13 @@ static void fmvj18x_release(struct pcmcia_device *link) | |||
671 | u_char __iomem *tmp; | 658 | u_char __iomem *tmp; |
672 | int j; | 659 | int j; |
673 | 660 | ||
674 | DEBUG(0, "fmvj18x_release(0x%p)\n", link); | 661 | dev_dbg(&link->dev, "fmvj18x_release\n"); |
675 | 662 | ||
676 | if (lp->base != NULL) { | 663 | if (lp->base != NULL) { |
677 | tmp = lp->base; | 664 | tmp = lp->base; |
678 | lp->base = NULL; /* set NULL before iounmap */ | 665 | lp->base = NULL; /* set NULL before iounmap */ |
679 | iounmap(tmp); | 666 | iounmap(tmp); |
680 | j = pcmcia_release_window(link->win); | 667 | j = pcmcia_release_window(link, link->win); |
681 | if (j != 0) | ||
682 | cs_error(link, ReleaseWindow, j); | ||
683 | } | 668 | } |
684 | 669 | ||
685 | pcmcia_disable_device(link); | 670 | pcmcia_disable_device(link); |
@@ -788,8 +773,8 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id) | |||
788 | outb(tx_stat, ioaddr + TX_STATUS); | 773 | outb(tx_stat, ioaddr + TX_STATUS); |
789 | outb(rx_stat, ioaddr + RX_STATUS); | 774 | outb(rx_stat, ioaddr + RX_STATUS); |
790 | 775 | ||
791 | DEBUG(4, "%s: interrupt, rx_status %02x.\n", dev->name, rx_stat); | 776 | pr_debug("%s: interrupt, rx_status %02x.\n", dev->name, rx_stat); |
792 | DEBUG(4, " tx_status %02x.\n", tx_stat); | 777 | pr_debug(" tx_status %02x.\n", tx_stat); |
793 | 778 | ||
794 | if (rx_stat || (inb(ioaddr + RX_MODE) & F_BUF_EMP) == 0) { | 779 | if (rx_stat || (inb(ioaddr + RX_MODE) & F_BUF_EMP) == 0) { |
795 | /* there is packet(s) in rx buffer */ | 780 | /* there is packet(s) in rx buffer */ |
@@ -809,8 +794,8 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id) | |||
809 | } | 794 | } |
810 | netif_wake_queue(dev); | 795 | netif_wake_queue(dev); |
811 | } | 796 | } |
812 | DEBUG(4, "%s: exiting interrupt,\n", dev->name); | 797 | pr_debug("%s: exiting interrupt,\n", dev->name); |
813 | DEBUG(4, " tx_status %02x, rx_status %02x.\n", tx_stat, rx_stat); | 798 | pr_debug(" tx_status %02x, rx_status %02x.\n", tx_stat, rx_stat); |
814 | 799 | ||
815 | outb(D_TX_INTR, ioaddr + TX_INTR); | 800 | outb(D_TX_INTR, ioaddr + TX_INTR); |
816 | outb(D_RX_INTR, ioaddr + RX_INTR); | 801 | outb(D_RX_INTR, ioaddr + RX_INTR); |
@@ -882,7 +867,7 @@ static netdev_tx_t fjn_start_xmit(struct sk_buff *skb, | |||
882 | return NETDEV_TX_BUSY; | 867 | return NETDEV_TX_BUSY; |
883 | } | 868 | } |
884 | 869 | ||
885 | DEBUG(4, "%s: Transmitting a packet of length %lu.\n", | 870 | pr_debug("%s: Transmitting a packet of length %lu.\n", |
886 | dev->name, (unsigned long)skb->len); | 871 | dev->name, (unsigned long)skb->len); |
887 | dev->stats.tx_bytes += skb->len; | 872 | dev->stats.tx_bytes += skb->len; |
888 | 873 | ||
@@ -937,7 +922,7 @@ static void fjn_reset(struct net_device *dev) | |||
937 | unsigned int ioaddr = dev->base_addr; | 922 | unsigned int ioaddr = dev->base_addr; |
938 | int i; | 923 | int i; |
939 | 924 | ||
940 | DEBUG(4, "fjn_reset(%s) called.\n",dev->name); | 925 | pr_debug("fjn_reset(%s) called.\n",dev->name); |
941 | 926 | ||
942 | /* Reset controller */ | 927 | /* Reset controller */ |
943 | if( sram_config == 0 ) | 928 | if( sram_config == 0 ) |
@@ -1015,13 +1000,13 @@ static void fjn_rx(struct net_device *dev) | |||
1015 | unsigned int ioaddr = dev->base_addr; | 1000 | unsigned int ioaddr = dev->base_addr; |
1016 | int boguscount = 10; /* 5 -> 10: by agy 19940922 */ | 1001 | int boguscount = 10; /* 5 -> 10: by agy 19940922 */ |
1017 | 1002 | ||
1018 | DEBUG(4, "%s: in rx_packet(), rx_status %02x.\n", | 1003 | pr_debug("%s: in rx_packet(), rx_status %02x.\n", |
1019 | dev->name, inb(ioaddr + RX_STATUS)); | 1004 | dev->name, inb(ioaddr + RX_STATUS)); |
1020 | 1005 | ||
1021 | while ((inb(ioaddr + RX_MODE) & F_BUF_EMP) == 0) { | 1006 | while ((inb(ioaddr + RX_MODE) & F_BUF_EMP) == 0) { |
1022 | u_short status = inw(ioaddr + DATAPORT); | 1007 | u_short status = inw(ioaddr + DATAPORT); |
1023 | 1008 | ||
1024 | DEBUG(4, "%s: Rxing packet mode %02x status %04x.\n", | 1009 | pr_debug("%s: Rxing packet mode %02x status %04x.\n", |
1025 | dev->name, inb(ioaddr + RX_MODE), status); | 1010 | dev->name, inb(ioaddr + RX_MODE), status); |
1026 | #ifndef final_version | 1011 | #ifndef final_version |
1027 | if (status == 0) { | 1012 | if (status == 0) { |
@@ -1061,16 +1046,14 @@ static void fjn_rx(struct net_device *dev) | |||
1061 | (pkt_len + 1) >> 1); | 1046 | (pkt_len + 1) >> 1); |
1062 | skb->protocol = eth_type_trans(skb, dev); | 1047 | skb->protocol = eth_type_trans(skb, dev); |
1063 | 1048 | ||
1064 | #ifdef PCMCIA_DEBUG | 1049 | { |
1065 | if (pc_debug > 5) { | ||
1066 | int i; | 1050 | int i; |
1067 | printk(KERN_DEBUG "%s: Rxed packet of length %d: ", | 1051 | pr_debug("%s: Rxed packet of length %d: ", |
1068 | dev->name, pkt_len); | 1052 | dev->name, pkt_len); |
1069 | for (i = 0; i < 14; i++) | 1053 | for (i = 0; i < 14; i++) |
1070 | printk(" %02x", skb->data[i]); | 1054 | pr_debug(" %02x", skb->data[i]); |
1071 | printk(".\n"); | 1055 | pr_debug(".\n"); |
1072 | } | 1056 | } |
1073 | #endif | ||
1074 | 1057 | ||
1075 | netif_rx(skb); | 1058 | netif_rx(skb); |
1076 | dev->stats.rx_packets++; | 1059 | dev->stats.rx_packets++; |
@@ -1094,7 +1077,7 @@ static void fjn_rx(struct net_device *dev) | |||
1094 | } | 1077 | } |
1095 | 1078 | ||
1096 | if (i > 0) | 1079 | if (i > 0) |
1097 | DEBUG(5, "%s: Exint Rx packet with mode %02x after " | 1080 | pr_debug("%s: Exint Rx packet with mode %02x after " |
1098 | "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i); | 1081 | "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i); |
1099 | } | 1082 | } |
1100 | */ | 1083 | */ |
@@ -1112,24 +1095,8 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
1112 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); | 1095 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); |
1113 | } | 1096 | } |
1114 | 1097 | ||
1115 | #ifdef PCMCIA_DEBUG | ||
1116 | static u32 netdev_get_msglevel(struct net_device *dev) | ||
1117 | { | ||
1118 | return pc_debug; | ||
1119 | } | ||
1120 | |||
1121 | static void netdev_set_msglevel(struct net_device *dev, u32 level) | ||
1122 | { | ||
1123 | pc_debug = level; | ||
1124 | } | ||
1125 | #endif /* PCMCIA_DEBUG */ | ||
1126 | |||
1127 | static const struct ethtool_ops netdev_ethtool_ops = { | 1098 | static const struct ethtool_ops netdev_ethtool_ops = { |
1128 | .get_drvinfo = netdev_get_drvinfo, | 1099 | .get_drvinfo = netdev_get_drvinfo, |
1129 | #ifdef PCMCIA_DEBUG | ||
1130 | .get_msglevel = netdev_get_msglevel, | ||
1131 | .set_msglevel = netdev_set_msglevel, | ||
1132 | #endif /* PCMCIA_DEBUG */ | ||
1133 | }; | 1100 | }; |
1134 | 1101 | ||
1135 | static int fjn_config(struct net_device *dev, struct ifmap *map){ | 1102 | static int fjn_config(struct net_device *dev, struct ifmap *map){ |
@@ -1141,7 +1108,7 @@ static int fjn_open(struct net_device *dev) | |||
1141 | struct local_info_t *lp = netdev_priv(dev); | 1108 | struct local_info_t *lp = netdev_priv(dev); |
1142 | struct pcmcia_device *link = lp->p_dev; | 1109 | struct pcmcia_device *link = lp->p_dev; |
1143 | 1110 | ||
1144 | DEBUG(4, "fjn_open('%s').\n", dev->name); | 1111 | pr_debug("fjn_open('%s').\n", dev->name); |
1145 | 1112 | ||
1146 | if (!pcmcia_dev_present(link)) | 1113 | if (!pcmcia_dev_present(link)) |
1147 | return -ENODEV; | 1114 | return -ENODEV; |
@@ -1167,7 +1134,7 @@ static int fjn_close(struct net_device *dev) | |||
1167 | struct pcmcia_device *link = lp->p_dev; | 1134 | struct pcmcia_device *link = lp->p_dev; |
1168 | unsigned int ioaddr = dev->base_addr; | 1135 | unsigned int ioaddr = dev->base_addr; |
1169 | 1136 | ||
1170 | DEBUG(4, "fjn_close('%s').\n", dev->name); | 1137 | pr_debug("fjn_close('%s').\n", dev->name); |
1171 | 1138 | ||
1172 | lp->open_time = 0; | 1139 | lp->open_time = 0; |
1173 | netif_stop_queue(dev); | 1140 | netif_stop_queue(dev); |
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 06618af1a468..37f4a6fdc3ef 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -69,17 +69,6 @@ | |||
69 | #define PCMCIA | 69 | #define PCMCIA |
70 | #include "../tokenring/ibmtr.c" | 70 | #include "../tokenring/ibmtr.c" |
71 | 71 | ||
72 | #ifdef PCMCIA_DEBUG | ||
73 | static int pc_debug = PCMCIA_DEBUG; | ||
74 | module_param(pc_debug, int, 0); | ||
75 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
76 | static char *version = | ||
77 | "ibmtr_cs.c 1.10 1996/01/06 05:19:00 (Steve Kipisz)\n" | ||
78 | " 2.2.7 1999/05/03 12:00:00 (Mike Phillips)\n" | ||
79 | " 2.4.2 2001/30/28 Midnight (Burt Silverman)\n"; | ||
80 | #else | ||
81 | #define DEBUG(n, args...) | ||
82 | #endif | ||
83 | 72 | ||
84 | /*====================================================================*/ | 73 | /*====================================================================*/ |
85 | 74 | ||
@@ -130,6 +119,12 @@ static const struct ethtool_ops netdev_ethtool_ops = { | |||
130 | .get_drvinfo = netdev_get_drvinfo, | 119 | .get_drvinfo = netdev_get_drvinfo, |
131 | }; | 120 | }; |
132 | 121 | ||
122 | static irqreturn_t ibmtr_interrupt(int irq, void *dev_id) { | ||
123 | ibmtr_dev_t *info = dev_id; | ||
124 | struct net_device *dev = info->dev; | ||
125 | return tok_interrupt(irq, dev); | ||
126 | }; | ||
127 | |||
133 | /*====================================================================== | 128 | /*====================================================================== |
134 | 129 | ||
135 | ibmtr_attach() creates an "instance" of the driver, allocating | 130 | ibmtr_attach() creates an "instance" of the driver, allocating |
@@ -143,7 +138,7 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link) | |||
143 | ibmtr_dev_t *info; | 138 | ibmtr_dev_t *info; |
144 | struct net_device *dev; | 139 | struct net_device *dev; |
145 | 140 | ||
146 | DEBUG(0, "ibmtr_attach()\n"); | 141 | dev_dbg(&link->dev, "ibmtr_attach()\n"); |
147 | 142 | ||
148 | /* Create new token-ring device */ | 143 | /* Create new token-ring device */ |
149 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 144 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
@@ -161,14 +156,13 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link) | |||
161 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 156 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
162 | link->io.NumPorts1 = 4; | 157 | link->io.NumPorts1 = 4; |
163 | link->io.IOAddrLines = 16; | 158 | link->io.IOAddrLines = 16; |
164 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; | 159 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
165 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 160 | link->irq.Handler = ibmtr_interrupt; |
166 | link->irq.Handler = &tok_interrupt; | ||
167 | link->conf.Attributes = CONF_ENABLE_IRQ; | 161 | link->conf.Attributes = CONF_ENABLE_IRQ; |
168 | link->conf.IntType = INT_MEMORY_AND_IO; | 162 | link->conf.IntType = INT_MEMORY_AND_IO; |
169 | link->conf.Present = PRESENT_OPTION; | 163 | link->conf.Present = PRESENT_OPTION; |
170 | 164 | ||
171 | link->irq.Instance = info->dev = dev; | 165 | info->dev = dev; |
172 | 166 | ||
173 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); | 167 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); |
174 | 168 | ||
@@ -190,7 +184,7 @@ static void ibmtr_detach(struct pcmcia_device *link) | |||
190 | struct net_device *dev = info->dev; | 184 | struct net_device *dev = info->dev; |
191 | struct tok_info *ti = netdev_priv(dev); | 185 | struct tok_info *ti = netdev_priv(dev); |
192 | 186 | ||
193 | DEBUG(0, "ibmtr_detach(0x%p)\n", link); | 187 | dev_dbg(&link->dev, "ibmtr_detach\n"); |
194 | 188 | ||
195 | /* | 189 | /* |
196 | * When the card removal interrupt hits tok_interrupt(), | 190 | * When the card removal interrupt hits tok_interrupt(), |
@@ -217,9 +211,6 @@ static void ibmtr_detach(struct pcmcia_device *link) | |||
217 | 211 | ||
218 | ======================================================================*/ | 212 | ======================================================================*/ |
219 | 213 | ||
220 | #define CS_CHECK(fn, ret) \ | ||
221 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
222 | |||
223 | static int __devinit ibmtr_config(struct pcmcia_device *link) | 214 | static int __devinit ibmtr_config(struct pcmcia_device *link) |
224 | { | 215 | { |
225 | ibmtr_dev_t *info = link->priv; | 216 | ibmtr_dev_t *info = link->priv; |
@@ -227,9 +218,9 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
227 | struct tok_info *ti = netdev_priv(dev); | 218 | struct tok_info *ti = netdev_priv(dev); |
228 | win_req_t req; | 219 | win_req_t req; |
229 | memreq_t mem; | 220 | memreq_t mem; |
230 | int i, last_ret, last_fn; | 221 | int i, ret; |
231 | 222 | ||
232 | DEBUG(0, "ibmtr_config(0x%p)\n", link); | 223 | dev_dbg(&link->dev, "ibmtr_config\n"); |
233 | 224 | ||
234 | link->conf.ConfigIndex = 0x61; | 225 | link->conf.ConfigIndex = 0x61; |
235 | 226 | ||
@@ -241,11 +232,15 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
241 | if (i != 0) { | 232 | if (i != 0) { |
242 | /* Couldn't get 0xA20-0xA23. Try ALTERNATE at 0xA24-0xA27. */ | 233 | /* Couldn't get 0xA20-0xA23. Try ALTERNATE at 0xA24-0xA27. */ |
243 | link->io.BasePort1 = 0xA24; | 234 | link->io.BasePort1 = 0xA24; |
244 | CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); | 235 | ret = pcmcia_request_io(link, &link->io); |
236 | if (ret) | ||
237 | goto failed; | ||
245 | } | 238 | } |
246 | dev->base_addr = link->io.BasePort1; | 239 | dev->base_addr = link->io.BasePort1; |
247 | 240 | ||
248 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 241 | ret = pcmcia_request_irq(link, &link->irq); |
242 | if (ret) | ||
243 | goto failed; | ||
249 | dev->irq = link->irq.AssignedIRQ; | 244 | dev->irq = link->irq.AssignedIRQ; |
250 | ti->irq = link->irq.AssignedIRQ; | 245 | ti->irq = link->irq.AssignedIRQ; |
251 | ti->global_int_enable=GLOBAL_INT_ENABLE+((dev->irq==9) ? 2 : dev->irq); | 246 | ti->global_int_enable=GLOBAL_INT_ENABLE+((dev->irq==9) ? 2 : dev->irq); |
@@ -256,11 +251,15 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
256 | req.Base = 0; | 251 | req.Base = 0; |
257 | req.Size = 0x2000; | 252 | req.Size = 0x2000; |
258 | req.AccessSpeed = 250; | 253 | req.AccessSpeed = 250; |
259 | CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win)); | 254 | ret = pcmcia_request_window(link, &req, &link->win); |
255 | if (ret) | ||
256 | goto failed; | ||
260 | 257 | ||
261 | mem.CardOffset = mmiobase; | 258 | mem.CardOffset = mmiobase; |
262 | mem.Page = 0; | 259 | mem.Page = 0; |
263 | CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem)); | 260 | ret = pcmcia_map_mem_page(link, link->win, &mem); |
261 | if (ret) | ||
262 | goto failed; | ||
264 | ti->mmio = ioremap(req.Base, req.Size); | 263 | ti->mmio = ioremap(req.Base, req.Size); |
265 | 264 | ||
266 | /* Allocate the SRAM memory window */ | 265 | /* Allocate the SRAM memory window */ |
@@ -269,17 +268,23 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
269 | req.Base = 0; | 268 | req.Base = 0; |
270 | req.Size = sramsize * 1024; | 269 | req.Size = sramsize * 1024; |
271 | req.AccessSpeed = 250; | 270 | req.AccessSpeed = 250; |
272 | CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &info->sram_win_handle)); | 271 | ret = pcmcia_request_window(link, &req, &info->sram_win_handle); |
272 | if (ret) | ||
273 | goto failed; | ||
273 | 274 | ||
274 | mem.CardOffset = srambase; | 275 | mem.CardOffset = srambase; |
275 | mem.Page = 0; | 276 | mem.Page = 0; |
276 | CS_CHECK(MapMemPage, pcmcia_map_mem_page(info->sram_win_handle, &mem)); | 277 | ret = pcmcia_map_mem_page(link, info->sram_win_handle, &mem); |
278 | if (ret) | ||
279 | goto failed; | ||
277 | 280 | ||
278 | ti->sram_base = mem.CardOffset >> 12; | 281 | ti->sram_base = mem.CardOffset >> 12; |
279 | ti->sram_virt = ioremap(req.Base, req.Size); | 282 | ti->sram_virt = ioremap(req.Base, req.Size); |
280 | ti->sram_phys = req.Base; | 283 | ti->sram_phys = req.Base; |
281 | 284 | ||
282 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 285 | ret = pcmcia_request_configuration(link, &link->conf); |
286 | if (ret) | ||
287 | goto failed; | ||
283 | 288 | ||
284 | /* Set up the Token-Ring Controller Configuration Register and | 289 | /* Set up the Token-Ring Controller Configuration Register and |
285 | turn on the card. Check the "Local Area Network Credit Card | 290 | turn on the card. Check the "Local Area Network Credit Card |
@@ -287,7 +292,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
287 | ibmtr_hw_setup(dev, mmiobase); | 292 | ibmtr_hw_setup(dev, mmiobase); |
288 | 293 | ||
289 | link->dev_node = &info->node; | 294 | link->dev_node = &info->node; |
290 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 295 | SET_NETDEV_DEV(dev, &link->dev); |
291 | 296 | ||
292 | i = ibmtr_probe_card(dev); | 297 | i = ibmtr_probe_card(dev); |
293 | if (i != 0) { | 298 | if (i != 0) { |
@@ -305,8 +310,6 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
305 | dev->dev_addr); | 310 | dev->dev_addr); |
306 | return 0; | 311 | return 0; |
307 | 312 | ||
308 | cs_failed: | ||
309 | cs_error(link, last_fn, last_ret); | ||
310 | failed: | 313 | failed: |
311 | ibmtr_release(link); | 314 | ibmtr_release(link); |
312 | return -ENODEV; | 315 | return -ENODEV; |
@@ -325,12 +328,12 @@ static void ibmtr_release(struct pcmcia_device *link) | |||
325 | ibmtr_dev_t *info = link->priv; | 328 | ibmtr_dev_t *info = link->priv; |
326 | struct net_device *dev = info->dev; | 329 | struct net_device *dev = info->dev; |
327 | 330 | ||
328 | DEBUG(0, "ibmtr_release(0x%p)\n", link); | 331 | dev_dbg(&link->dev, "ibmtr_release\n"); |
329 | 332 | ||
330 | if (link->win) { | 333 | if (link->win) { |
331 | struct tok_info *ti = netdev_priv(dev); | 334 | struct tok_info *ti = netdev_priv(dev); |
332 | iounmap(ti->mmio); | 335 | iounmap(ti->mmio); |
333 | pcmcia_release_window(info->sram_win_handle); | 336 | pcmcia_release_window(link, info->sram_win_handle); |
334 | } | 337 | } |
335 | pcmcia_disable_device(link); | 338 | pcmcia_disable_device(link); |
336 | } | 339 | } |
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 5ed6339c52bc..dae5ef6b2609 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -381,13 +381,6 @@ typedef struct _mace_private { | |||
381 | Private Global Variables | 381 | Private Global Variables |
382 | ---------------------------------------------------------------------------- */ | 382 | ---------------------------------------------------------------------------- */ |
383 | 383 | ||
384 | #ifdef PCMCIA_DEBUG | ||
385 | static char rcsid[] = | ||
386 | "nmclan_cs.c,v 0.16 1995/07/01 06:42:17 rpao Exp rpao"; | ||
387 | static char *version = | ||
388 | DRV_NAME " " DRV_VERSION " (Roger C. Pao)"; | ||
389 | #endif | ||
390 | |||
391 | static const char *if_names[]={ | 384 | static const char *if_names[]={ |
392 | "Auto", "10baseT", "BNC", | 385 | "Auto", "10baseT", "BNC", |
393 | }; | 386 | }; |
@@ -406,12 +399,6 @@ MODULE_LICENSE("GPL"); | |||
406 | /* 0=auto, 1=10baseT, 2 = 10base2, default=auto */ | 399 | /* 0=auto, 1=10baseT, 2 = 10base2, default=auto */ |
407 | INT_MODULE_PARM(if_port, 0); | 400 | INT_MODULE_PARM(if_port, 0); |
408 | 401 | ||
409 | #ifdef PCMCIA_DEBUG | ||
410 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | ||
411 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
412 | #else | ||
413 | #define DEBUG(n, args...) | ||
414 | #endif | ||
415 | 402 | ||
416 | /* ---------------------------------------------------------------------------- | 403 | /* ---------------------------------------------------------------------------- |
417 | Function Prototypes | 404 | Function Prototypes |
@@ -462,8 +449,7 @@ static int nmclan_probe(struct pcmcia_device *link) | |||
462 | mace_private *lp; | 449 | mace_private *lp; |
463 | struct net_device *dev; | 450 | struct net_device *dev; |
464 | 451 | ||
465 | DEBUG(0, "nmclan_attach()\n"); | 452 | dev_dbg(&link->dev, "nmclan_attach()\n"); |
466 | DEBUG(1, "%s\n", rcsid); | ||
467 | 453 | ||
468 | /* Create new ethernet device */ | 454 | /* Create new ethernet device */ |
469 | dev = alloc_etherdev(sizeof(mace_private)); | 455 | dev = alloc_etherdev(sizeof(mace_private)); |
@@ -477,10 +463,8 @@ static int nmclan_probe(struct pcmcia_device *link) | |||
477 | link->io.NumPorts1 = 32; | 463 | link->io.NumPorts1 = 32; |
478 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 464 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
479 | link->io.IOAddrLines = 5; | 465 | link->io.IOAddrLines = 5; |
480 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; | 466 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
481 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
482 | link->irq.Handler = &mace_interrupt; | 467 | link->irq.Handler = &mace_interrupt; |
483 | link->irq.Instance = dev; | ||
484 | link->conf.Attributes = CONF_ENABLE_IRQ; | 468 | link->conf.Attributes = CONF_ENABLE_IRQ; |
485 | link->conf.IntType = INT_MEMORY_AND_IO; | 469 | link->conf.IntType = INT_MEMORY_AND_IO; |
486 | link->conf.ConfigIndex = 1; | 470 | link->conf.ConfigIndex = 1; |
@@ -507,7 +491,7 @@ static void nmclan_detach(struct pcmcia_device *link) | |||
507 | { | 491 | { |
508 | struct net_device *dev = link->priv; | 492 | struct net_device *dev = link->priv; |
509 | 493 | ||
510 | DEBUG(0, "nmclan_detach(0x%p)\n", link); | 494 | dev_dbg(&link->dev, "nmclan_detach\n"); |
511 | 495 | ||
512 | if (link->dev_node) | 496 | if (link->dev_node) |
513 | unregister_netdev(dev); | 497 | unregister_netdev(dev); |
@@ -654,37 +638,40 @@ nmclan_config | |||
654 | ethernet device available to the system. | 638 | ethernet device available to the system. |
655 | ---------------------------------------------------------------------------- */ | 639 | ---------------------------------------------------------------------------- */ |
656 | 640 | ||
657 | #define CS_CHECK(fn, ret) \ | ||
658 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
659 | |||
660 | static int nmclan_config(struct pcmcia_device *link) | 641 | static int nmclan_config(struct pcmcia_device *link) |
661 | { | 642 | { |
662 | struct net_device *dev = link->priv; | 643 | struct net_device *dev = link->priv; |
663 | mace_private *lp = netdev_priv(dev); | 644 | mace_private *lp = netdev_priv(dev); |
664 | tuple_t tuple; | 645 | u8 *buf; |
665 | u_char buf[64]; | 646 | size_t len; |
666 | int i, last_ret, last_fn; | 647 | int i, ret; |
667 | unsigned int ioaddr; | 648 | unsigned int ioaddr; |
668 | 649 | ||
669 | DEBUG(0, "nmclan_config(0x%p)\n", link); | 650 | dev_dbg(&link->dev, "nmclan_config\n"); |
651 | |||
652 | ret = pcmcia_request_io(link, &link->io); | ||
653 | if (ret) | ||
654 | goto failed; | ||
655 | ret = pcmcia_request_irq(link, &link->irq); | ||
656 | if (ret) | ||
657 | goto failed; | ||
658 | ret = pcmcia_request_configuration(link, &link->conf); | ||
659 | if (ret) | ||
660 | goto failed; | ||
670 | 661 | ||
671 | CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); | ||
672 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | ||
673 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | ||
674 | dev->irq = link->irq.AssignedIRQ; | 662 | dev->irq = link->irq.AssignedIRQ; |
675 | dev->base_addr = link->io.BasePort1; | 663 | dev->base_addr = link->io.BasePort1; |
676 | 664 | ||
677 | ioaddr = dev->base_addr; | 665 | ioaddr = dev->base_addr; |
678 | 666 | ||
679 | /* Read the ethernet address from the CIS. */ | 667 | /* Read the ethernet address from the CIS. */ |
680 | tuple.DesiredTuple = 0x80 /* CISTPL_CFTABLE_ENTRY_MISC */; | 668 | len = pcmcia_get_tuple(link, 0x80, &buf); |
681 | tuple.TupleData = buf; | 669 | if (!buf || len < ETHER_ADDR_LEN) { |
682 | tuple.TupleDataMax = 64; | 670 | kfree(buf); |
683 | tuple.TupleOffset = 0; | 671 | goto failed; |
684 | tuple.Attributes = 0; | 672 | } |
685 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); | 673 | memcpy(dev->dev_addr, buf, ETHER_ADDR_LEN); |
686 | CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple)); | 674 | kfree(buf); |
687 | memcpy(dev->dev_addr, tuple.TupleData, ETHER_ADDR_LEN); | ||
688 | 675 | ||
689 | /* Verify configuration by reading the MACE ID. */ | 676 | /* Verify configuration by reading the MACE ID. */ |
690 | { | 677 | { |
@@ -693,7 +680,7 @@ static int nmclan_config(struct pcmcia_device *link) | |||
693 | sig[0] = mace_read(lp, ioaddr, MACE_CHIPIDL); | 680 | sig[0] = mace_read(lp, ioaddr, MACE_CHIPIDL); |
694 | sig[1] = mace_read(lp, ioaddr, MACE_CHIPIDH); | 681 | sig[1] = mace_read(lp, ioaddr, MACE_CHIPIDH); |
695 | if ((sig[0] == 0x40) && ((sig[1] & 0x0F) == 0x09)) { | 682 | if ((sig[0] == 0x40) && ((sig[1] & 0x0F) == 0x09)) { |
696 | DEBUG(0, "nmclan_cs configured: mace id=%x %x\n", | 683 | dev_dbg(&link->dev, "nmclan_cs configured: mace id=%x %x\n", |
697 | sig[0], sig[1]); | 684 | sig[0], sig[1]); |
698 | } else { | 685 | } else { |
699 | printk(KERN_NOTICE "nmclan_cs: mace id not found: %x %x should" | 686 | printk(KERN_NOTICE "nmclan_cs: mace id not found: %x %x should" |
@@ -712,7 +699,7 @@ static int nmclan_config(struct pcmcia_device *link) | |||
712 | printk(KERN_NOTICE "nmclan_cs: invalid if_port requested\n"); | 699 | printk(KERN_NOTICE "nmclan_cs: invalid if_port requested\n"); |
713 | 700 | ||
714 | link->dev_node = &lp->node; | 701 | link->dev_node = &lp->node; |
715 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 702 | SET_NETDEV_DEV(dev, &link->dev); |
716 | 703 | ||
717 | i = register_netdev(dev); | 704 | i = register_netdev(dev); |
718 | if (i != 0) { | 705 | if (i != 0) { |
@@ -729,8 +716,6 @@ static int nmclan_config(struct pcmcia_device *link) | |||
729 | dev->dev_addr); | 716 | dev->dev_addr); |
730 | return 0; | 717 | return 0; |
731 | 718 | ||
732 | cs_failed: | ||
733 | cs_error(link, last_fn, last_ret); | ||
734 | failed: | 719 | failed: |
735 | nmclan_release(link); | 720 | nmclan_release(link); |
736 | return -ENODEV; | 721 | return -ENODEV; |
@@ -744,7 +729,7 @@ nmclan_release | |||
744 | ---------------------------------------------------------------------------- */ | 729 | ---------------------------------------------------------------------------- */ |
745 | static void nmclan_release(struct pcmcia_device *link) | 730 | static void nmclan_release(struct pcmcia_device *link) |
746 | { | 731 | { |
747 | DEBUG(0, "nmclan_release(0x%p)\n", link); | 732 | dev_dbg(&link->dev, "nmclan_release\n"); |
748 | pcmcia_disable_device(link); | 733 | pcmcia_disable_device(link); |
749 | } | 734 | } |
750 | 735 | ||
@@ -795,7 +780,7 @@ static void nmclan_reset(struct net_device *dev) | |||
795 | /* Reset Xilinx */ | 780 | /* Reset Xilinx */ |
796 | reg.Action = CS_WRITE; | 781 | reg.Action = CS_WRITE; |
797 | reg.Offset = CISREG_COR; | 782 | reg.Offset = CISREG_COR; |
798 | DEBUG(1, "nmclan_reset: OrigCorValue=0x%lX, resetting...\n", | 783 | dev_dbg(&link->dev, "nmclan_reset: OrigCorValue=0x%lX, resetting...\n", |
799 | OrigCorValue); | 784 | OrigCorValue); |
800 | reg.Value = COR_SOFT_RESET; | 785 | reg.Value = COR_SOFT_RESET; |
801 | pcmcia_access_configuration_register(link, ®); | 786 | pcmcia_access_configuration_register(link, ®); |
@@ -872,7 +857,7 @@ static int mace_close(struct net_device *dev) | |||
872 | mace_private *lp = netdev_priv(dev); | 857 | mace_private *lp = netdev_priv(dev); |
873 | struct pcmcia_device *link = lp->p_dev; | 858 | struct pcmcia_device *link = lp->p_dev; |
874 | 859 | ||
875 | DEBUG(2, "%s: shutting down ethercard.\n", dev->name); | 860 | dev_dbg(&link->dev, "%s: shutting down ethercard.\n", dev->name); |
876 | 861 | ||
877 | /* Mask off all interrupts from the MACE chip. */ | 862 | /* Mask off all interrupts from the MACE chip. */ |
878 | outb(0xFF, ioaddr + AM2150_MACE_BASE + MACE_IMR); | 863 | outb(0xFF, ioaddr + AM2150_MACE_BASE + MACE_IMR); |
@@ -891,24 +876,8 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
891 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); | 876 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); |
892 | } | 877 | } |
893 | 878 | ||
894 | #ifdef PCMCIA_DEBUG | ||
895 | static u32 netdev_get_msglevel(struct net_device *dev) | ||
896 | { | ||
897 | return pc_debug; | ||
898 | } | ||
899 | |||
900 | static void netdev_set_msglevel(struct net_device *dev, u32 level) | ||
901 | { | ||
902 | pc_debug = level; | ||
903 | } | ||
904 | #endif /* PCMCIA_DEBUG */ | ||
905 | |||
906 | static const struct ethtool_ops netdev_ethtool_ops = { | 879 | static const struct ethtool_ops netdev_ethtool_ops = { |
907 | .get_drvinfo = netdev_get_drvinfo, | 880 | .get_drvinfo = netdev_get_drvinfo, |
908 | #ifdef PCMCIA_DEBUG | ||
909 | .get_msglevel = netdev_get_msglevel, | ||
910 | .set_msglevel = netdev_set_msglevel, | ||
911 | #endif /* PCMCIA_DEBUG */ | ||
912 | }; | 881 | }; |
913 | 882 | ||
914 | /* ---------------------------------------------------------------------------- | 883 | /* ---------------------------------------------------------------------------- |
@@ -946,7 +915,7 @@ static netdev_tx_t mace_start_xmit(struct sk_buff *skb, | |||
946 | 915 | ||
947 | netif_stop_queue(dev); | 916 | netif_stop_queue(dev); |
948 | 917 | ||
949 | DEBUG(3, "%s: mace_start_xmit(length = %ld) called.\n", | 918 | pr_debug("%s: mace_start_xmit(length = %ld) called.\n", |
950 | dev->name, (long)skb->len); | 919 | dev->name, (long)skb->len); |
951 | 920 | ||
952 | #if (!TX_INTERRUPTABLE) | 921 | #if (!TX_INTERRUPTABLE) |
@@ -1008,7 +977,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) | |||
1008 | int IntrCnt = MACE_MAX_IR_ITERATIONS; | 977 | int IntrCnt = MACE_MAX_IR_ITERATIONS; |
1009 | 978 | ||
1010 | if (dev == NULL) { | 979 | if (dev == NULL) { |
1011 | DEBUG(2, "mace_interrupt(): irq 0x%X for unknown device.\n", | 980 | pr_debug("mace_interrupt(): irq 0x%X for unknown device.\n", |
1012 | irq); | 981 | irq); |
1013 | return IRQ_NONE; | 982 | return IRQ_NONE; |
1014 | } | 983 | } |
@@ -1031,7 +1000,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) | |||
1031 | } | 1000 | } |
1032 | 1001 | ||
1033 | if (!netif_device_present(dev)) { | 1002 | if (!netif_device_present(dev)) { |
1034 | DEBUG(2, "%s: interrupt from dead card\n", dev->name); | 1003 | pr_debug("%s: interrupt from dead card\n", dev->name); |
1035 | return IRQ_NONE; | 1004 | return IRQ_NONE; |
1036 | } | 1005 | } |
1037 | 1006 | ||
@@ -1039,7 +1008,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) | |||
1039 | /* WARNING: MACE_IR is a READ/CLEAR port! */ | 1008 | /* WARNING: MACE_IR is a READ/CLEAR port! */ |
1040 | status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR); | 1009 | status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR); |
1041 | 1010 | ||
1042 | DEBUG(3, "mace_interrupt: irq 0x%X status 0x%X.\n", irq, status); | 1011 | pr_debug("mace_interrupt: irq 0x%X status 0x%X.\n", irq, status); |
1043 | 1012 | ||
1044 | if (status & MACE_IR_RCVINT) { | 1013 | if (status & MACE_IR_RCVINT) { |
1045 | mace_rx(dev, MACE_MAX_RX_ITERATIONS); | 1014 | mace_rx(dev, MACE_MAX_RX_ITERATIONS); |
@@ -1158,7 +1127,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt) | |||
1158 | ) { | 1127 | ) { |
1159 | rx_status = inw(ioaddr + AM2150_RCV); | 1128 | rx_status = inw(ioaddr + AM2150_RCV); |
1160 | 1129 | ||
1161 | DEBUG(3, "%s: in mace_rx(), framecnt 0x%X, rx_status" | 1130 | pr_debug("%s: in mace_rx(), framecnt 0x%X, rx_status" |
1162 | " 0x%X.\n", dev->name, rx_framecnt, rx_status); | 1131 | " 0x%X.\n", dev->name, rx_framecnt, rx_status); |
1163 | 1132 | ||
1164 | if (rx_status & MACE_RCVFS_RCVSTS) { /* Error, update stats. */ | 1133 | if (rx_status & MACE_RCVFS_RCVSTS) { /* Error, update stats. */ |
@@ -1185,7 +1154,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt) | |||
1185 | lp->mace_stats.rfs_rcvcc += inb(ioaddr + AM2150_RCV); | 1154 | lp->mace_stats.rfs_rcvcc += inb(ioaddr + AM2150_RCV); |
1186 | /* rcv collision count */ | 1155 | /* rcv collision count */ |
1187 | 1156 | ||
1188 | DEBUG(3, " receiving packet size 0x%X rx_status" | 1157 | pr_debug(" receiving packet size 0x%X rx_status" |
1189 | " 0x%X.\n", pkt_len, rx_status); | 1158 | " 0x%X.\n", pkt_len, rx_status); |
1190 | 1159 | ||
1191 | skb = dev_alloc_skb(pkt_len+2); | 1160 | skb = dev_alloc_skb(pkt_len+2); |
@@ -1204,7 +1173,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt) | |||
1204 | outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */ | 1173 | outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */ |
1205 | continue; | 1174 | continue; |
1206 | } else { | 1175 | } else { |
1207 | DEBUG(1, "%s: couldn't allocate a sk_buff of size" | 1176 | pr_debug("%s: couldn't allocate a sk_buff of size" |
1208 | " %d.\n", dev->name, pkt_len); | 1177 | " %d.\n", dev->name, pkt_len); |
1209 | lp->linux_stats.rx_dropped++; | 1178 | lp->linux_stats.rx_dropped++; |
1210 | } | 1179 | } |
@@ -1220,28 +1189,28 @@ pr_linux_stats | |||
1220 | ---------------------------------------------------------------------------- */ | 1189 | ---------------------------------------------------------------------------- */ |
1221 | static void pr_linux_stats(struct net_device_stats *pstats) | 1190 | static void pr_linux_stats(struct net_device_stats *pstats) |
1222 | { | 1191 | { |
1223 | DEBUG(2, "pr_linux_stats\n"); | 1192 | pr_debug("pr_linux_stats\n"); |
1224 | DEBUG(2, " rx_packets=%-7ld tx_packets=%ld\n", | 1193 | pr_debug(" rx_packets=%-7ld tx_packets=%ld\n", |
1225 | (long)pstats->rx_packets, (long)pstats->tx_packets); | 1194 | (long)pstats->rx_packets, (long)pstats->tx_packets); |
1226 | DEBUG(2, " rx_errors=%-7ld tx_errors=%ld\n", | 1195 | pr_debug(" rx_errors=%-7ld tx_errors=%ld\n", |
1227 | (long)pstats->rx_errors, (long)pstats->tx_errors); | 1196 | (long)pstats->rx_errors, (long)pstats->tx_errors); |
1228 | DEBUG(2, " rx_dropped=%-7ld tx_dropped=%ld\n", | 1197 | pr_debug(" rx_dropped=%-7ld tx_dropped=%ld\n", |
1229 | (long)pstats->rx_dropped, (long)pstats->tx_dropped); | 1198 | (long)pstats->rx_dropped, (long)pstats->tx_dropped); |
1230 | DEBUG(2, " multicast=%-7ld collisions=%ld\n", | 1199 | pr_debug(" multicast=%-7ld collisions=%ld\n", |
1231 | (long)pstats->multicast, (long)pstats->collisions); | 1200 | (long)pstats->multicast, (long)pstats->collisions); |
1232 | 1201 | ||
1233 | DEBUG(2, " rx_length_errors=%-7ld rx_over_errors=%ld\n", | 1202 | pr_debug(" rx_length_errors=%-7ld rx_over_errors=%ld\n", |
1234 | (long)pstats->rx_length_errors, (long)pstats->rx_over_errors); | 1203 | (long)pstats->rx_length_errors, (long)pstats->rx_over_errors); |
1235 | DEBUG(2, " rx_crc_errors=%-7ld rx_frame_errors=%ld\n", | 1204 | pr_debug(" rx_crc_errors=%-7ld rx_frame_errors=%ld\n", |
1236 | (long)pstats->rx_crc_errors, (long)pstats->rx_frame_errors); | 1205 | (long)pstats->rx_crc_errors, (long)pstats->rx_frame_errors); |
1237 | DEBUG(2, " rx_fifo_errors=%-7ld rx_missed_errors=%ld\n", | 1206 | pr_debug(" rx_fifo_errors=%-7ld rx_missed_errors=%ld\n", |
1238 | (long)pstats->rx_fifo_errors, (long)pstats->rx_missed_errors); | 1207 | (long)pstats->rx_fifo_errors, (long)pstats->rx_missed_errors); |
1239 | 1208 | ||
1240 | DEBUG(2, " tx_aborted_errors=%-7ld tx_carrier_errors=%ld\n", | 1209 | pr_debug(" tx_aborted_errors=%-7ld tx_carrier_errors=%ld\n", |
1241 | (long)pstats->tx_aborted_errors, (long)pstats->tx_carrier_errors); | 1210 | (long)pstats->tx_aborted_errors, (long)pstats->tx_carrier_errors); |
1242 | DEBUG(2, " tx_fifo_errors=%-7ld tx_heartbeat_errors=%ld\n", | 1211 | pr_debug(" tx_fifo_errors=%-7ld tx_heartbeat_errors=%ld\n", |
1243 | (long)pstats->tx_fifo_errors, (long)pstats->tx_heartbeat_errors); | 1212 | (long)pstats->tx_fifo_errors, (long)pstats->tx_heartbeat_errors); |
1244 | DEBUG(2, " tx_window_errors=%ld\n", | 1213 | pr_debug(" tx_window_errors=%ld\n", |
1245 | (long)pstats->tx_window_errors); | 1214 | (long)pstats->tx_window_errors); |
1246 | } /* pr_linux_stats */ | 1215 | } /* pr_linux_stats */ |
1247 | 1216 | ||
@@ -1250,48 +1219,48 @@ pr_mace_stats | |||
1250 | ---------------------------------------------------------------------------- */ | 1219 | ---------------------------------------------------------------------------- */ |
1251 | static void pr_mace_stats(mace_statistics *pstats) | 1220 | static void pr_mace_stats(mace_statistics *pstats) |
1252 | { | 1221 | { |
1253 | DEBUG(2, "pr_mace_stats\n"); | 1222 | pr_debug("pr_mace_stats\n"); |
1254 | 1223 | ||
1255 | DEBUG(2, " xmtsv=%-7d uflo=%d\n", | 1224 | pr_debug(" xmtsv=%-7d uflo=%d\n", |
1256 | pstats->xmtsv, pstats->uflo); | 1225 | pstats->xmtsv, pstats->uflo); |
1257 | DEBUG(2, " lcol=%-7d more=%d\n", | 1226 | pr_debug(" lcol=%-7d more=%d\n", |
1258 | pstats->lcol, pstats->more); | 1227 | pstats->lcol, pstats->more); |
1259 | DEBUG(2, " one=%-7d defer=%d\n", | 1228 | pr_debug(" one=%-7d defer=%d\n", |
1260 | pstats->one, pstats->defer); | 1229 | pstats->one, pstats->defer); |
1261 | DEBUG(2, " lcar=%-7d rtry=%d\n", | 1230 | pr_debug(" lcar=%-7d rtry=%d\n", |
1262 | pstats->lcar, pstats->rtry); | 1231 | pstats->lcar, pstats->rtry); |
1263 | 1232 | ||
1264 | /* MACE_XMTRC */ | 1233 | /* MACE_XMTRC */ |
1265 | DEBUG(2, " exdef=%-7d xmtrc=%d\n", | 1234 | pr_debug(" exdef=%-7d xmtrc=%d\n", |
1266 | pstats->exdef, pstats->xmtrc); | 1235 | pstats->exdef, pstats->xmtrc); |
1267 | 1236 | ||
1268 | /* RFS1--Receive Status (RCVSTS) */ | 1237 | /* RFS1--Receive Status (RCVSTS) */ |
1269 | DEBUG(2, " oflo=%-7d clsn=%d\n", | 1238 | pr_debug(" oflo=%-7d clsn=%d\n", |
1270 | pstats->oflo, pstats->clsn); | 1239 | pstats->oflo, pstats->clsn); |
1271 | DEBUG(2, " fram=%-7d fcs=%d\n", | 1240 | pr_debug(" fram=%-7d fcs=%d\n", |
1272 | pstats->fram, pstats->fcs); | 1241 | pstats->fram, pstats->fcs); |
1273 | 1242 | ||
1274 | /* RFS2--Runt Packet Count (RNTPC) */ | 1243 | /* RFS2--Runt Packet Count (RNTPC) */ |
1275 | /* RFS3--Receive Collision Count (RCVCC) */ | 1244 | /* RFS3--Receive Collision Count (RCVCC) */ |
1276 | DEBUG(2, " rfs_rntpc=%-7d rfs_rcvcc=%d\n", | 1245 | pr_debug(" rfs_rntpc=%-7d rfs_rcvcc=%d\n", |
1277 | pstats->rfs_rntpc, pstats->rfs_rcvcc); | 1246 | pstats->rfs_rntpc, pstats->rfs_rcvcc); |
1278 | 1247 | ||
1279 | /* MACE_IR */ | 1248 | /* MACE_IR */ |
1280 | DEBUG(2, " jab=%-7d babl=%d\n", | 1249 | pr_debug(" jab=%-7d babl=%d\n", |
1281 | pstats->jab, pstats->babl); | 1250 | pstats->jab, pstats->babl); |
1282 | DEBUG(2, " cerr=%-7d rcvcco=%d\n", | 1251 | pr_debug(" cerr=%-7d rcvcco=%d\n", |
1283 | pstats->cerr, pstats->rcvcco); | 1252 | pstats->cerr, pstats->rcvcco); |
1284 | DEBUG(2, " rntpco=%-7d mpco=%d\n", | 1253 | pr_debug(" rntpco=%-7d mpco=%d\n", |
1285 | pstats->rntpco, pstats->mpco); | 1254 | pstats->rntpco, pstats->mpco); |
1286 | 1255 | ||
1287 | /* MACE_MPC */ | 1256 | /* MACE_MPC */ |
1288 | DEBUG(2, " mpc=%d\n", pstats->mpc); | 1257 | pr_debug(" mpc=%d\n", pstats->mpc); |
1289 | 1258 | ||
1290 | /* MACE_RNTPC */ | 1259 | /* MACE_RNTPC */ |
1291 | DEBUG(2, " rntpc=%d\n", pstats->rntpc); | 1260 | pr_debug(" rntpc=%d\n", pstats->rntpc); |
1292 | 1261 | ||
1293 | /* MACE_RCVCC */ | 1262 | /* MACE_RCVCC */ |
1294 | DEBUG(2, " rcvcc=%d\n", pstats->rcvcc); | 1263 | pr_debug(" rcvcc=%d\n", pstats->rcvcc); |
1295 | 1264 | ||
1296 | } /* pr_mace_stats */ | 1265 | } /* pr_mace_stats */ |
1297 | 1266 | ||
@@ -1360,7 +1329,7 @@ static struct net_device_stats *mace_get_stats(struct net_device *dev) | |||
1360 | 1329 | ||
1361 | update_stats(dev->base_addr, dev); | 1330 | update_stats(dev->base_addr, dev); |
1362 | 1331 | ||
1363 | DEBUG(1, "%s: updating the statistics.\n", dev->name); | 1332 | pr_debug("%s: updating the statistics.\n", dev->name); |
1364 | pr_linux_stats(&lp->linux_stats); | 1333 | pr_linux_stats(&lp->linux_stats); |
1365 | pr_mace_stats(&lp->mace_stats); | 1334 | pr_mace_stats(&lp->mace_stats); |
1366 | 1335 | ||
@@ -1427,7 +1396,7 @@ static void BuildLAF(int *ladrf, int *adr) | |||
1427 | ladrf[byte] |= (1 << (hashcode & 7)); | 1396 | ladrf[byte] |= (1 << (hashcode & 7)); |
1428 | 1397 | ||
1429 | #ifdef PCMCIA_DEBUG | 1398 | #ifdef PCMCIA_DEBUG |
1430 | if (pc_debug > 2) | 1399 | if (0) |
1431 | printk(KERN_DEBUG " adr =%pM\n", adr); | 1400 | printk(KERN_DEBUG " adr =%pM\n", adr); |
1432 | printk(KERN_DEBUG " hashcode = %d(decimal), ladrf[0:63] =", hashcode); | 1401 | printk(KERN_DEBUG " hashcode = %d(decimal), ladrf[0:63] =", hashcode); |
1433 | for (i = 0; i < 8; i++) | 1402 | for (i = 0; i < 8; i++) |
@@ -1454,12 +1423,12 @@ static void restore_multicast_list(struct net_device *dev) | |||
1454 | unsigned int ioaddr = dev->base_addr; | 1423 | unsigned int ioaddr = dev->base_addr; |
1455 | int i; | 1424 | int i; |
1456 | 1425 | ||
1457 | DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", | 1426 | pr_debug("%s: restoring Rx mode to %d addresses.\n", |
1458 | dev->name, num_addrs); | 1427 | dev->name, num_addrs); |
1459 | 1428 | ||
1460 | if (num_addrs > 0) { | 1429 | if (num_addrs > 0) { |
1461 | 1430 | ||
1462 | DEBUG(1, "Attempt to restore multicast list detected.\n"); | 1431 | pr_debug("Attempt to restore multicast list detected.\n"); |
1463 | 1432 | ||
1464 | mace_write(lp, ioaddr, MACE_IAC, MACE_IAC_ADDRCHG | MACE_IAC_LOGADDR); | 1433 | mace_write(lp, ioaddr, MACE_IAC, MACE_IAC_ADDRCHG | MACE_IAC_LOGADDR); |
1465 | /* Poll ADDRCHG bit */ | 1434 | /* Poll ADDRCHG bit */ |
@@ -1511,11 +1480,11 @@ static void set_multicast_list(struct net_device *dev) | |||
1511 | struct dev_mc_list *dmi = dev->mc_list; | 1480 | struct dev_mc_list *dmi = dev->mc_list; |
1512 | 1481 | ||
1513 | #ifdef PCMCIA_DEBUG | 1482 | #ifdef PCMCIA_DEBUG |
1514 | if (pc_debug > 1) { | 1483 | { |
1515 | static int old; | 1484 | static int old; |
1516 | if (dev->mc_count != old) { | 1485 | if (dev->mc_count != old) { |
1517 | old = dev->mc_count; | 1486 | old = dev->mc_count; |
1518 | DEBUG(0, "%s: setting Rx mode to %d addresses.\n", | 1487 | pr_debug("%s: setting Rx mode to %d addresses.\n", |
1519 | dev->name, old); | 1488 | dev->name, old); |
1520 | } | 1489 | } |
1521 | } | 1490 | } |
@@ -1546,7 +1515,7 @@ static void restore_multicast_list(struct net_device *dev) | |||
1546 | unsigned int ioaddr = dev->base_addr; | 1515 | unsigned int ioaddr = dev->base_addr; |
1547 | mace_private *lp = netdev_priv(dev); | 1516 | mace_private *lp = netdev_priv(dev); |
1548 | 1517 | ||
1549 | DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", dev->name, | 1518 | pr_debug("%s: restoring Rx mode to %d addresses.\n", dev->name, |
1550 | lp->multicast_num_addrs); | 1519 | lp->multicast_num_addrs); |
1551 | 1520 | ||
1552 | if (dev->flags & IFF_PROMISC) { | 1521 | if (dev->flags & IFF_PROMISC) { |
@@ -1567,11 +1536,11 @@ static void set_multicast_list(struct net_device *dev) | |||
1567 | mace_private *lp = netdev_priv(dev); | 1536 | mace_private *lp = netdev_priv(dev); |
1568 | 1537 | ||
1569 | #ifdef PCMCIA_DEBUG | 1538 | #ifdef PCMCIA_DEBUG |
1570 | if (pc_debug > 1) { | 1539 | { |
1571 | static int old; | 1540 | static int old; |
1572 | if (dev->mc_count != old) { | 1541 | if (dev->mc_count != old) { |
1573 | old = dev->mc_count; | 1542 | old = dev->mc_count; |
1574 | DEBUG(0, "%s: setting Rx mode to %d addresses.\n", | 1543 | pr_debug("%s: setting Rx mode to %d addresses.\n", |
1575 | dev->name, old); | 1544 | dev->name, old); |
1576 | } | 1545 | } |
1577 | } | 1546 | } |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 94c9ad2746bc..cbe462ed221f 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -71,15 +71,6 @@ | |||
71 | 71 | ||
72 | static const char *if_names[] = { "auto", "10baseT", "10base2"}; | 72 | static const char *if_names[] = { "auto", "10baseT", "10base2"}; |
73 | 73 | ||
74 | #ifdef PCMCIA_DEBUG | ||
75 | static int pc_debug = PCMCIA_DEBUG; | ||
76 | module_param(pc_debug, int, 0); | ||
77 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
78 | static char *version = | ||
79 | "pcnet_cs.c 1.153 2003/11/09 18:53:09 (David Hinds)"; | ||
80 | #else | ||
81 | #define DEBUG(n, args...) | ||
82 | #endif | ||
83 | 74 | ||
84 | /*====================================================================*/ | 75 | /*====================================================================*/ |
85 | 76 | ||
@@ -265,7 +256,7 @@ static int pcnet_probe(struct pcmcia_device *link) | |||
265 | pcnet_dev_t *info; | 256 | pcnet_dev_t *info; |
266 | struct net_device *dev; | 257 | struct net_device *dev; |
267 | 258 | ||
268 | DEBUG(0, "pcnet_attach()\n"); | 259 | dev_dbg(&link->dev, "pcnet_attach()\n"); |
269 | 260 | ||
270 | /* Create new ethernet device */ | 261 | /* Create new ethernet device */ |
271 | dev = __alloc_ei_netdev(sizeof(pcnet_dev_t)); | 262 | dev = __alloc_ei_netdev(sizeof(pcnet_dev_t)); |
@@ -275,7 +266,6 @@ static int pcnet_probe(struct pcmcia_device *link) | |||
275 | link->priv = dev; | 266 | link->priv = dev; |
276 | 267 | ||
277 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 268 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
278 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
279 | link->conf.Attributes = CONF_ENABLE_IRQ; | 269 | link->conf.Attributes = CONF_ENABLE_IRQ; |
280 | link->conf.IntType = INT_MEMORY_AND_IO; | 270 | link->conf.IntType = INT_MEMORY_AND_IO; |
281 | 271 | ||
@@ -297,7 +287,7 @@ static void pcnet_detach(struct pcmcia_device *link) | |||
297 | { | 287 | { |
298 | struct net_device *dev = link->priv; | 288 | struct net_device *dev = link->priv; |
299 | 289 | ||
300 | DEBUG(0, "pcnet_detach(0x%p)\n", link); | 290 | dev_dbg(&link->dev, "pcnet_detach\n"); |
301 | 291 | ||
302 | if (link->dev_node) | 292 | if (link->dev_node) |
303 | unregister_netdev(dev); | 293 | unregister_netdev(dev); |
@@ -326,17 +316,15 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link) | |||
326 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 316 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
327 | req.Base = 0; req.Size = 0; | 317 | req.Base = 0; req.Size = 0; |
328 | req.AccessSpeed = 0; | 318 | req.AccessSpeed = 0; |
329 | i = pcmcia_request_window(&link, &req, &link->win); | 319 | i = pcmcia_request_window(link, &req, &link->win); |
330 | if (i != 0) { | 320 | if (i != 0) |
331 | cs_error(link, RequestWindow, i); | ||
332 | return NULL; | 321 | return NULL; |
333 | } | ||
334 | 322 | ||
335 | virt = ioremap(req.Base, req.Size); | 323 | virt = ioremap(req.Base, req.Size); |
336 | mem.Page = 0; | 324 | mem.Page = 0; |
337 | for (i = 0; i < NR_INFO; i++) { | 325 | for (i = 0; i < NR_INFO; i++) { |
338 | mem.CardOffset = hw_info[i].offset & ~(req.Size-1); | 326 | mem.CardOffset = hw_info[i].offset & ~(req.Size-1); |
339 | pcmcia_map_mem_page(link->win, &mem); | 327 | pcmcia_map_mem_page(link, link->win, &mem); |
340 | base = &virt[hw_info[i].offset & (req.Size-1)]; | 328 | base = &virt[hw_info[i].offset & (req.Size-1)]; |
341 | if ((readb(base+0) == hw_info[i].a0) && | 329 | if ((readb(base+0) == hw_info[i].a0) && |
342 | (readb(base+2) == hw_info[i].a1) && | 330 | (readb(base+2) == hw_info[i].a1) && |
@@ -348,9 +336,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link) | |||
348 | } | 336 | } |
349 | 337 | ||
350 | iounmap(virt); | 338 | iounmap(virt); |
351 | j = pcmcia_release_window(link->win); | 339 | j = pcmcia_release_window(link, link->win); |
352 | if (j != 0) | ||
353 | cs_error(link, ReleaseWindow, j); | ||
354 | return (i < NR_INFO) ? hw_info+i : NULL; | 340 | return (i < NR_INFO) ? hw_info+i : NULL; |
355 | } /* get_hwinfo */ | 341 | } /* get_hwinfo */ |
356 | 342 | ||
@@ -495,9 +481,6 @@ static hw_info_t *get_hwired(struct pcmcia_device *link) | |||
495 | 481 | ||
496 | ======================================================================*/ | 482 | ======================================================================*/ |
497 | 483 | ||
498 | #define CS_CHECK(fn, ret) \ | ||
499 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
500 | |||
501 | static int try_io_port(struct pcmcia_device *link) | 484 | static int try_io_port(struct pcmcia_device *link) |
502 | { | 485 | { |
503 | int j, ret; | 486 | int j, ret; |
@@ -567,19 +550,19 @@ static int pcnet_config(struct pcmcia_device *link) | |||
567 | { | 550 | { |
568 | struct net_device *dev = link->priv; | 551 | struct net_device *dev = link->priv; |
569 | pcnet_dev_t *info = PRIV(dev); | 552 | pcnet_dev_t *info = PRIV(dev); |
570 | int last_ret, last_fn, start_pg, stop_pg, cm_offset; | 553 | int ret, start_pg, stop_pg, cm_offset; |
571 | int has_shmem = 0; | 554 | int has_shmem = 0; |
572 | hw_info_t *local_hw_info; | 555 | hw_info_t *local_hw_info; |
573 | 556 | ||
574 | DEBUG(0, "pcnet_config(0x%p)\n", link); | 557 | dev_dbg(&link->dev, "pcnet_config\n"); |
575 | 558 | ||
576 | last_ret = pcmcia_loop_config(link, pcnet_confcheck, &has_shmem); | 559 | ret = pcmcia_loop_config(link, pcnet_confcheck, &has_shmem); |
577 | if (last_ret) { | 560 | if (ret) |
578 | cs_error(link, RequestIO, last_ret); | ||
579 | goto failed; | 561 | goto failed; |
580 | } | ||
581 | 562 | ||
582 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 563 | ret = pcmcia_request_irq(link, &link->irq); |
564 | if (ret) | ||
565 | goto failed; | ||
583 | 566 | ||
584 | if (link->io.NumPorts2 == 8) { | 567 | if (link->io.NumPorts2 == 8) { |
585 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 568 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
@@ -589,7 +572,9 @@ static int pcnet_config(struct pcmcia_device *link) | |||
589 | (link->card_id == PRODID_IBM_HOME_AND_AWAY)) | 572 | (link->card_id == PRODID_IBM_HOME_AND_AWAY)) |
590 | link->conf.ConfigIndex |= 0x10; | 573 | link->conf.ConfigIndex |= 0x10; |
591 | 574 | ||
592 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 575 | ret = pcmcia_request_configuration(link, &link->conf); |
576 | if (ret) | ||
577 | goto failed; | ||
593 | dev->irq = link->irq.AssignedIRQ; | 578 | dev->irq = link->irq.AssignedIRQ; |
594 | dev->base_addr = link->io.BasePort1; | 579 | dev->base_addr = link->io.BasePort1; |
595 | if (info->flags & HAS_MISC_REG) { | 580 | if (info->flags & HAS_MISC_REG) { |
@@ -660,7 +645,7 @@ static int pcnet_config(struct pcmcia_device *link) | |||
660 | mii_phy_probe(dev); | 645 | mii_phy_probe(dev); |
661 | 646 | ||
662 | link->dev_node = &info->node; | 647 | link->dev_node = &info->node; |
663 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 648 | SET_NETDEV_DEV(dev, &link->dev); |
664 | 649 | ||
665 | if (register_netdev(dev) != 0) { | 650 | if (register_netdev(dev) != 0) { |
666 | printk(KERN_NOTICE "pcnet_cs: register_netdev() failed\n"); | 651 | printk(KERN_NOTICE "pcnet_cs: register_netdev() failed\n"); |
@@ -687,8 +672,6 @@ static int pcnet_config(struct pcmcia_device *link) | |||
687 | printk(" hw_addr %pM\n", dev->dev_addr); | 672 | printk(" hw_addr %pM\n", dev->dev_addr); |
688 | return 0; | 673 | return 0; |
689 | 674 | ||
690 | cs_failed: | ||
691 | cs_error(link, last_fn, last_ret); | ||
692 | failed: | 675 | failed: |
693 | pcnet_release(link); | 676 | pcnet_release(link); |
694 | return -ENODEV; | 677 | return -ENODEV; |
@@ -706,7 +689,7 @@ static void pcnet_release(struct pcmcia_device *link) | |||
706 | { | 689 | { |
707 | pcnet_dev_t *info = PRIV(link->priv); | 690 | pcnet_dev_t *info = PRIV(link->priv); |
708 | 691 | ||
709 | DEBUG(0, "pcnet_release(0x%p)\n", link); | 692 | dev_dbg(&link->dev, "pcnet_release\n"); |
710 | 693 | ||
711 | if (info->flags & USE_SHMEM) | 694 | if (info->flags & USE_SHMEM) |
712 | iounmap(info->base); | 695 | iounmap(info->base); |
@@ -960,7 +943,7 @@ static void mii_phy_probe(struct net_device *dev) | |||
960 | phyid = tmp << 16; | 943 | phyid = tmp << 16; |
961 | phyid |= mdio_read(mii_addr, i, MII_PHYID_REG2); | 944 | phyid |= mdio_read(mii_addr, i, MII_PHYID_REG2); |
962 | phyid &= MII_PHYID_REV_MASK; | 945 | phyid &= MII_PHYID_REV_MASK; |
963 | DEBUG(0, "%s: MII at %d is 0x%08x\n", dev->name, i, phyid); | 946 | pr_debug("%s: MII at %d is 0x%08x\n", dev->name, i, phyid); |
964 | if (phyid == AM79C9XX_HOME_PHY) { | 947 | if (phyid == AM79C9XX_HOME_PHY) { |
965 | info->pna_phy = i; | 948 | info->pna_phy = i; |
966 | } else if (phyid != AM79C9XX_ETH_PHY) { | 949 | } else if (phyid != AM79C9XX_ETH_PHY) { |
@@ -976,7 +959,7 @@ static int pcnet_open(struct net_device *dev) | |||
976 | struct pcmcia_device *link = info->p_dev; | 959 | struct pcmcia_device *link = info->p_dev; |
977 | unsigned int nic_base = dev->base_addr; | 960 | unsigned int nic_base = dev->base_addr; |
978 | 961 | ||
979 | DEBUG(2, "pcnet_open('%s')\n", dev->name); | 962 | dev_dbg(&link->dev, "pcnet_open('%s')\n", dev->name); |
980 | 963 | ||
981 | if (!pcmcia_dev_present(link)) | 964 | if (!pcmcia_dev_present(link)) |
982 | return -ENODEV; | 965 | return -ENODEV; |
@@ -1008,7 +991,7 @@ static int pcnet_close(struct net_device *dev) | |||
1008 | pcnet_dev_t *info = PRIV(dev); | 991 | pcnet_dev_t *info = PRIV(dev); |
1009 | struct pcmcia_device *link = info->p_dev; | 992 | struct pcmcia_device *link = info->p_dev; |
1010 | 993 | ||
1011 | DEBUG(2, "pcnet_close('%s')\n", dev->name); | 994 | dev_dbg(&link->dev, "pcnet_close('%s')\n", dev->name); |
1012 | 995 | ||
1013 | ei_close(dev); | 996 | ei_close(dev); |
1014 | free_irq(dev->irq, dev); | 997 | free_irq(dev->irq, dev); |
@@ -1251,10 +1234,8 @@ static void dma_block_input(struct net_device *dev, int count, | |||
1251 | int xfer_count = count; | 1234 | int xfer_count = count; |
1252 | char *buf = skb->data; | 1235 | char *buf = skb->data; |
1253 | 1236 | ||
1254 | #ifdef PCMCIA_DEBUG | ||
1255 | if ((ei_debug > 4) && (count != 4)) | 1237 | if ((ei_debug > 4) && (count != 4)) |
1256 | printk(KERN_DEBUG "%s: [bi=%d]\n", dev->name, count+4); | 1238 | pr_debug("%s: [bi=%d]\n", dev->name, count+4); |
1257 | #endif | ||
1258 | if (ei_status.dmaing) { | 1239 | if (ei_status.dmaing) { |
1259 | printk(KERN_NOTICE "%s: DMAing conflict in dma_block_input." | 1240 | printk(KERN_NOTICE "%s: DMAing conflict in dma_block_input." |
1260 | "[DMAstat:%1x][irqlock:%1x]\n", | 1241 | "[DMAstat:%1x][irqlock:%1x]\n", |
@@ -1495,7 +1476,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, | |||
1495 | pcnet_dev_t *info = PRIV(dev); | 1476 | pcnet_dev_t *info = PRIV(dev); |
1496 | win_req_t req; | 1477 | win_req_t req; |
1497 | memreq_t mem; | 1478 | memreq_t mem; |
1498 | int i, window_size, offset, last_ret, last_fn; | 1479 | int i, window_size, offset, ret; |
1499 | 1480 | ||
1500 | window_size = (stop_pg - start_pg) << 8; | 1481 | window_size = (stop_pg - start_pg) << 8; |
1501 | if (window_size > 32 * 1024) | 1482 | if (window_size > 32 * 1024) |
@@ -1509,13 +1490,17 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, | |||
1509 | req.Attributes |= WIN_USE_WAIT; | 1490 | req.Attributes |= WIN_USE_WAIT; |
1510 | req.Base = 0; req.Size = window_size; | 1491 | req.Base = 0; req.Size = window_size; |
1511 | req.AccessSpeed = mem_speed; | 1492 | req.AccessSpeed = mem_speed; |
1512 | CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win)); | 1493 | ret = pcmcia_request_window(link, &req, &link->win); |
1494 | if (ret) | ||
1495 | goto failed; | ||
1513 | 1496 | ||
1514 | mem.CardOffset = (start_pg << 8) + cm_offset; | 1497 | mem.CardOffset = (start_pg << 8) + cm_offset; |
1515 | offset = mem.CardOffset % window_size; | 1498 | offset = mem.CardOffset % window_size; |
1516 | mem.CardOffset -= offset; | 1499 | mem.CardOffset -= offset; |
1517 | mem.Page = 0; | 1500 | mem.Page = 0; |
1518 | CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem)); | 1501 | ret = pcmcia_map_mem_page(link, link->win, &mem); |
1502 | if (ret) | ||
1503 | goto failed; | ||
1519 | 1504 | ||
1520 | /* Try scribbling on the buffer */ | 1505 | /* Try scribbling on the buffer */ |
1521 | info->base = ioremap(req.Base, window_size); | 1506 | info->base = ioremap(req.Base, window_size); |
@@ -1527,8 +1512,8 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, | |||
1527 | pcnet_reset_8390(dev); | 1512 | pcnet_reset_8390(dev); |
1528 | if (i != (TX_PAGES<<8)) { | 1513 | if (i != (TX_PAGES<<8)) { |
1529 | iounmap(info->base); | 1514 | iounmap(info->base); |
1530 | pcmcia_release_window(link->win); | 1515 | pcmcia_release_window(link, link->win); |
1531 | info->base = NULL; link->win = NULL; | 1516 | info->base = NULL; link->win = 0; |
1532 | goto failed; | 1517 | goto failed; |
1533 | } | 1518 | } |
1534 | 1519 | ||
@@ -1549,8 +1534,6 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, | |||
1549 | info->flags |= USE_SHMEM; | 1534 | info->flags |= USE_SHMEM; |
1550 | return 0; | 1535 | return 0; |
1551 | 1536 | ||
1552 | cs_failed: | ||
1553 | cs_error(link, last_fn, last_ret); | ||
1554 | failed: | 1537 | failed: |
1555 | return 1; | 1538 | return 1; |
1556 | } | 1539 | } |
@@ -1788,7 +1771,6 @@ static int __init init_pcnet_cs(void) | |||
1788 | 1771 | ||
1789 | static void __exit exit_pcnet_cs(void) | 1772 | static void __exit exit_pcnet_cs(void) |
1790 | { | 1773 | { |
1791 | DEBUG(0, "pcnet_cs: unloading\n"); | ||
1792 | pcmcia_unregister_driver(&pcnet_driver); | 1774 | pcmcia_unregister_driver(&pcnet_driver); |
1793 | } | 1775 | } |
1794 | 1776 | ||
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 7bde2cd34c7e..9e0da370912e 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -79,14 +79,6 @@ MODULE_FIRMWARE(FIRMWARE_NAME); | |||
79 | */ | 79 | */ |
80 | INT_MODULE_PARM(if_port, 0); | 80 | INT_MODULE_PARM(if_port, 0); |
81 | 81 | ||
82 | #ifdef PCMCIA_DEBUG | ||
83 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | ||
84 | static const char *version = | ||
85 | "smc91c92_cs.c 1.123 2006/11/09 Donald Becker, becker@scyld.com.\n"; | ||
86 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
87 | #else | ||
88 | #define DEBUG(n, args...) | ||
89 | #endif | ||
90 | 82 | ||
91 | #define DRV_NAME "smc91c92_cs" | 83 | #define DRV_NAME "smc91c92_cs" |
92 | #define DRV_VERSION "1.123" | 84 | #define DRV_VERSION "1.123" |
@@ -126,12 +118,6 @@ struct smc_private { | |||
126 | int rx_ovrn; | 118 | int rx_ovrn; |
127 | }; | 119 | }; |
128 | 120 | ||
129 | struct smc_cfg_mem { | ||
130 | tuple_t tuple; | ||
131 | cisparse_t parse; | ||
132 | u_char buf[255]; | ||
133 | }; | ||
134 | |||
135 | /* Special definitions for Megahertz multifunction cards */ | 121 | /* Special definitions for Megahertz multifunction cards */ |
136 | #define MEGAHERTZ_ISR 0x0380 | 122 | #define MEGAHERTZ_ISR 0x0380 |
137 | 123 | ||
@@ -329,7 +315,7 @@ static int smc91c92_probe(struct pcmcia_device *link) | |||
329 | struct smc_private *smc; | 315 | struct smc_private *smc; |
330 | struct net_device *dev; | 316 | struct net_device *dev; |
331 | 317 | ||
332 | DEBUG(0, "smc91c92_attach()\n"); | 318 | dev_dbg(&link->dev, "smc91c92_attach()\n"); |
333 | 319 | ||
334 | /* Create new ethernet device */ | 320 | /* Create new ethernet device */ |
335 | dev = alloc_etherdev(sizeof(struct smc_private)); | 321 | dev = alloc_etherdev(sizeof(struct smc_private)); |
@@ -343,10 +329,8 @@ static int smc91c92_probe(struct pcmcia_device *link) | |||
343 | link->io.NumPorts1 = 16; | 329 | link->io.NumPorts1 = 16; |
344 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 330 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
345 | link->io.IOAddrLines = 4; | 331 | link->io.IOAddrLines = 4; |
346 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; | 332 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
347 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
348 | link->irq.Handler = &smc_interrupt; | 333 | link->irq.Handler = &smc_interrupt; |
349 | link->irq.Instance = dev; | ||
350 | link->conf.Attributes = CONF_ENABLE_IRQ; | 334 | link->conf.Attributes = CONF_ENABLE_IRQ; |
351 | link->conf.IntType = INT_MEMORY_AND_IO; | 335 | link->conf.IntType = INT_MEMORY_AND_IO; |
352 | 336 | ||
@@ -377,7 +361,7 @@ static void smc91c92_detach(struct pcmcia_device *link) | |||
377 | { | 361 | { |
378 | struct net_device *dev = link->priv; | 362 | struct net_device *dev = link->priv; |
379 | 363 | ||
380 | DEBUG(0, "smc91c92_detach(0x%p)\n", link); | 364 | dev_dbg(&link->dev, "smc91c92_detach\n"); |
381 | 365 | ||
382 | if (link->dev_node) | 366 | if (link->dev_node) |
383 | unregister_netdev(dev); | 367 | unregister_netdev(dev); |
@@ -408,34 +392,7 @@ static int cvt_ascii_address(struct net_device *dev, char *s) | |||
408 | return 0; | 392 | return 0; |
409 | } | 393 | } |
410 | 394 | ||
411 | /*====================================================================*/ | 395 | /*==================================================================== |
412 | |||
413 | static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, | ||
414 | cisparse_t *parse) | ||
415 | { | ||
416 | int i; | ||
417 | |||
418 | i = pcmcia_get_first_tuple(handle, tuple); | ||
419 | if (i != 0) | ||
420 | return i; | ||
421 | i = pcmcia_get_tuple_data(handle, tuple); | ||
422 | if (i != 0) | ||
423 | return i; | ||
424 | return pcmcia_parse_tuple(tuple, parse); | ||
425 | } | ||
426 | |||
427 | static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, | ||
428 | cisparse_t *parse) | ||
429 | { | ||
430 | int i; | ||
431 | |||
432 | if ((i = pcmcia_get_next_tuple(handle, tuple)) != 0 || | ||
433 | (i = pcmcia_get_tuple_data(handle, tuple)) != 0) | ||
434 | return i; | ||
435 | return pcmcia_parse_tuple(tuple, parse); | ||
436 | } | ||
437 | |||
438 | /*====================================================================== | ||
439 | 396 | ||
440 | Configuration stuff for Megahertz cards | 397 | Configuration stuff for Megahertz cards |
441 | 398 | ||
@@ -490,19 +447,14 @@ static int mhz_mfc_config(struct pcmcia_device *link) | |||
490 | { | 447 | { |
491 | struct net_device *dev = link->priv; | 448 | struct net_device *dev = link->priv; |
492 | struct smc_private *smc = netdev_priv(dev); | 449 | struct smc_private *smc = netdev_priv(dev); |
493 | struct smc_cfg_mem *cfg_mem; | ||
494 | win_req_t req; | 450 | win_req_t req; |
495 | memreq_t mem; | 451 | memreq_t mem; |
496 | int i; | 452 | int i; |
497 | 453 | ||
498 | cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL); | ||
499 | if (!cfg_mem) | ||
500 | return -ENOMEM; | ||
501 | |||
502 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 454 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
503 | link->conf.Status = CCSR_AUDIO_ENA; | 455 | link->conf.Status = CCSR_AUDIO_ENA; |
504 | link->irq.Attributes = | 456 | link->irq.Attributes = |
505 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT; | 457 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
506 | link->io.IOAddrLines = 16; | 458 | link->io.IOAddrLines = 16; |
507 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 459 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
508 | link->io.NumPorts2 = 8; | 460 | link->io.NumPorts2 = 8; |
@@ -510,91 +462,80 @@ static int mhz_mfc_config(struct pcmcia_device *link) | |||
510 | /* The Megahertz combo cards have modem-like CIS entries, so | 462 | /* The Megahertz combo cards have modem-like CIS entries, so |
511 | we have to explicitly try a bunch of port combinations. */ | 463 | we have to explicitly try a bunch of port combinations. */ |
512 | if (pcmcia_loop_config(link, mhz_mfc_config_check, NULL)) | 464 | if (pcmcia_loop_config(link, mhz_mfc_config_check, NULL)) |
513 | goto free_cfg_mem; | 465 | return -ENODEV; |
466 | |||
514 | dev->base_addr = link->io.BasePort1; | 467 | dev->base_addr = link->io.BasePort1; |
515 | 468 | ||
516 | /* Allocate a memory window, for accessing the ISR */ | 469 | /* Allocate a memory window, for accessing the ISR */ |
517 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 470 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
518 | req.Base = req.Size = 0; | 471 | req.Base = req.Size = 0; |
519 | req.AccessSpeed = 0; | 472 | req.AccessSpeed = 0; |
520 | i = pcmcia_request_window(&link, &req, &link->win); | 473 | i = pcmcia_request_window(link, &req, &link->win); |
521 | if (i != 0) | 474 | if (i != 0) |
522 | goto free_cfg_mem; | 475 | return -ENODEV; |
476 | |||
523 | smc->base = ioremap(req.Base, req.Size); | 477 | smc->base = ioremap(req.Base, req.Size); |
524 | mem.CardOffset = mem.Page = 0; | 478 | mem.CardOffset = mem.Page = 0; |
525 | if (smc->manfid == MANFID_MOTOROLA) | 479 | if (smc->manfid == MANFID_MOTOROLA) |
526 | mem.CardOffset = link->conf.ConfigBase; | 480 | mem.CardOffset = link->conf.ConfigBase; |
527 | i = pcmcia_map_mem_page(link->win, &mem); | 481 | i = pcmcia_map_mem_page(link, link->win, &mem); |
528 | 482 | ||
529 | if ((i == 0) | 483 | if ((i == 0) |
530 | && (smc->manfid == MANFID_MEGAHERTZ) | 484 | && (smc->manfid == MANFID_MEGAHERTZ) |
531 | && (smc->cardid == PRODID_MEGAHERTZ_EM3288)) | 485 | && (smc->cardid == PRODID_MEGAHERTZ_EM3288)) |
532 | mhz_3288_power(link); | 486 | mhz_3288_power(link); |
533 | 487 | ||
534 | free_cfg_mem: | 488 | return 0; |
535 | kfree(cfg_mem); | ||
536 | return -ENODEV; | ||
537 | } | 489 | } |
538 | 490 | ||
539 | static int mhz_setup(struct pcmcia_device *link) | 491 | static int pcmcia_get_versmac(struct pcmcia_device *p_dev, |
492 | tuple_t *tuple, | ||
493 | void *priv) | ||
540 | { | 494 | { |
541 | struct net_device *dev = link->priv; | 495 | struct net_device *dev = priv; |
542 | struct smc_cfg_mem *cfg_mem; | 496 | cisparse_t parse; |
543 | tuple_t *tuple; | ||
544 | cisparse_t *parse; | ||
545 | u_char *buf, *station_addr; | ||
546 | int rc; | ||
547 | 497 | ||
548 | cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL); | 498 | if (pcmcia_parse_tuple(tuple, &parse)) |
549 | if (!cfg_mem) | 499 | return -EINVAL; |
550 | return -1; | ||
551 | 500 | ||
552 | tuple = &cfg_mem->tuple; | 501 | if ((parse.version_1.ns > 3) && |
553 | parse = &cfg_mem->parse; | 502 | (cvt_ascii_address(dev, |
554 | buf = cfg_mem->buf; | 503 | (parse.version_1.str + parse.version_1.ofs[3])))) |
504 | return 0; | ||
555 | 505 | ||
556 | tuple->Attributes = tuple->TupleOffset = 0; | 506 | return -EINVAL; |
557 | tuple->TupleData = (cisdata_t *)buf; | 507 | }; |
558 | tuple->TupleDataMax = 255; | 508 | |
509 | static int mhz_setup(struct pcmcia_device *link) | ||
510 | { | ||
511 | struct net_device *dev = link->priv; | ||
512 | size_t len; | ||
513 | u8 *buf; | ||
514 | int rc; | ||
559 | 515 | ||
560 | /* Read the station address from the CIS. It is stored as the last | 516 | /* Read the station address from the CIS. It is stored as the last |
561 | (fourth) string in the Version 1 Version/ID tuple. */ | 517 | (fourth) string in the Version 1 Version/ID tuple. */ |
562 | tuple->DesiredTuple = CISTPL_VERS_1; | 518 | if ((link->prod_id[3]) && |
563 | if (first_tuple(link, tuple, parse) != 0) { | 519 | (cvt_ascii_address(dev, link->prod_id[3]) == 0)) |
564 | rc = -1; | 520 | return 0; |
565 | goto free_cfg_mem; | 521 | |
566 | } | 522 | /* Workarounds for broken cards start here. */ |
567 | /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */ | 523 | /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */ |
568 | if (next_tuple(link, tuple, parse) != 0) | 524 | if (!pcmcia_loop_tuple(link, CISTPL_VERS_1, pcmcia_get_versmac, dev)) |
569 | first_tuple(link, tuple, parse); | 525 | return 0; |
570 | if (parse->version_1.ns > 3) { | ||
571 | station_addr = parse->version_1.str + parse->version_1.ofs[3]; | ||
572 | if (cvt_ascii_address(dev, station_addr) == 0) { | ||
573 | rc = 0; | ||
574 | goto free_cfg_mem; | ||
575 | } | ||
576 | } | ||
577 | 526 | ||
578 | /* Another possibility: for the EM3288, in a special tuple */ | 527 | /* Another possibility: for the EM3288, in a special tuple */ |
579 | tuple->DesiredTuple = 0x81; | ||
580 | if (pcmcia_get_first_tuple(link, tuple) != 0) { | ||
581 | rc = -1; | ||
582 | goto free_cfg_mem; | ||
583 | } | ||
584 | if (pcmcia_get_tuple_data(link, tuple) != 0) { | ||
585 | rc = -1; | ||
586 | goto free_cfg_mem; | ||
587 | } | ||
588 | buf[12] = '\0'; | ||
589 | if (cvt_ascii_address(dev, buf) == 0) { | ||
590 | rc = 0; | ||
591 | goto free_cfg_mem; | ||
592 | } | ||
593 | rc = -1; | 528 | rc = -1; |
594 | free_cfg_mem: | 529 | len = pcmcia_get_tuple(link, 0x81, &buf); |
595 | kfree(cfg_mem); | 530 | if (buf && len >= 13) { |
596 | return rc; | 531 | buf[12] = '\0'; |
597 | } | 532 | if (cvt_ascii_address(dev, buf)) |
533 | rc = 0; | ||
534 | } | ||
535 | kfree(buf); | ||
536 | |||
537 | return rc; | ||
538 | }; | ||
598 | 539 | ||
599 | /*====================================================================== | 540 | /*====================================================================== |
600 | 541 | ||
@@ -684,58 +625,21 @@ static int smc_config(struct pcmcia_device *link) | |||
684 | return i; | 625 | return i; |
685 | } | 626 | } |
686 | 627 | ||
628 | |||
687 | static int smc_setup(struct pcmcia_device *link) | 629 | static int smc_setup(struct pcmcia_device *link) |
688 | { | 630 | { |
689 | struct net_device *dev = link->priv; | 631 | struct net_device *dev = link->priv; |
690 | struct smc_cfg_mem *cfg_mem; | ||
691 | tuple_t *tuple; | ||
692 | cisparse_t *parse; | ||
693 | cistpl_lan_node_id_t *node_id; | ||
694 | u_char *buf, *station_addr; | ||
695 | int i, rc; | ||
696 | |||
697 | cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL); | ||
698 | if (!cfg_mem) | ||
699 | return -ENOMEM; | ||
700 | |||
701 | tuple = &cfg_mem->tuple; | ||
702 | parse = &cfg_mem->parse; | ||
703 | buf = cfg_mem->buf; | ||
704 | |||
705 | tuple->Attributes = tuple->TupleOffset = 0; | ||
706 | tuple->TupleData = (cisdata_t *)buf; | ||
707 | tuple->TupleDataMax = 255; | ||
708 | 632 | ||
709 | /* Check for a LAN function extension tuple */ | 633 | /* Check for a LAN function extension tuple */ |
710 | tuple->DesiredTuple = CISTPL_FUNCE; | 634 | if (!pcmcia_get_mac_from_cis(link, dev)) |
711 | i = first_tuple(link, tuple, parse); | 635 | return 0; |
712 | while (i == 0) { | 636 | |
713 | if (parse->funce.type == CISTPL_FUNCE_LAN_NODE_ID) | ||
714 | break; | ||
715 | i = next_tuple(link, tuple, parse); | ||
716 | } | ||
717 | if (i == 0) { | ||
718 | node_id = (cistpl_lan_node_id_t *)parse->funce.data; | ||
719 | if (node_id->nb == 6) { | ||
720 | for (i = 0; i < 6; i++) | ||
721 | dev->dev_addr[i] = node_id->id[i]; | ||
722 | rc = 0; | ||
723 | goto free_cfg_mem; | ||
724 | } | ||
725 | } | ||
726 | /* Try the third string in the Version 1 Version/ID tuple. */ | 637 | /* Try the third string in the Version 1 Version/ID tuple. */ |
727 | if (link->prod_id[2]) { | 638 | if (link->prod_id[2]) { |
728 | station_addr = link->prod_id[2]; | 639 | if (cvt_ascii_address(dev, link->prod_id[2]) == 0) |
729 | if (cvt_ascii_address(dev, station_addr) == 0) { | 640 | return 0; |
730 | rc = 0; | ||
731 | goto free_cfg_mem; | ||
732 | } | ||
733 | } | 641 | } |
734 | 642 | return -1; | |
735 | rc = -1; | ||
736 | free_cfg_mem: | ||
737 | kfree(cfg_mem); | ||
738 | return rc; | ||
739 | } | 643 | } |
740 | 644 | ||
741 | /*====================================================================*/ | 645 | /*====================================================================*/ |
@@ -749,7 +653,7 @@ static int osi_config(struct pcmcia_device *link) | |||
749 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 653 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
750 | link->conf.Status = CCSR_AUDIO_ENA; | 654 | link->conf.Status = CCSR_AUDIO_ENA; |
751 | link->irq.Attributes = | 655 | link->irq.Attributes = |
752 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT; | 656 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
753 | link->io.NumPorts1 = 64; | 657 | link->io.NumPorts1 = 64; |
754 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 658 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
755 | link->io.NumPorts2 = 8; | 659 | link->io.NumPorts2 = 8; |
@@ -794,41 +698,31 @@ static int osi_load_firmware(struct pcmcia_device *link) | |||
794 | return err; | 698 | return err; |
795 | } | 699 | } |
796 | 700 | ||
797 | static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid) | 701 | static int pcmcia_osi_mac(struct pcmcia_device *p_dev, |
702 | tuple_t *tuple, | ||
703 | void *priv) | ||
798 | { | 704 | { |
799 | struct net_device *dev = link->priv; | 705 | struct net_device *dev = priv; |
800 | struct smc_cfg_mem *cfg_mem; | 706 | int i; |
801 | tuple_t *tuple; | ||
802 | u_char *buf; | ||
803 | int i, rc; | ||
804 | 707 | ||
805 | cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL); | 708 | if (tuple->TupleDataLen < 8) |
806 | if (!cfg_mem) | 709 | return -EINVAL; |
807 | return -1; | 710 | if (tuple->TupleData[0] != 0x04) |
711 | return -EINVAL; | ||
712 | for (i = 0; i < 6; i++) | ||
713 | dev->dev_addr[i] = tuple->TupleData[i+2]; | ||
714 | return 0; | ||
715 | }; | ||
808 | 716 | ||
809 | tuple = &cfg_mem->tuple; | ||
810 | buf = cfg_mem->buf; | ||
811 | 717 | ||
812 | tuple->Attributes = TUPLE_RETURN_COMMON; | 718 | static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid) |
813 | tuple->TupleData = (cisdata_t *)buf; | 719 | { |
814 | tuple->TupleDataMax = 255; | 720 | struct net_device *dev = link->priv; |
815 | tuple->TupleOffset = 0; | 721 | int rc; |
816 | 722 | ||
817 | /* Read the station address from tuple 0x90, subtuple 0x04 */ | 723 | /* Read the station address from tuple 0x90, subtuple 0x04 */ |
818 | tuple->DesiredTuple = 0x90; | 724 | if (pcmcia_loop_tuple(link, 0x90, pcmcia_osi_mac, dev)) |
819 | i = pcmcia_get_first_tuple(link, tuple); | 725 | return -1; |
820 | while (i == 0) { | ||
821 | i = pcmcia_get_tuple_data(link, tuple); | ||
822 | if ((i != 0) || (buf[0] == 0x04)) | ||
823 | break; | ||
824 | i = pcmcia_get_next_tuple(link, tuple); | ||
825 | } | ||
826 | if (i != 0) { | ||
827 | rc = -1; | ||
828 | goto free_cfg_mem; | ||
829 | } | ||
830 | for (i = 0; i < 6; i++) | ||
831 | dev->dev_addr[i] = buf[i+2]; | ||
832 | 726 | ||
833 | if (((manfid == MANFID_OSITECH) && | 727 | if (((manfid == MANFID_OSITECH) && |
834 | (cardid == PRODID_OSITECH_SEVEN)) || | 728 | (cardid == PRODID_OSITECH_SEVEN)) || |
@@ -836,20 +730,17 @@ static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid) | |||
836 | (cardid == PRODID_PSION_NET100))) { | 730 | (cardid == PRODID_PSION_NET100))) { |
837 | rc = osi_load_firmware(link); | 731 | rc = osi_load_firmware(link); |
838 | if (rc) | 732 | if (rc) |
839 | goto free_cfg_mem; | 733 | return rc; |
840 | } else if (manfid == MANFID_OSITECH) { | 734 | } else if (manfid == MANFID_OSITECH) { |
841 | /* Make sure both functions are powered up */ | 735 | /* Make sure both functions are powered up */ |
842 | set_bits(0x300, link->io.BasePort1 + OSITECH_AUI_PWR); | 736 | set_bits(0x300, link->io.BasePort1 + OSITECH_AUI_PWR); |
843 | /* Now, turn on the interrupt for both card functions */ | 737 | /* Now, turn on the interrupt for both card functions */ |
844 | set_bits(0x300, link->io.BasePort1 + OSITECH_RESET_ISR); | 738 | set_bits(0x300, link->io.BasePort1 + OSITECH_RESET_ISR); |
845 | DEBUG(2, "AUI/PWR: %4.4x RESET/ISR: %4.4x\n", | 739 | dev_dbg(&link->dev, "AUI/PWR: %4.4x RESET/ISR: %4.4x\n", |
846 | inw(link->io.BasePort1 + OSITECH_AUI_PWR), | 740 | inw(link->io.BasePort1 + OSITECH_AUI_PWR), |
847 | inw(link->io.BasePort1 + OSITECH_RESET_ISR)); | 741 | inw(link->io.BasePort1 + OSITECH_RESET_ISR)); |
848 | } | 742 | } |
849 | rc = 0; | 743 | return 0; |
850 | free_cfg_mem: | ||
851 | kfree(cfg_mem); | ||
852 | return rc; | ||
853 | } | 744 | } |
854 | 745 | ||
855 | static int smc91c92_suspend(struct pcmcia_device *link) | 746 | static int smc91c92_suspend(struct pcmcia_device *link) |
@@ -959,12 +850,6 @@ static int check_sig(struct pcmcia_device *link) | |||
959 | 850 | ||
960 | ======================================================================*/ | 851 | ======================================================================*/ |
961 | 852 | ||
962 | #define CS_EXIT_TEST(ret, svc, label) \ | ||
963 | if (ret != 0) { \ | ||
964 | cs_error(link, svc, ret); \ | ||
965 | goto label; \ | ||
966 | } | ||
967 | |||
968 | static int smc91c92_config(struct pcmcia_device *link) | 853 | static int smc91c92_config(struct pcmcia_device *link) |
969 | { | 854 | { |
970 | struct net_device *dev = link->priv; | 855 | struct net_device *dev = link->priv; |
@@ -974,7 +859,7 @@ static int smc91c92_config(struct pcmcia_device *link) | |||
974 | unsigned int ioaddr; | 859 | unsigned int ioaddr; |
975 | u_long mir; | 860 | u_long mir; |
976 | 861 | ||
977 | DEBUG(0, "smc91c92_config(0x%p)\n", link); | 862 | dev_dbg(&link->dev, "smc91c92_config\n"); |
978 | 863 | ||
979 | smc->manfid = link->manf_id; | 864 | smc->manfid = link->manf_id; |
980 | smc->cardid = link->card_id; | 865 | smc->cardid = link->card_id; |
@@ -990,12 +875,15 @@ static int smc91c92_config(struct pcmcia_device *link) | |||
990 | } else { | 875 | } else { |
991 | i = smc_config(link); | 876 | i = smc_config(link); |
992 | } | 877 | } |
993 | CS_EXIT_TEST(i, RequestIO, config_failed); | 878 | if (i) |
879 | goto config_failed; | ||
994 | 880 | ||
995 | i = pcmcia_request_irq(link, &link->irq); | 881 | i = pcmcia_request_irq(link, &link->irq); |
996 | CS_EXIT_TEST(i, RequestIRQ, config_failed); | 882 | if (i) |
883 | goto config_failed; | ||
997 | i = pcmcia_request_configuration(link, &link->conf); | 884 | i = pcmcia_request_configuration(link, &link->conf); |
998 | CS_EXIT_TEST(i, RequestConfiguration, config_failed); | 885 | if (i) |
886 | goto config_failed; | ||
999 | 887 | ||
1000 | if (smc->manfid == MANFID_MOTOROLA) | 888 | if (smc->manfid == MANFID_MOTOROLA) |
1001 | mot_config(link); | 889 | mot_config(link); |
@@ -1074,7 +962,7 @@ static int smc91c92_config(struct pcmcia_device *link) | |||
1074 | } | 962 | } |
1075 | 963 | ||
1076 | link->dev_node = &smc->node; | 964 | link->dev_node = &smc->node; |
1077 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 965 | SET_NETDEV_DEV(dev, &link->dev); |
1078 | 966 | ||
1079 | if (register_netdev(dev) != 0) { | 967 | if (register_netdev(dev) != 0) { |
1080 | printk(KERN_ERR "smc91c92_cs: register_netdev() failed\n"); | 968 | printk(KERN_ERR "smc91c92_cs: register_netdev() failed\n"); |
@@ -1100,7 +988,7 @@ static int smc91c92_config(struct pcmcia_device *link) | |||
1100 | 988 | ||
1101 | if (smc->cfg & CFG_MII_SELECT) { | 989 | if (smc->cfg & CFG_MII_SELECT) { |
1102 | if (smc->mii_if.phy_id != -1) { | 990 | if (smc->mii_if.phy_id != -1) { |
1103 | DEBUG(0, " MII transceiver at index %d, status %x.\n", | 991 | dev_dbg(&link->dev, " MII transceiver at index %d, status %x.\n", |
1104 | smc->mii_if.phy_id, j); | 992 | smc->mii_if.phy_id, j); |
1105 | } else { | 993 | } else { |
1106 | printk(KERN_NOTICE " No MII transceivers found!\n"); | 994 | printk(KERN_NOTICE " No MII transceivers found!\n"); |
@@ -1110,7 +998,7 @@ static int smc91c92_config(struct pcmcia_device *link) | |||
1110 | 998 | ||
1111 | config_undo: | 999 | config_undo: |
1112 | unregister_netdev(dev); | 1000 | unregister_netdev(dev); |
1113 | config_failed: /* CS_EXIT_TEST() calls jump to here... */ | 1001 | config_failed: |
1114 | smc91c92_release(link); | 1002 | smc91c92_release(link); |
1115 | return -ENODEV; | 1003 | return -ENODEV; |
1116 | } /* smc91c92_config */ | 1004 | } /* smc91c92_config */ |
@@ -1125,7 +1013,7 @@ config_failed: /* CS_EXIT_TEST() calls jump to here... */ | |||
1125 | 1013 | ||
1126 | static void smc91c92_release(struct pcmcia_device *link) | 1014 | static void smc91c92_release(struct pcmcia_device *link) |
1127 | { | 1015 | { |
1128 | DEBUG(0, "smc91c92_release(0x%p)\n", link); | 1016 | dev_dbg(&link->dev, "smc91c92_release\n"); |
1129 | if (link->win) { | 1017 | if (link->win) { |
1130 | struct net_device *dev = link->priv; | 1018 | struct net_device *dev = link->priv; |
1131 | struct smc_private *smc = netdev_priv(dev); | 1019 | struct smc_private *smc = netdev_priv(dev); |
@@ -1222,10 +1110,10 @@ static int smc_open(struct net_device *dev) | |||
1222 | struct smc_private *smc = netdev_priv(dev); | 1110 | struct smc_private *smc = netdev_priv(dev); |
1223 | struct pcmcia_device *link = smc->p_dev; | 1111 | struct pcmcia_device *link = smc->p_dev; |
1224 | 1112 | ||
1225 | #ifdef PCMCIA_DEBUG | 1113 | dev_dbg(&link->dev, "%s: smc_open(%p), ID/Window %4.4x.\n", |
1226 | DEBUG(0, "%s: smc_open(%p), ID/Window %4.4x.\n", | ||
1227 | dev->name, dev, inw(dev->base_addr + BANK_SELECT)); | 1114 | dev->name, dev, inw(dev->base_addr + BANK_SELECT)); |
1228 | if (pc_debug > 1) smc_dump(dev); | 1115 | #ifdef PCMCIA_DEBUG |
1116 | smc_dump(dev); | ||
1229 | #endif | 1117 | #endif |
1230 | 1118 | ||
1231 | /* Check that the PCMCIA card is still here. */ | 1119 | /* Check that the PCMCIA card is still here. */ |
@@ -1260,7 +1148,7 @@ static int smc_close(struct net_device *dev) | |||
1260 | struct pcmcia_device *link = smc->p_dev; | 1148 | struct pcmcia_device *link = smc->p_dev; |
1261 | unsigned int ioaddr = dev->base_addr; | 1149 | unsigned int ioaddr = dev->base_addr; |
1262 | 1150 | ||
1263 | DEBUG(0, "%s: smc_close(), status %4.4x.\n", | 1151 | dev_dbg(&link->dev, "%s: smc_close(), status %4.4x.\n", |
1264 | dev->name, inw(ioaddr + BANK_SELECT)); | 1152 | dev->name, inw(ioaddr + BANK_SELECT)); |
1265 | 1153 | ||
1266 | netif_stop_queue(dev); | 1154 | netif_stop_queue(dev); |
@@ -1327,7 +1215,7 @@ static void smc_hardware_send_packet(struct net_device * dev) | |||
1327 | u_char *buf = skb->data; | 1215 | u_char *buf = skb->data; |
1328 | u_int length = skb->len; /* The chip will pad to ethernet min. */ | 1216 | u_int length = skb->len; /* The chip will pad to ethernet min. */ |
1329 | 1217 | ||
1330 | DEBUG(2, "%s: Trying to xmit packet of length %d.\n", | 1218 | pr_debug("%s: Trying to xmit packet of length %d.\n", |
1331 | dev->name, length); | 1219 | dev->name, length); |
1332 | 1220 | ||
1333 | /* send the packet length: +6 for status word, length, and ctl */ | 1221 | /* send the packet length: +6 for status word, length, and ctl */ |
@@ -1382,7 +1270,7 @@ static netdev_tx_t smc_start_xmit(struct sk_buff *skb, | |||
1382 | 1270 | ||
1383 | netif_stop_queue(dev); | 1271 | netif_stop_queue(dev); |
1384 | 1272 | ||
1385 | DEBUG(2, "%s: smc_start_xmit(length = %d) called," | 1273 | pr_debug("%s: smc_start_xmit(length = %d) called," |
1386 | " status %4.4x.\n", dev->name, skb->len, inw(ioaddr + 2)); | 1274 | " status %4.4x.\n", dev->name, skb->len, inw(ioaddr + 2)); |
1387 | 1275 | ||
1388 | if (smc->saved_skb) { | 1276 | if (smc->saved_skb) { |
@@ -1429,7 +1317,7 @@ static netdev_tx_t smc_start_xmit(struct sk_buff *skb, | |||
1429 | } | 1317 | } |
1430 | 1318 | ||
1431 | /* Otherwise defer until the Tx-space-allocated interrupt. */ | 1319 | /* Otherwise defer until the Tx-space-allocated interrupt. */ |
1432 | DEBUG(2, "%s: memory allocation deferred.\n", dev->name); | 1320 | pr_debug("%s: memory allocation deferred.\n", dev->name); |
1433 | outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT); | 1321 | outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT); |
1434 | spin_unlock_irqrestore(&smc->lock, flags); | 1322 | spin_unlock_irqrestore(&smc->lock, flags); |
1435 | 1323 | ||
@@ -1494,7 +1382,7 @@ static void smc_eph_irq(struct net_device *dev) | |||
1494 | 1382 | ||
1495 | SMC_SELECT_BANK(0); | 1383 | SMC_SELECT_BANK(0); |
1496 | ephs = inw(ioaddr + EPH); | 1384 | ephs = inw(ioaddr + EPH); |
1497 | DEBUG(2, "%s: Ethernet protocol handler interrupt, status" | 1385 | pr_debug("%s: Ethernet protocol handler interrupt, status" |
1498 | " %4.4x.\n", dev->name, ephs); | 1386 | " %4.4x.\n", dev->name, ephs); |
1499 | /* Could be a counter roll-over warning: update stats. */ | 1387 | /* Could be a counter roll-over warning: update stats. */ |
1500 | card_stats = inw(ioaddr + COUNTER); | 1388 | card_stats = inw(ioaddr + COUNTER); |
@@ -1534,7 +1422,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) | |||
1534 | 1422 | ||
1535 | ioaddr = dev->base_addr; | 1423 | ioaddr = dev->base_addr; |
1536 | 1424 | ||
1537 | DEBUG(3, "%s: SMC91c92 interrupt %d at %#x.\n", dev->name, | 1425 | pr_debug("%s: SMC91c92 interrupt %d at %#x.\n", dev->name, |
1538 | irq, ioaddr); | 1426 | irq, ioaddr); |
1539 | 1427 | ||
1540 | spin_lock(&smc->lock); | 1428 | spin_lock(&smc->lock); |
@@ -1543,7 +1431,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) | |||
1543 | if ((saved_bank & 0xff00) != 0x3300) { | 1431 | if ((saved_bank & 0xff00) != 0x3300) { |
1544 | /* The device does not exist -- the card could be off-line, or | 1432 | /* The device does not exist -- the card could be off-line, or |
1545 | maybe it has been ejected. */ | 1433 | maybe it has been ejected. */ |
1546 | DEBUG(1, "%s: SMC91c92 interrupt %d for non-existent" | 1434 | pr_debug("%s: SMC91c92 interrupt %d for non-existent" |
1547 | "/ejected device.\n", dev->name, irq); | 1435 | "/ejected device.\n", dev->name, irq); |
1548 | handled = 0; | 1436 | handled = 0; |
1549 | goto irq_done; | 1437 | goto irq_done; |
@@ -1557,7 +1445,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) | |||
1557 | 1445 | ||
1558 | do { /* read the status flag, and mask it */ | 1446 | do { /* read the status flag, and mask it */ |
1559 | status = inw(ioaddr + INTERRUPT) & 0xff; | 1447 | status = inw(ioaddr + INTERRUPT) & 0xff; |
1560 | DEBUG(3, "%s: Status is %#2.2x (mask %#2.2x).\n", dev->name, | 1448 | pr_debug("%s: Status is %#2.2x (mask %#2.2x).\n", dev->name, |
1561 | status, mask); | 1449 | status, mask); |
1562 | if ((status & mask) == 0) { | 1450 | if ((status & mask) == 0) { |
1563 | if (bogus_cnt == INTR_WORK) | 1451 | if (bogus_cnt == INTR_WORK) |
@@ -1602,7 +1490,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) | |||
1602 | smc_eph_irq(dev); | 1490 | smc_eph_irq(dev); |
1603 | } while (--bogus_cnt); | 1491 | } while (--bogus_cnt); |
1604 | 1492 | ||
1605 | DEBUG(3, " Restoring saved registers mask %2.2x bank %4.4x" | 1493 | pr_debug(" Restoring saved registers mask %2.2x bank %4.4x" |
1606 | " pointer %4.4x.\n", mask, saved_bank, saved_pointer); | 1494 | " pointer %4.4x.\n", mask, saved_bank, saved_pointer); |
1607 | 1495 | ||
1608 | /* restore state register */ | 1496 | /* restore state register */ |
@@ -1610,7 +1498,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) | |||
1610 | outw(saved_pointer, ioaddr + POINTER); | 1498 | outw(saved_pointer, ioaddr + POINTER); |
1611 | SMC_SELECT_BANK(saved_bank); | 1499 | SMC_SELECT_BANK(saved_bank); |
1612 | 1500 | ||
1613 | DEBUG(3, "%s: Exiting interrupt IRQ%d.\n", dev->name, irq); | 1501 | pr_debug("%s: Exiting interrupt IRQ%d.\n", dev->name, irq); |
1614 | 1502 | ||
1615 | irq_done: | 1503 | irq_done: |
1616 | 1504 | ||
@@ -1661,7 +1549,7 @@ static void smc_rx(struct net_device *dev) | |||
1661 | rx_status = inw(ioaddr + DATA_1); | 1549 | rx_status = inw(ioaddr + DATA_1); |
1662 | packet_length = inw(ioaddr + DATA_1) & 0x07ff; | 1550 | packet_length = inw(ioaddr + DATA_1) & 0x07ff; |
1663 | 1551 | ||
1664 | DEBUG(2, "%s: Receive status %4.4x length %d.\n", | 1552 | pr_debug("%s: Receive status %4.4x length %d.\n", |
1665 | dev->name, rx_status, packet_length); | 1553 | dev->name, rx_status, packet_length); |
1666 | 1554 | ||
1667 | if (!(rx_status & RS_ERRORS)) { | 1555 | if (!(rx_status & RS_ERRORS)) { |
@@ -1672,7 +1560,7 @@ static void smc_rx(struct net_device *dev) | |||
1672 | skb = dev_alloc_skb(packet_length+2); | 1560 | skb = dev_alloc_skb(packet_length+2); |
1673 | 1561 | ||
1674 | if (skb == NULL) { | 1562 | if (skb == NULL) { |
1675 | DEBUG(1, "%s: Low memory, packet dropped.\n", dev->name); | 1563 | pr_debug("%s: Low memory, packet dropped.\n", dev->name); |
1676 | dev->stats.rx_dropped++; | 1564 | dev->stats.rx_dropped++; |
1677 | outw(MC_RELEASE, ioaddr + MMU_CMD); | 1565 | outw(MC_RELEASE, ioaddr + MMU_CMD); |
1678 | return; | 1566 | return; |
@@ -1832,7 +1720,7 @@ static void smc_reset(struct net_device *dev) | |||
1832 | struct smc_private *smc = netdev_priv(dev); | 1720 | struct smc_private *smc = netdev_priv(dev); |
1833 | int i; | 1721 | int i; |
1834 | 1722 | ||
1835 | DEBUG(0, "%s: smc91c92 reset called.\n", dev->name); | 1723 | pr_debug("%s: smc91c92 reset called.\n", dev->name); |
1836 | 1724 | ||
1837 | /* The first interaction must be a write to bring the chip out | 1725 | /* The first interaction must be a write to bring the chip out |
1838 | of sleep mode. */ | 1726 | of sleep mode. */ |
@@ -2149,18 +2037,6 @@ static u32 smc_get_link(struct net_device *dev) | |||
2149 | return ret; | 2037 | return ret; |
2150 | } | 2038 | } |
2151 | 2039 | ||
2152 | #ifdef PCMCIA_DEBUG | ||
2153 | static u32 smc_get_msglevel(struct net_device *dev) | ||
2154 | { | ||
2155 | return pc_debug; | ||
2156 | } | ||
2157 | |||
2158 | static void smc_set_msglevel(struct net_device *dev, u32 val) | ||
2159 | { | ||
2160 | pc_debug = val; | ||
2161 | } | ||
2162 | #endif | ||
2163 | |||
2164 | static int smc_nway_reset(struct net_device *dev) | 2040 | static int smc_nway_reset(struct net_device *dev) |
2165 | { | 2041 | { |
2166 | struct smc_private *smc = netdev_priv(dev); | 2042 | struct smc_private *smc = netdev_priv(dev); |
@@ -2184,10 +2060,6 @@ static const struct ethtool_ops ethtool_ops = { | |||
2184 | .get_settings = smc_get_settings, | 2060 | .get_settings = smc_get_settings, |
2185 | .set_settings = smc_set_settings, | 2061 | .set_settings = smc_set_settings, |
2186 | .get_link = smc_get_link, | 2062 | .get_link = smc_get_link, |
2187 | #ifdef PCMCIA_DEBUG | ||
2188 | .get_msglevel = smc_get_msglevel, | ||
2189 | .set_msglevel = smc_set_msglevel, | ||
2190 | #endif | ||
2191 | .nway_reset = smc_nway_reset, | 2063 | .nway_reset = smc_nway_reset, |
2192 | }; | 2064 | }; |
2193 | 2065 | ||
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index cf8423102538..fe504b7f369f 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -211,20 +211,6 @@ enum xirc_cmd { /* Commands */ | |||
211 | 211 | ||
212 | static const char *if_names[] = { "Auto", "10BaseT", "10Base2", "AUI", "100BaseT" }; | 212 | static const char *if_names[] = { "Auto", "10BaseT", "10Base2", "AUI", "100BaseT" }; |
213 | 213 | ||
214 | /**************** | ||
215 | * All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
216 | * you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
217 | * left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
218 | * be present but disabled -- but it can then be enabled for specific | ||
219 | * modules at load time with a 'pc_debug=#' option to insmod. | ||
220 | */ | ||
221 | #ifdef PCMCIA_DEBUG | ||
222 | static int pc_debug = PCMCIA_DEBUG; | ||
223 | module_param(pc_debug, int, 0); | ||
224 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KDBG_XIRC args) | ||
225 | #else | ||
226 | #define DEBUG(n, args...) | ||
227 | #endif | ||
228 | 214 | ||
229 | #define KDBG_XIRC KERN_DEBUG "xirc2ps_cs: " | 215 | #define KDBG_XIRC KERN_DEBUG "xirc2ps_cs: " |
230 | #define KERR_XIRC KERN_ERR "xirc2ps_cs: " | 216 | #define KERR_XIRC KERN_ERR "xirc2ps_cs: " |
@@ -359,7 +345,7 @@ static void xirc_tx_timeout(struct net_device *dev); | |||
359 | static void xirc2ps_tx_timeout_task(struct work_struct *work); | 345 | static void xirc2ps_tx_timeout_task(struct work_struct *work); |
360 | static void set_addresses(struct net_device *dev); | 346 | static void set_addresses(struct net_device *dev); |
361 | static void set_multicast_list(struct net_device *dev); | 347 | static void set_multicast_list(struct net_device *dev); |
362 | static int set_card_type(struct pcmcia_device *link, const void *s); | 348 | static int set_card_type(struct pcmcia_device *link); |
363 | static int do_config(struct net_device *dev, struct ifmap *map); | 349 | static int do_config(struct net_device *dev, struct ifmap *map); |
364 | static int do_open(struct net_device *dev); | 350 | static int do_open(struct net_device *dev); |
365 | static int do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 351 | static int do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
@@ -371,28 +357,6 @@ static void do_powerdown(struct net_device *dev); | |||
371 | static int do_stop(struct net_device *dev); | 357 | static int do_stop(struct net_device *dev); |
372 | 358 | ||
373 | /*=============== Helper functions =========================*/ | 359 | /*=============== Helper functions =========================*/ |
374 | static int | ||
375 | first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse) | ||
376 | { | ||
377 | int err; | ||
378 | |||
379 | if ((err = pcmcia_get_first_tuple(handle, tuple)) == 0 && | ||
380 | (err = pcmcia_get_tuple_data(handle, tuple)) == 0) | ||
381 | err = pcmcia_parse_tuple(tuple, parse); | ||
382 | return err; | ||
383 | } | ||
384 | |||
385 | static int | ||
386 | next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse) | ||
387 | { | ||
388 | int err; | ||
389 | |||
390 | if ((err = pcmcia_get_next_tuple(handle, tuple)) == 0 && | ||
391 | (err = pcmcia_get_tuple_data(handle, tuple)) == 0) | ||
392 | err = pcmcia_parse_tuple(tuple, parse); | ||
393 | return err; | ||
394 | } | ||
395 | |||
396 | #define SelectPage(pgnr) outb((pgnr), ioaddr + XIRCREG_PR) | 360 | #define SelectPage(pgnr) outb((pgnr), ioaddr + XIRCREG_PR) |
397 | #define GetByte(reg) ((unsigned)inb(ioaddr + (reg))) | 361 | #define GetByte(reg) ((unsigned)inb(ioaddr + (reg))) |
398 | #define GetWord(reg) ((unsigned)inw(ioaddr + (reg))) | 362 | #define GetWord(reg) ((unsigned)inw(ioaddr + (reg))) |
@@ -400,7 +364,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse) | |||
400 | #define PutWord(reg,value) outw((value), ioaddr+(reg)) | 364 | #define PutWord(reg,value) outw((value), ioaddr+(reg)) |
401 | 365 | ||
402 | /*====== Functions used for debugging =================================*/ | 366 | /*====== Functions used for debugging =================================*/ |
403 | #if defined(PCMCIA_DEBUG) && 0 /* reading regs may change system status */ | 367 | #if 0 /* reading regs may change system status */ |
404 | static void | 368 | static void |
405 | PrintRegisters(struct net_device *dev) | 369 | PrintRegisters(struct net_device *dev) |
406 | { | 370 | { |
@@ -432,7 +396,7 @@ PrintRegisters(struct net_device *dev) | |||
432 | } | 396 | } |
433 | } | 397 | } |
434 | } | 398 | } |
435 | #endif /* PCMCIA_DEBUG */ | 399 | #endif /* 0 */ |
436 | 400 | ||
437 | /*============== MII Management functions ===============*/ | 401 | /*============== MII Management functions ===============*/ |
438 | 402 | ||
@@ -576,7 +540,7 @@ xirc2ps_probe(struct pcmcia_device *link) | |||
576 | struct net_device *dev; | 540 | struct net_device *dev; |
577 | local_info_t *local; | 541 | local_info_t *local; |
578 | 542 | ||
579 | DEBUG(0, "attach()\n"); | 543 | dev_dbg(&link->dev, "attach()\n"); |
580 | 544 | ||
581 | /* Allocate the device structure */ | 545 | /* Allocate the device structure */ |
582 | dev = alloc_etherdev(sizeof(local_info_t)); | 546 | dev = alloc_etherdev(sizeof(local_info_t)); |
@@ -592,7 +556,6 @@ xirc2ps_probe(struct pcmcia_device *link) | |||
592 | link->conf.IntType = INT_MEMORY_AND_IO; | 556 | link->conf.IntType = INT_MEMORY_AND_IO; |
593 | link->conf.ConfigIndex = 1; | 557 | link->conf.ConfigIndex = 1; |
594 | link->irq.Handler = xirc2ps_interrupt; | 558 | link->irq.Handler = xirc2ps_interrupt; |
595 | link->irq.Instance = dev; | ||
596 | 559 | ||
597 | /* Fill in card specific entries */ | 560 | /* Fill in card specific entries */ |
598 | dev->netdev_ops = &netdev_ops; | 561 | dev->netdev_ops = &netdev_ops; |
@@ -615,7 +578,7 @@ xirc2ps_detach(struct pcmcia_device *link) | |||
615 | { | 578 | { |
616 | struct net_device *dev = link->priv; | 579 | struct net_device *dev = link->priv; |
617 | 580 | ||
618 | DEBUG(0, "detach(0x%p)\n", link); | 581 | dev_dbg(&link->dev, "detach\n"); |
619 | 582 | ||
620 | if (link->dev_node) | 583 | if (link->dev_node) |
621 | unregister_netdev(dev); | 584 | unregister_netdev(dev); |
@@ -644,17 +607,25 @@ xirc2ps_detach(struct pcmcia_device *link) | |||
644 | * | 607 | * |
645 | */ | 608 | */ |
646 | static int | 609 | static int |
647 | set_card_type(struct pcmcia_device *link, const void *s) | 610 | set_card_type(struct pcmcia_device *link) |
648 | { | 611 | { |
649 | struct net_device *dev = link->priv; | 612 | struct net_device *dev = link->priv; |
650 | local_info_t *local = netdev_priv(dev); | 613 | local_info_t *local = netdev_priv(dev); |
651 | #ifdef PCMCIA_DEBUG | 614 | u8 *buf; |
652 | unsigned cisrev = ((const unsigned char *)s)[2]; | 615 | unsigned int cisrev, mediaid, prodid; |
653 | #endif | 616 | size_t len; |
654 | unsigned mediaid= ((const unsigned char *)s)[3]; | 617 | |
655 | unsigned prodid = ((const unsigned char *)s)[4]; | 618 | len = pcmcia_get_tuple(link, CISTPL_MANFID, &buf); |
619 | if (len < 5) { | ||
620 | dev_err(&link->dev, "invalid CIS -- sorry\n"); | ||
621 | return 0; | ||
622 | } | ||
656 | 623 | ||
657 | DEBUG(0, "cisrev=%02x mediaid=%02x prodid=%02x\n", | 624 | cisrev = buf[2]; |
625 | mediaid = buf[3]; | ||
626 | prodid = buf[4]; | ||
627 | |||
628 | dev_dbg(&link->dev, "cisrev=%02x mediaid=%02x prodid=%02x\n", | ||
658 | cisrev, mediaid, prodid); | 629 | cisrev, mediaid, prodid); |
659 | 630 | ||
660 | local->mohawk = 0; | 631 | local->mohawk = 0; |
@@ -761,6 +732,26 @@ xirc2ps_config_check(struct pcmcia_device *p_dev, | |||
761 | 732 | ||
762 | } | 733 | } |
763 | 734 | ||
735 | |||
736 | static int pcmcia_get_mac_ce(struct pcmcia_device *p_dev, | ||
737 | tuple_t *tuple, | ||
738 | void *priv) | ||
739 | { | ||
740 | struct net_device *dev = priv; | ||
741 | int i; | ||
742 | |||
743 | if (tuple->TupleDataLen != 13) | ||
744 | return -EINVAL; | ||
745 | if ((tuple->TupleData[0] != 2) || (tuple->TupleData[1] != 1) || | ||
746 | (tuple->TupleData[2] != 6)) | ||
747 | return -EINVAL; | ||
748 | /* another try (James Lehmer's CE2 version 4.1)*/ | ||
749 | for (i = 2; i < 6; i++) | ||
750 | dev->dev_addr[i] = tuple->TupleData[i+2]; | ||
751 | return 0; | ||
752 | }; | ||
753 | |||
754 | |||
764 | /**************** | 755 | /**************** |
765 | * xirc2ps_config() is scheduled to run after a CARD_INSERTION event | 756 | * xirc2ps_config() is scheduled to run after a CARD_INSERTION event |
766 | * is received, to configure the PCMCIA socket, and to make the | 757 | * is received, to configure the PCMCIA socket, and to make the |
@@ -772,33 +763,21 @@ xirc2ps_config(struct pcmcia_device * link) | |||
772 | struct net_device *dev = link->priv; | 763 | struct net_device *dev = link->priv; |
773 | local_info_t *local = netdev_priv(dev); | 764 | local_info_t *local = netdev_priv(dev); |
774 | unsigned int ioaddr; | 765 | unsigned int ioaddr; |
775 | tuple_t tuple; | 766 | int err; |
776 | cisparse_t parse; | 767 | u8 *buf; |
777 | int err, i; | 768 | size_t len; |
778 | u_char buf[64]; | ||
779 | cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data; | ||
780 | 769 | ||
781 | local->dingo_ccr = NULL; | 770 | local->dingo_ccr = NULL; |
782 | 771 | ||
783 | DEBUG(0, "config(0x%p)\n", link); | 772 | dev_dbg(&link->dev, "config\n"); |
784 | |||
785 | /* | ||
786 | * This reads the card's CONFIG tuple to find its configuration | ||
787 | * registers. | ||
788 | */ | ||
789 | tuple.Attributes = 0; | ||
790 | tuple.TupleData = buf; | ||
791 | tuple.TupleDataMax = 64; | ||
792 | tuple.TupleOffset = 0; | ||
793 | 773 | ||
794 | /* Is this a valid card */ | 774 | /* Is this a valid card */ |
795 | tuple.DesiredTuple = CISTPL_MANFID; | 775 | if (link->has_manf_id == 0) { |
796 | if ((err=first_tuple(link, &tuple, &parse))) { | ||
797 | printk(KNOT_XIRC "manfid not found in CIS\n"); | 776 | printk(KNOT_XIRC "manfid not found in CIS\n"); |
798 | goto failure; | 777 | goto failure; |
799 | } | 778 | } |
800 | 779 | ||
801 | switch(parse.manfid.manf) { | 780 | switch (link->manf_id) { |
802 | case MANFID_XIRCOM: | 781 | case MANFID_XIRCOM: |
803 | local->manf_str = "Xircom"; | 782 | local->manf_str = "Xircom"; |
804 | break; | 783 | break; |
@@ -817,65 +796,44 @@ xirc2ps_config(struct pcmcia_device * link) | |||
817 | break; | 796 | break; |
818 | default: | 797 | default: |
819 | printk(KNOT_XIRC "Unknown Card Manufacturer ID: 0x%04x\n", | 798 | printk(KNOT_XIRC "Unknown Card Manufacturer ID: 0x%04x\n", |
820 | (unsigned)parse.manfid.manf); | 799 | (unsigned)link->manf_id); |
821 | goto failure; | 800 | goto failure; |
822 | } | 801 | } |
823 | DEBUG(0, "found %s card\n", local->manf_str); | 802 | dev_dbg(&link->dev, "found %s card\n", local->manf_str); |
824 | 803 | ||
825 | if (!set_card_type(link, buf)) { | 804 | if (!set_card_type(link)) { |
826 | printk(KNOT_XIRC "this card is not supported\n"); | 805 | printk(KNOT_XIRC "this card is not supported\n"); |
827 | goto failure; | 806 | goto failure; |
828 | } | 807 | } |
829 | 808 | ||
830 | /* get the ethernet address from the CIS */ | 809 | /* get the ethernet address from the CIS */ |
831 | tuple.DesiredTuple = CISTPL_FUNCE; | 810 | err = pcmcia_get_mac_from_cis(link, dev); |
832 | for (err = first_tuple(link, &tuple, &parse); !err; | 811 | |
833 | err = next_tuple(link, &tuple, &parse)) { | 812 | /* not found: try to get the node-id from tuple 0x89 */ |
834 | /* Once I saw two CISTPL_FUNCE_LAN_NODE_ID entries: | 813 | if (err) { |
835 | * the first one with a length of zero the second correct - | 814 | len = pcmcia_get_tuple(link, 0x89, &buf); |
836 | * so I skip all entries with length 0 */ | 815 | /* data layout looks like tuple 0x22 */ |
837 | if (parse.funce.type == CISTPL_FUNCE_LAN_NODE_ID | 816 | if (buf && len == 8) { |
838 | && ((cistpl_lan_node_id_t *)parse.funce.data)->nb) | 817 | if (*buf == CISTPL_FUNCE_LAN_NODE_ID) { |
839 | break; | 818 | int i; |
840 | } | 819 | for (i = 2; i < 6; i++) |
841 | if (err) { /* not found: try to get the node-id from tuple 0x89 */ | 820 | dev->dev_addr[i] = buf[i+2]; |
842 | tuple.DesiredTuple = 0x89; /* data layout looks like tuple 0x22 */ | 821 | } else |
843 | if ((err = pcmcia_get_first_tuple(link, &tuple)) == 0 && | 822 | err = -1; |
844 | (err = pcmcia_get_tuple_data(link, &tuple)) == 0) { | ||
845 | if (tuple.TupleDataLen == 8 && *buf == CISTPL_FUNCE_LAN_NODE_ID) | ||
846 | memcpy(&parse, buf, 8); | ||
847 | else | ||
848 | err = -1; | ||
849 | } | ||
850 | } | ||
851 | if (err) { /* another try (James Lehmer's CE2 version 4.1)*/ | ||
852 | tuple.DesiredTuple = CISTPL_FUNCE; | ||
853 | for (err = first_tuple(link, &tuple, &parse); !err; | ||
854 | err = next_tuple(link, &tuple, &parse)) { | ||
855 | if (parse.funce.type == 0x02 && parse.funce.data[0] == 1 | ||
856 | && parse.funce.data[1] == 6 && tuple.TupleDataLen == 13) { | ||
857 | buf[1] = 4; | ||
858 | memcpy(&parse, buf+1, 8); | ||
859 | break; | ||
860 | } | 823 | } |
861 | } | 824 | kfree(buf); |
862 | } | 825 | } |
826 | |||
827 | if (err) | ||
828 | err = pcmcia_loop_tuple(link, CISTPL_FUNCE, pcmcia_get_mac_ce, dev); | ||
829 | |||
863 | if (err) { | 830 | if (err) { |
864 | printk(KNOT_XIRC "node-id not found in CIS\n"); | 831 | printk(KNOT_XIRC "node-id not found in CIS\n"); |
865 | goto failure; | 832 | goto failure; |
866 | } | 833 | } |
867 | node_id = (cistpl_lan_node_id_t *)parse.funce.data; | ||
868 | if (node_id->nb != 6) { | ||
869 | printk(KNOT_XIRC "malformed node-id in CIS\n"); | ||
870 | goto failure; | ||
871 | } | ||
872 | for (i=0; i < 6; i++) | ||
873 | dev->dev_addr[i] = node_id->id[i]; | ||
874 | 834 | ||
875 | link->io.IOAddrLines =10; | 835 | link->io.IOAddrLines =10; |
876 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 836 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
877 | link->irq.Attributes = IRQ_HANDLE_PRESENT; | ||
878 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
879 | if (local->modem) { | 837 | if (local->modem) { |
880 | int pass; | 838 | int pass; |
881 | 839 | ||
@@ -916,10 +874,8 @@ xirc2ps_config(struct pcmcia_device * link) | |||
916 | goto port_found; | 874 | goto port_found; |
917 | } | 875 | } |
918 | link->io.BasePort1 = 0; /* let CS decide */ | 876 | link->io.BasePort1 = 0; /* let CS decide */ |
919 | if ((err=pcmcia_request_io(link, &link->io))) { | 877 | if ((err=pcmcia_request_io(link, &link->io))) |
920 | cs_error(link, RequestIO, err); | ||
921 | goto config_error; | 878 | goto config_error; |
922 | } | ||
923 | } | 879 | } |
924 | port_found: | 880 | port_found: |
925 | if (err) | 881 | if (err) |
@@ -929,19 +885,15 @@ xirc2ps_config(struct pcmcia_device * link) | |||
929 | * Now allocate an interrupt line. Note that this does not | 885 | * Now allocate an interrupt line. Note that this does not |
930 | * actually assign a handler to the interrupt. | 886 | * actually assign a handler to the interrupt. |
931 | */ | 887 | */ |
932 | if ((err=pcmcia_request_irq(link, &link->irq))) { | 888 | if ((err=pcmcia_request_irq(link, &link->irq))) |
933 | cs_error(link, RequestIRQ, err); | ||
934 | goto config_error; | 889 | goto config_error; |
935 | } | ||
936 | 890 | ||
937 | /**************** | 891 | /**************** |
938 | * This actually configures the PCMCIA socket -- setting up | 892 | * This actually configures the PCMCIA socket -- setting up |
939 | * the I/O windows and the interrupt mapping. | 893 | * the I/O windows and the interrupt mapping. |
940 | */ | 894 | */ |
941 | if ((err=pcmcia_request_configuration(link, &link->conf))) { | 895 | if ((err=pcmcia_request_configuration(link, &link->conf))) |
942 | cs_error(link, RequestConfiguration, err); | ||
943 | goto config_error; | 896 | goto config_error; |
944 | } | ||
945 | 897 | ||
946 | if (local->dingo) { | 898 | if (local->dingo) { |
947 | conf_reg_t reg; | 899 | conf_reg_t reg; |
@@ -956,17 +908,13 @@ xirc2ps_config(struct pcmcia_device * link) | |||
956 | reg.Action = CS_WRITE; | 908 | reg.Action = CS_WRITE; |
957 | reg.Offset = CISREG_IOBASE_0; | 909 | reg.Offset = CISREG_IOBASE_0; |
958 | reg.Value = link->io.BasePort2 & 0xff; | 910 | reg.Value = link->io.BasePort2 & 0xff; |
959 | if ((err = pcmcia_access_configuration_register(link, ®))) { | 911 | if ((err = pcmcia_access_configuration_register(link, ®))) |
960 | cs_error(link, AccessConfigurationRegister, err); | ||
961 | goto config_error; | 912 | goto config_error; |
962 | } | ||
963 | reg.Action = CS_WRITE; | 913 | reg.Action = CS_WRITE; |
964 | reg.Offset = CISREG_IOBASE_1; | 914 | reg.Offset = CISREG_IOBASE_1; |
965 | reg.Value = (link->io.BasePort2 >> 8) & 0xff; | 915 | reg.Value = (link->io.BasePort2 >> 8) & 0xff; |
966 | if ((err = pcmcia_access_configuration_register(link, ®))) { | 916 | if ((err = pcmcia_access_configuration_register(link, ®))) |
967 | cs_error(link, AccessConfigurationRegister, err); | ||
968 | goto config_error; | 917 | goto config_error; |
969 | } | ||
970 | 918 | ||
971 | /* There is no config entry for the Ethernet part which | 919 | /* There is no config entry for the Ethernet part which |
972 | * is at 0x0800. So we allocate a window into the attribute | 920 | * is at 0x0800. So we allocate a window into the attribute |
@@ -975,17 +923,14 @@ xirc2ps_config(struct pcmcia_device * link) | |||
975 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 923 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
976 | req.Base = req.Size = 0; | 924 | req.Base = req.Size = 0; |
977 | req.AccessSpeed = 0; | 925 | req.AccessSpeed = 0; |
978 | if ((err = pcmcia_request_window(&link, &req, &link->win))) { | 926 | if ((err = pcmcia_request_window(link, &req, &link->win))) |
979 | cs_error(link, RequestWindow, err); | ||
980 | goto config_error; | 927 | goto config_error; |
981 | } | 928 | |
982 | local->dingo_ccr = ioremap(req.Base,0x1000) + 0x0800; | 929 | local->dingo_ccr = ioremap(req.Base,0x1000) + 0x0800; |
983 | mem.CardOffset = 0x0; | 930 | mem.CardOffset = 0x0; |
984 | mem.Page = 0; | 931 | mem.Page = 0; |
985 | if ((err = pcmcia_map_mem_page(link->win, &mem))) { | 932 | if ((err = pcmcia_map_mem_page(link, link->win, &mem))) |
986 | cs_error(link, MapMemPage, err); | ||
987 | goto config_error; | 933 | goto config_error; |
988 | } | ||
989 | 934 | ||
990 | /* Setup the CCRs; there are no infos in the CIS about the Ethernet | 935 | /* Setup the CCRs; there are no infos in the CIS about the Ethernet |
991 | * part. | 936 | * part. |
@@ -1044,7 +989,7 @@ xirc2ps_config(struct pcmcia_device * link) | |||
1044 | do_reset(dev, 1); /* a kludge to make the cem56 work */ | 989 | do_reset(dev, 1); /* a kludge to make the cem56 work */ |
1045 | 990 | ||
1046 | link->dev_node = &local->node; | 991 | link->dev_node = &local->node; |
1047 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 992 | SET_NETDEV_DEV(dev, &link->dev); |
1048 | 993 | ||
1049 | if ((err=register_netdev(dev))) { | 994 | if ((err=register_netdev(dev))) { |
1050 | printk(KNOT_XIRC "register_netdev() failed\n"); | 995 | printk(KNOT_XIRC "register_netdev() failed\n"); |
@@ -1077,7 +1022,7 @@ xirc2ps_config(struct pcmcia_device * link) | |||
1077 | static void | 1022 | static void |
1078 | xirc2ps_release(struct pcmcia_device *link) | 1023 | xirc2ps_release(struct pcmcia_device *link) |
1079 | { | 1024 | { |
1080 | DEBUG(0, "release(0x%p)\n", link); | 1025 | dev_dbg(&link->dev, "release\n"); |
1081 | 1026 | ||
1082 | if (link->win) { | 1027 | if (link->win) { |
1083 | struct net_device *dev = link->priv; | 1028 | struct net_device *dev = link->priv; |
@@ -1144,7 +1089,7 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1144 | PutByte(XIRCREG_CR, 0); | 1089 | PutByte(XIRCREG_CR, 0); |
1145 | } | 1090 | } |
1146 | 1091 | ||
1147 | DEBUG(6, "%s: interrupt %d at %#x.\n", dev->name, irq, ioaddr); | 1092 | pr_debug("%s: interrupt %d at %#x.\n", dev->name, irq, ioaddr); |
1148 | 1093 | ||
1149 | saved_page = GetByte(XIRCREG_PR); | 1094 | saved_page = GetByte(XIRCREG_PR); |
1150 | /* Read the ISR to see whats the cause for the interrupt. | 1095 | /* Read the ISR to see whats the cause for the interrupt. |
@@ -1154,7 +1099,7 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1154 | bytes_rcvd = 0; | 1099 | bytes_rcvd = 0; |
1155 | loop_entry: | 1100 | loop_entry: |
1156 | if (int_status == 0xff) { /* card may be ejected */ | 1101 | if (int_status == 0xff) { /* card may be ejected */ |
1157 | DEBUG(3, "%s: interrupt %d for dead card\n", dev->name, irq); | 1102 | pr_debug("%s: interrupt %d for dead card\n", dev->name, irq); |
1158 | goto leave; | 1103 | goto leave; |
1159 | } | 1104 | } |
1160 | eth_status = GetByte(XIRCREG_ESR); | 1105 | eth_status = GetByte(XIRCREG_ESR); |
@@ -1167,7 +1112,7 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1167 | PutByte(XIRCREG40_TXST0, 0); | 1112 | PutByte(XIRCREG40_TXST0, 0); |
1168 | PutByte(XIRCREG40_TXST1, 0); | 1113 | PutByte(XIRCREG40_TXST1, 0); |
1169 | 1114 | ||
1170 | DEBUG(3, "%s: ISR=%#2.2x ESR=%#2.2x RSR=%#2.2x TSR=%#4.4x\n", | 1115 | pr_debug("%s: ISR=%#2.2x ESR=%#2.2x RSR=%#2.2x TSR=%#4.4x\n", |
1171 | dev->name, int_status, eth_status, rx_status, tx_status); | 1116 | dev->name, int_status, eth_status, rx_status, tx_status); |
1172 | 1117 | ||
1173 | /***** receive section ******/ | 1118 | /***** receive section ******/ |
@@ -1178,14 +1123,14 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1178 | /* too many bytes received during this int, drop the rest of the | 1123 | /* too many bytes received during this int, drop the rest of the |
1179 | * packets */ | 1124 | * packets */ |
1180 | dev->stats.rx_dropped++; | 1125 | dev->stats.rx_dropped++; |
1181 | DEBUG(2, "%s: RX drop, too much done\n", dev->name); | 1126 | pr_debug("%s: RX drop, too much done\n", dev->name); |
1182 | } else if (rsr & PktRxOk) { | 1127 | } else if (rsr & PktRxOk) { |
1183 | struct sk_buff *skb; | 1128 | struct sk_buff *skb; |
1184 | 1129 | ||
1185 | pktlen = GetWord(XIRCREG0_RBC); | 1130 | pktlen = GetWord(XIRCREG0_RBC); |
1186 | bytes_rcvd += pktlen; | 1131 | bytes_rcvd += pktlen; |
1187 | 1132 | ||
1188 | DEBUG(5, "rsr=%#02x packet_length=%u\n", rsr, pktlen); | 1133 | pr_debug("rsr=%#02x packet_length=%u\n", rsr, pktlen); |
1189 | 1134 | ||
1190 | skb = dev_alloc_skb(pktlen+3); /* 1 extra so we can use insw */ | 1135 | skb = dev_alloc_skb(pktlen+3); /* 1 extra so we can use insw */ |
1191 | if (!skb) { | 1136 | if (!skb) { |
@@ -1253,19 +1198,19 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1253 | dev->stats.multicast++; | 1198 | dev->stats.multicast++; |
1254 | } | 1199 | } |
1255 | } else { /* bad packet */ | 1200 | } else { /* bad packet */ |
1256 | DEBUG(5, "rsr=%#02x\n", rsr); | 1201 | pr_debug("rsr=%#02x\n", rsr); |
1257 | } | 1202 | } |
1258 | if (rsr & PktTooLong) { | 1203 | if (rsr & PktTooLong) { |
1259 | dev->stats.rx_frame_errors++; | 1204 | dev->stats.rx_frame_errors++; |
1260 | DEBUG(3, "%s: Packet too long\n", dev->name); | 1205 | pr_debug("%s: Packet too long\n", dev->name); |
1261 | } | 1206 | } |
1262 | if (rsr & CRCErr) { | 1207 | if (rsr & CRCErr) { |
1263 | dev->stats.rx_crc_errors++; | 1208 | dev->stats.rx_crc_errors++; |
1264 | DEBUG(3, "%s: CRC error\n", dev->name); | 1209 | pr_debug("%s: CRC error\n", dev->name); |
1265 | } | 1210 | } |
1266 | if (rsr & AlignErr) { | 1211 | if (rsr & AlignErr) { |
1267 | dev->stats.rx_fifo_errors++; /* okay ? */ | 1212 | dev->stats.rx_fifo_errors++; /* okay ? */ |
1268 | DEBUG(3, "%s: Alignment error\n", dev->name); | 1213 | pr_debug("%s: Alignment error\n", dev->name); |
1269 | } | 1214 | } |
1270 | 1215 | ||
1271 | /* clear the received/dropped/error packet */ | 1216 | /* clear the received/dropped/error packet */ |
@@ -1277,7 +1222,7 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1277 | if (rx_status & 0x10) { /* Receive overrun */ | 1222 | if (rx_status & 0x10) { /* Receive overrun */ |
1278 | dev->stats.rx_over_errors++; | 1223 | dev->stats.rx_over_errors++; |
1279 | PutByte(XIRCREG_CR, ClearRxOvrun); | 1224 | PutByte(XIRCREG_CR, ClearRxOvrun); |
1280 | DEBUG(3, "receive overrun cleared\n"); | 1225 | pr_debug("receive overrun cleared\n"); |
1281 | } | 1226 | } |
1282 | 1227 | ||
1283 | /***** transmit section ******/ | 1228 | /***** transmit section ******/ |
@@ -1290,13 +1235,13 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1290 | if (nn < n) /* rollover */ | 1235 | if (nn < n) /* rollover */ |
1291 | dev->stats.tx_packets += 256 - n; | 1236 | dev->stats.tx_packets += 256 - n; |
1292 | else if (n == nn) { /* happens sometimes - don't know why */ | 1237 | else if (n == nn) { /* happens sometimes - don't know why */ |
1293 | DEBUG(0, "PTR not changed?\n"); | 1238 | pr_debug("PTR not changed?\n"); |
1294 | } else | 1239 | } else |
1295 | dev->stats.tx_packets += lp->last_ptr_value - n; | 1240 | dev->stats.tx_packets += lp->last_ptr_value - n; |
1296 | netif_wake_queue(dev); | 1241 | netif_wake_queue(dev); |
1297 | } | 1242 | } |
1298 | if (tx_status & 0x0002) { /* Execessive collissions */ | 1243 | if (tx_status & 0x0002) { /* Execessive collissions */ |
1299 | DEBUG(0, "tx restarted due to execssive collissions\n"); | 1244 | pr_debug("tx restarted due to execssive collissions\n"); |
1300 | PutByte(XIRCREG_CR, RestartTx); /* restart transmitter process */ | 1245 | PutByte(XIRCREG_CR, RestartTx); /* restart transmitter process */ |
1301 | } | 1246 | } |
1302 | if (tx_status & 0x0040) | 1247 | if (tx_status & 0x0040) |
@@ -1315,14 +1260,14 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1315 | maxrx_bytes = 2000; | 1260 | maxrx_bytes = 2000; |
1316 | else if (maxrx_bytes > 22000) | 1261 | else if (maxrx_bytes > 22000) |
1317 | maxrx_bytes = 22000; | 1262 | maxrx_bytes = 22000; |
1318 | DEBUG(1, "set maxrx=%u (rcvd=%u ticks=%lu)\n", | 1263 | pr_debug("set maxrx=%u (rcvd=%u ticks=%lu)\n", |
1319 | maxrx_bytes, bytes_rcvd, duration); | 1264 | maxrx_bytes, bytes_rcvd, duration); |
1320 | } else if (!duration && maxrx_bytes < 22000) { | 1265 | } else if (!duration && maxrx_bytes < 22000) { |
1321 | /* now much faster */ | 1266 | /* now much faster */ |
1322 | maxrx_bytes += 2000; | 1267 | maxrx_bytes += 2000; |
1323 | if (maxrx_bytes > 22000) | 1268 | if (maxrx_bytes > 22000) |
1324 | maxrx_bytes = 22000; | 1269 | maxrx_bytes = 22000; |
1325 | DEBUG(1, "set maxrx=%u\n", maxrx_bytes); | 1270 | pr_debug("set maxrx=%u\n", maxrx_bytes); |
1326 | } | 1271 | } |
1327 | } | 1272 | } |
1328 | 1273 | ||
@@ -1372,7 +1317,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1372 | unsigned freespace; | 1317 | unsigned freespace; |
1373 | unsigned pktlen = skb->len; | 1318 | unsigned pktlen = skb->len; |
1374 | 1319 | ||
1375 | DEBUG(1, "do_start_xmit(skb=%p, dev=%p) len=%u\n", | 1320 | pr_debug("do_start_xmit(skb=%p, dev=%p) len=%u\n", |
1376 | skb, dev, pktlen); | 1321 | skb, dev, pktlen); |
1377 | 1322 | ||
1378 | 1323 | ||
@@ -1398,7 +1343,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1398 | freespace &= 0x7fff; | 1343 | freespace &= 0x7fff; |
1399 | /* TRS doesn't work - (indeed it is eliminated with sil-rev 1) */ | 1344 | /* TRS doesn't work - (indeed it is eliminated with sil-rev 1) */ |
1400 | okay = pktlen +2 < freespace; | 1345 | okay = pktlen +2 < freespace; |
1401 | DEBUG(2 + (okay ? 2 : 0), "%s: avail. tx space=%u%s\n", | 1346 | pr_debug("%s: avail. tx space=%u%s\n", |
1402 | dev->name, freespace, okay ? " (okay)":" (not enough)"); | 1347 | dev->name, freespace, okay ? " (okay)":" (not enough)"); |
1403 | if (!okay) { /* not enough space */ | 1348 | if (!okay) { /* not enough space */ |
1404 | return NETDEV_TX_BUSY; /* upper layer may decide to requeue this packet */ | 1349 | return NETDEV_TX_BUSY; /* upper layer may decide to requeue this packet */ |
@@ -1500,7 +1445,7 @@ do_config(struct net_device *dev, struct ifmap *map) | |||
1500 | { | 1445 | { |
1501 | local_info_t *local = netdev_priv(dev); | 1446 | local_info_t *local = netdev_priv(dev); |
1502 | 1447 | ||
1503 | DEBUG(0, "do_config(%p)\n", dev); | 1448 | pr_debug("do_config(%p)\n", dev); |
1504 | if (map->port != 255 && map->port != dev->if_port) { | 1449 | if (map->port != 255 && map->port != dev->if_port) { |
1505 | if (map->port > 4) | 1450 | if (map->port > 4) |
1506 | return -EINVAL; | 1451 | return -EINVAL; |
@@ -1527,7 +1472,7 @@ do_open(struct net_device *dev) | |||
1527 | local_info_t *lp = netdev_priv(dev); | 1472 | local_info_t *lp = netdev_priv(dev); |
1528 | struct pcmcia_device *link = lp->p_dev; | 1473 | struct pcmcia_device *link = lp->p_dev; |
1529 | 1474 | ||
1530 | DEBUG(0, "do_open(%p)\n", dev); | 1475 | dev_dbg(&link->dev, "do_open(%p)\n", dev); |
1531 | 1476 | ||
1532 | /* Check that the PCMCIA card is still here. */ | 1477 | /* Check that the PCMCIA card is still here. */ |
1533 | /* Physical device present signature. */ | 1478 | /* Physical device present signature. */ |
@@ -1561,7 +1506,7 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1561 | unsigned int ioaddr = dev->base_addr; | 1506 | unsigned int ioaddr = dev->base_addr; |
1562 | struct mii_ioctl_data *data = if_mii(rq); | 1507 | struct mii_ioctl_data *data = if_mii(rq); |
1563 | 1508 | ||
1564 | DEBUG(1, "%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n", | 1509 | pr_debug("%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n", |
1565 | dev->name, rq->ifr_ifrn.ifrn_name, cmd, | 1510 | dev->name, rq->ifr_ifrn.ifrn_name, cmd, |
1566 | data->phy_id, data->reg_num, data->val_in, data->val_out); | 1511 | data->phy_id, data->reg_num, data->val_in, data->val_out); |
1567 | 1512 | ||
@@ -1610,7 +1555,7 @@ do_reset(struct net_device *dev, int full) | |||
1610 | unsigned int ioaddr = dev->base_addr; | 1555 | unsigned int ioaddr = dev->base_addr; |
1611 | unsigned value; | 1556 | unsigned value; |
1612 | 1557 | ||
1613 | DEBUG(0, "%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full); | 1558 | pr_debug("%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full); |
1614 | 1559 | ||
1615 | hardreset(dev); | 1560 | hardreset(dev); |
1616 | PutByte(XIRCREG_CR, SoftReset); /* set */ | 1561 | PutByte(XIRCREG_CR, SoftReset); /* set */ |
@@ -1648,8 +1593,8 @@ do_reset(struct net_device *dev, int full) | |||
1648 | } | 1593 | } |
1649 | msleep(40); /* wait 40 msec to let it complete */ | 1594 | msleep(40); /* wait 40 msec to let it complete */ |
1650 | 1595 | ||
1651 | #ifdef PCMCIA_DEBUG | 1596 | #if 0 |
1652 | if (pc_debug) { | 1597 | { |
1653 | SelectPage(0); | 1598 | SelectPage(0); |
1654 | value = GetByte(XIRCREG_ESR); /* read the ESR */ | 1599 | value = GetByte(XIRCREG_ESR); /* read the ESR */ |
1655 | printk(KERN_DEBUG "%s: ESR is: %#02x\n", dev->name, value); | 1600 | printk(KERN_DEBUG "%s: ESR is: %#02x\n", dev->name, value); |
@@ -1666,7 +1611,7 @@ do_reset(struct net_device *dev, int full) | |||
1666 | value |= DisableLinkPulse; | 1611 | value |= DisableLinkPulse; |
1667 | PutByte(XIRCREG1_ECR, value); | 1612 | PutByte(XIRCREG1_ECR, value); |
1668 | #endif | 1613 | #endif |
1669 | DEBUG(0, "%s: ECR is: %#02x\n", dev->name, value); | 1614 | pr_debug("%s: ECR is: %#02x\n", dev->name, value); |
1670 | 1615 | ||
1671 | SelectPage(0x42); | 1616 | SelectPage(0x42); |
1672 | PutByte(XIRCREG42_SWC0, 0x20); /* disable source insertion */ | 1617 | PutByte(XIRCREG42_SWC0, 0x20); /* disable source insertion */ |
@@ -1844,7 +1789,7 @@ do_powerdown(struct net_device *dev) | |||
1844 | 1789 | ||
1845 | unsigned int ioaddr = dev->base_addr; | 1790 | unsigned int ioaddr = dev->base_addr; |
1846 | 1791 | ||
1847 | DEBUG(0, "do_powerdown(%p)\n", dev); | 1792 | pr_debug("do_powerdown(%p)\n", dev); |
1848 | 1793 | ||
1849 | SelectPage(4); | 1794 | SelectPage(4); |
1850 | PutByte(XIRCREG4_GPR1, 0); /* clear bit 0: power down */ | 1795 | PutByte(XIRCREG4_GPR1, 0); /* clear bit 0: power down */ |
@@ -1858,7 +1803,7 @@ do_stop(struct net_device *dev) | |||
1858 | local_info_t *lp = netdev_priv(dev); | 1803 | local_info_t *lp = netdev_priv(dev); |
1859 | struct pcmcia_device *link = lp->p_dev; | 1804 | struct pcmcia_device *link = lp->p_dev; |
1860 | 1805 | ||
1861 | DEBUG(0, "do_stop(%p)\n", dev); | 1806 | dev_dbg(&link->dev, "do_stop(%p)\n", dev); |
1862 | 1807 | ||
1863 | if (!link) | 1808 | if (!link) |
1864 | return -ENODEV; | 1809 | return -ENODEV; |
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index d0593ed9170e..f6036fb42319 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -43,21 +43,6 @@ | |||
43 | 43 | ||
44 | #include "airo.h" | 44 | #include "airo.h" |
45 | 45 | ||
46 | /* | ||
47 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
48 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
49 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
50 | be present but disabled -- but it can then be enabled for specific | ||
51 | modules at load time with a 'pc_debug=#' option to insmod. | ||
52 | */ | ||
53 | #ifdef PCMCIA_DEBUG | ||
54 | static int pc_debug = PCMCIA_DEBUG; | ||
55 | module_param(pc_debug, int, 0); | ||
56 | static char *version = "$Revision: 1.2 $"; | ||
57 | #define DEBUG(n, args...) if (pc_debug > (n)) printk(KERN_DEBUG args); | ||
58 | #else | ||
59 | #define DEBUG(n, args...) | ||
60 | #endif | ||
61 | 46 | ||
62 | /*====================================================================*/ | 47 | /*====================================================================*/ |
63 | 48 | ||
@@ -145,11 +130,10 @@ static int airo_probe(struct pcmcia_device *p_dev) | |||
145 | { | 130 | { |
146 | local_info_t *local; | 131 | local_info_t *local; |
147 | 132 | ||
148 | DEBUG(0, "airo_attach()\n"); | 133 | dev_dbg(&p_dev->dev, "airo_attach()\n"); |
149 | 134 | ||
150 | /* Interrupt setup */ | 135 | /* Interrupt setup */ |
151 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 136 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
152 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
153 | p_dev->irq.Handler = NULL; | 137 | p_dev->irq.Handler = NULL; |
154 | 138 | ||
155 | /* | 139 | /* |
@@ -184,7 +168,7 @@ static int airo_probe(struct pcmcia_device *p_dev) | |||
184 | 168 | ||
185 | static void airo_detach(struct pcmcia_device *link) | 169 | static void airo_detach(struct pcmcia_device *link) |
186 | { | 170 | { |
187 | DEBUG(0, "airo_detach(0x%p)\n", link); | 171 | dev_dbg(&link->dev, "airo_detach\n"); |
188 | 172 | ||
189 | airo_release(link); | 173 | airo_release(link); |
190 | 174 | ||
@@ -204,9 +188,6 @@ static void airo_detach(struct pcmcia_device *link) | |||
204 | 188 | ||
205 | ======================================================================*/ | 189 | ======================================================================*/ |
206 | 190 | ||
207 | #define CS_CHECK(fn, ret) \ | ||
208 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
209 | |||
210 | static int airo_cs_config_check(struct pcmcia_device *p_dev, | 191 | static int airo_cs_config_check(struct pcmcia_device *p_dev, |
211 | cistpl_cftable_entry_t *cfg, | 192 | cistpl_cftable_entry_t *cfg, |
212 | cistpl_cftable_entry_t *dflt, | 193 | cistpl_cftable_entry_t *dflt, |
@@ -275,11 +256,11 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev, | |||
275 | req->Base = mem->win[0].host_addr; | 256 | req->Base = mem->win[0].host_addr; |
276 | req->Size = mem->win[0].len; | 257 | req->Size = mem->win[0].len; |
277 | req->AccessSpeed = 0; | 258 | req->AccessSpeed = 0; |
278 | if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0) | 259 | if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0) |
279 | return -ENODEV; | 260 | return -ENODEV; |
280 | map.Page = 0; | 261 | map.Page = 0; |
281 | map.CardOffset = mem->win[0].card_addr; | 262 | map.CardOffset = mem->win[0].card_addr; |
282 | if (pcmcia_map_mem_page(p_dev->win, &map) != 0) | 263 | if (pcmcia_map_mem_page(p_dev, p_dev->win, &map) != 0) |
283 | return -ENODEV; | 264 | return -ENODEV; |
284 | } | 265 | } |
285 | /* If we got this far, we're cool! */ | 266 | /* If we got this far, we're cool! */ |
@@ -291,11 +272,11 @@ static int airo_config(struct pcmcia_device *link) | |||
291 | { | 272 | { |
292 | local_info_t *dev; | 273 | local_info_t *dev; |
293 | win_req_t *req; | 274 | win_req_t *req; |
294 | int last_fn, last_ret; | 275 | int ret; |
295 | 276 | ||
296 | dev = link->priv; | 277 | dev = link->priv; |
297 | 278 | ||
298 | DEBUG(0, "airo_config(0x%p)\n", link); | 279 | dev_dbg(&link->dev, "airo_config\n"); |
299 | 280 | ||
300 | req = kzalloc(sizeof(win_req_t), GFP_KERNEL); | 281 | req = kzalloc(sizeof(win_req_t), GFP_KERNEL); |
301 | if (!req) | 282 | if (!req) |
@@ -315,8 +296,8 @@ static int airo_config(struct pcmcia_device *link) | |||
315 | * and most client drivers will only use the CIS to fill in | 296 | * and most client drivers will only use the CIS to fill in |
316 | * implementation-defined details. | 297 | * implementation-defined details. |
317 | */ | 298 | */ |
318 | last_ret = pcmcia_loop_config(link, airo_cs_config_check, req); | 299 | ret = pcmcia_loop_config(link, airo_cs_config_check, req); |
319 | if (last_ret) | 300 | if (ret) |
320 | goto failed; | 301 | goto failed; |
321 | 302 | ||
322 | /* | 303 | /* |
@@ -324,21 +305,25 @@ static int airo_config(struct pcmcia_device *link) | |||
324 | handler to the interrupt, unless the 'Handler' member of the | 305 | handler to the interrupt, unless the 'Handler' member of the |
325 | irq structure is initialized. | 306 | irq structure is initialized. |
326 | */ | 307 | */ |
327 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 308 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
328 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 309 | ret = pcmcia_request_irq(link, &link->irq); |
310 | if (ret) | ||
311 | goto failed; | ||
312 | } | ||
329 | 313 | ||
330 | /* | 314 | /* |
331 | This actually configures the PCMCIA socket -- setting up | 315 | This actually configures the PCMCIA socket -- setting up |
332 | the I/O windows and the interrupt mapping, and putting the | 316 | the I/O windows and the interrupt mapping, and putting the |
333 | card and host interface into "Memory and IO" mode. | 317 | card and host interface into "Memory and IO" mode. |
334 | */ | 318 | */ |
335 | CS_CHECK(RequestConfiguration, | 319 | ret = pcmcia_request_configuration(link, &link->conf); |
336 | pcmcia_request_configuration(link, &link->conf)); | 320 | if (ret) |
321 | goto failed; | ||
337 | ((local_info_t *)link->priv)->eth_dev = | 322 | ((local_info_t *)link->priv)->eth_dev = |
338 | init_airo_card(link->irq.AssignedIRQ, | 323 | init_airo_card(link->irq.AssignedIRQ, |
339 | link->io.BasePort1, 1, &handle_to_dev(link)); | 324 | link->io.BasePort1, 1, &link->dev); |
340 | if (!((local_info_t *)link->priv)->eth_dev) | 325 | if (!((local_info_t *)link->priv)->eth_dev) |
341 | goto cs_failed; | 326 | goto failed; |
342 | 327 | ||
343 | /* | 328 | /* |
344 | At this point, the dev_node_t structure(s) need to be | 329 | At this point, the dev_node_t structure(s) need to be |
@@ -368,8 +353,6 @@ static int airo_config(struct pcmcia_device *link) | |||
368 | kfree(req); | 353 | kfree(req); |
369 | return 0; | 354 | return 0; |
370 | 355 | ||
371 | cs_failed: | ||
372 | cs_error(link, last_fn, last_ret); | ||
373 | failed: | 356 | failed: |
374 | airo_release(link); | 357 | airo_release(link); |
375 | kfree(req); | 358 | kfree(req); |
@@ -386,7 +369,7 @@ static int airo_config(struct pcmcia_device *link) | |||
386 | 369 | ||
387 | static void airo_release(struct pcmcia_device *link) | 370 | static void airo_release(struct pcmcia_device *link) |
388 | { | 371 | { |
389 | DEBUG(0, "airo_release(0x%p)\n", link); | 372 | dev_dbg(&link->dev, "airo_release\n"); |
390 | pcmcia_disable_device(link); | 373 | pcmcia_disable_device(link); |
391 | } | 374 | } |
392 | 375 | ||
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index ddaa859c3491..32407911842f 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c | |||
@@ -55,22 +55,6 @@ | |||
55 | 55 | ||
56 | #include "atmel.h" | 56 | #include "atmel.h" |
57 | 57 | ||
58 | /* | ||
59 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
60 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
61 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
62 | be present but disabled -- but it can then be enabled for specific | ||
63 | modules at load time with a 'pc_debug=#' option to insmod. | ||
64 | */ | ||
65 | |||
66 | #ifdef PCMCIA_DEBUG | ||
67 | static int pc_debug = PCMCIA_DEBUG; | ||
68 | module_param(pc_debug, int, 0); | ||
69 | static char *version = "$Revision: 1.2 $"; | ||
70 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); | ||
71 | #else | ||
72 | #define DEBUG(n, args...) | ||
73 | #endif | ||
74 | 58 | ||
75 | /*====================================================================*/ | 59 | /*====================================================================*/ |
76 | 60 | ||
@@ -155,11 +139,10 @@ static int atmel_probe(struct pcmcia_device *p_dev) | |||
155 | { | 139 | { |
156 | local_info_t *local; | 140 | local_info_t *local; |
157 | 141 | ||
158 | DEBUG(0, "atmel_attach()\n"); | 142 | dev_dbg(&p_dev->dev, "atmel_attach()\n"); |
159 | 143 | ||
160 | /* Interrupt setup */ | 144 | /* Interrupt setup */ |
161 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 145 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
162 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
163 | p_dev->irq.Handler = NULL; | 146 | p_dev->irq.Handler = NULL; |
164 | 147 | ||
165 | /* | 148 | /* |
@@ -194,7 +177,7 @@ static int atmel_probe(struct pcmcia_device *p_dev) | |||
194 | 177 | ||
195 | static void atmel_detach(struct pcmcia_device *link) | 178 | static void atmel_detach(struct pcmcia_device *link) |
196 | { | 179 | { |
197 | DEBUG(0, "atmel_detach(0x%p)\n", link); | 180 | dev_dbg(&link->dev, "atmel_detach\n"); |
198 | 181 | ||
199 | atmel_release(link); | 182 | atmel_release(link); |
200 | 183 | ||
@@ -209,9 +192,6 @@ static void atmel_detach(struct pcmcia_device *link) | |||
209 | 192 | ||
210 | ======================================================================*/ | 193 | ======================================================================*/ |
211 | 194 | ||
212 | #define CS_CHECK(fn, ret) \ | ||
213 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
214 | |||
215 | /* Call-back function to interrogate PCMCIA-specific information | 195 | /* Call-back function to interrogate PCMCIA-specific information |
216 | about the current existance of the card */ | 196 | about the current existance of the card */ |
217 | static int card_present(void *arg) | 197 | static int card_present(void *arg) |
@@ -275,13 +255,13 @@ static int atmel_config_check(struct pcmcia_device *p_dev, | |||
275 | static int atmel_config(struct pcmcia_device *link) | 255 | static int atmel_config(struct pcmcia_device *link) |
276 | { | 256 | { |
277 | local_info_t *dev; | 257 | local_info_t *dev; |
278 | int last_fn, last_ret; | 258 | int ret; |
279 | struct pcmcia_device_id *did; | 259 | struct pcmcia_device_id *did; |
280 | 260 | ||
281 | dev = link->priv; | 261 | dev = link->priv; |
282 | did = dev_get_drvdata(&handle_to_dev(link)); | 262 | did = dev_get_drvdata(&link->dev); |
283 | 263 | ||
284 | DEBUG(0, "atmel_config(0x%p)\n", link); | 264 | dev_dbg(&link->dev, "atmel_config\n"); |
285 | 265 | ||
286 | /* | 266 | /* |
287 | In this loop, we scan the CIS for configuration table entries, | 267 | In this loop, we scan the CIS for configuration table entries, |
@@ -303,31 +283,36 @@ static int atmel_config(struct pcmcia_device *link) | |||
303 | handler to the interrupt, unless the 'Handler' member of the | 283 | handler to the interrupt, unless the 'Handler' member of the |
304 | irq structure is initialized. | 284 | irq structure is initialized. |
305 | */ | 285 | */ |
306 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 286 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
307 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 287 | ret = pcmcia_request_irq(link, &link->irq); |
288 | if (ret) | ||
289 | goto failed; | ||
290 | } | ||
308 | 291 | ||
309 | /* | 292 | /* |
310 | This actually configures the PCMCIA socket -- setting up | 293 | This actually configures the PCMCIA socket -- setting up |
311 | the I/O windows and the interrupt mapping, and putting the | 294 | the I/O windows and the interrupt mapping, and putting the |
312 | card and host interface into "Memory and IO" mode. | 295 | card and host interface into "Memory and IO" mode. |
313 | */ | 296 | */ |
314 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 297 | ret = pcmcia_request_configuration(link, &link->conf); |
298 | if (ret) | ||
299 | goto failed; | ||
315 | 300 | ||
316 | if (link->irq.AssignedIRQ == 0) { | 301 | if (link->irq.AssignedIRQ == 0) { |
317 | printk(KERN_ALERT | 302 | printk(KERN_ALERT |
318 | "atmel: cannot assign IRQ: check that CONFIG_ISA is set in kernel config."); | 303 | "atmel: cannot assign IRQ: check that CONFIG_ISA is set in kernel config."); |
319 | goto cs_failed; | 304 | goto failed; |
320 | } | 305 | } |
321 | 306 | ||
322 | ((local_info_t*)link->priv)->eth_dev = | 307 | ((local_info_t*)link->priv)->eth_dev = |
323 | init_atmel_card(link->irq.AssignedIRQ, | 308 | init_atmel_card(link->irq.AssignedIRQ, |
324 | link->io.BasePort1, | 309 | link->io.BasePort1, |
325 | did ? did->driver_info : ATMEL_FW_TYPE_NONE, | 310 | did ? did->driver_info : ATMEL_FW_TYPE_NONE, |
326 | &handle_to_dev(link), | 311 | &link->dev, |
327 | card_present, | 312 | card_present, |
328 | link); | 313 | link); |
329 | if (!((local_info_t*)link->priv)->eth_dev) | 314 | if (!((local_info_t*)link->priv)->eth_dev) |
330 | goto cs_failed; | 315 | goto failed; |
331 | 316 | ||
332 | 317 | ||
333 | /* | 318 | /* |
@@ -340,8 +325,6 @@ static int atmel_config(struct pcmcia_device *link) | |||
340 | 325 | ||
341 | return 0; | 326 | return 0; |
342 | 327 | ||
343 | cs_failed: | ||
344 | cs_error(link, last_fn, last_ret); | ||
345 | failed: | 328 | failed: |
346 | atmel_release(link); | 329 | atmel_release(link); |
347 | return -ENODEV; | 330 | return -ENODEV; |
@@ -359,7 +342,7 @@ static void atmel_release(struct pcmcia_device *link) | |||
359 | { | 342 | { |
360 | struct net_device *dev = ((local_info_t*)link->priv)->eth_dev; | 343 | struct net_device *dev = ((local_info_t*)link->priv)->eth_dev; |
361 | 344 | ||
362 | DEBUG(0, "atmel_release(0x%p)\n", link); | 345 | dev_dbg(&link->dev, "atmel_release\n"); |
363 | 346 | ||
364 | if (dev) | 347 | if (dev) |
365 | stop_atmel_card(dev); | 348 | stop_atmel_card(dev); |
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 6c3a74964ab8..984174bc7b0f 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
@@ -65,35 +65,15 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) | |||
65 | struct ssb_bus *ssb; | 65 | struct ssb_bus *ssb; |
66 | win_req_t win; | 66 | win_req_t win; |
67 | memreq_t mem; | 67 | memreq_t mem; |
68 | tuple_t tuple; | ||
69 | cisparse_t parse; | ||
70 | int err = -ENOMEM; | 68 | int err = -ENOMEM; |
71 | int res = 0; | 69 | int res = 0; |
72 | unsigned char buf[64]; | ||
73 | 70 | ||
74 | ssb = kzalloc(sizeof(*ssb), GFP_KERNEL); | 71 | ssb = kzalloc(sizeof(*ssb), GFP_KERNEL); |
75 | if (!ssb) | 72 | if (!ssb) |
76 | goto out_error; | 73 | goto out_error; |
77 | 74 | ||
78 | err = -ENODEV; | 75 | err = -ENODEV; |
79 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
80 | tuple.Attributes = 0; | ||
81 | tuple.TupleData = buf; | ||
82 | tuple.TupleDataMax = sizeof(buf); | ||
83 | tuple.TupleOffset = 0; | ||
84 | 76 | ||
85 | res = pcmcia_get_first_tuple(dev, &tuple); | ||
86 | if (res != 0) | ||
87 | goto err_kfree_ssb; | ||
88 | res = pcmcia_get_tuple_data(dev, &tuple); | ||
89 | if (res != 0) | ||
90 | goto err_kfree_ssb; | ||
91 | res = pcmcia_parse_tuple(&tuple, &parse); | ||
92 | if (res != 0) | ||
93 | goto err_kfree_ssb; | ||
94 | |||
95 | dev->conf.ConfigBase = parse.config.base; | ||
96 | dev->conf.Present = parse.config.rmask[0]; | ||
97 | dev->conf.Attributes = CONF_ENABLE_IRQ; | 77 | dev->conf.Attributes = CONF_ENABLE_IRQ; |
98 | dev->conf.IntType = INT_MEMORY_AND_IO; | 78 | dev->conf.IntType = INT_MEMORY_AND_IO; |
99 | 79 | ||
@@ -107,20 +87,18 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) | |||
107 | win.Base = 0; | 87 | win.Base = 0; |
108 | win.Size = SSB_CORE_SIZE; | 88 | win.Size = SSB_CORE_SIZE; |
109 | win.AccessSpeed = 250; | 89 | win.AccessSpeed = 250; |
110 | res = pcmcia_request_window(&dev, &win, &dev->win); | 90 | res = pcmcia_request_window(dev, &win, &dev->win); |
111 | if (res != 0) | 91 | if (res != 0) |
112 | goto err_kfree_ssb; | 92 | goto err_kfree_ssb; |
113 | 93 | ||
114 | mem.CardOffset = 0; | 94 | mem.CardOffset = 0; |
115 | mem.Page = 0; | 95 | mem.Page = 0; |
116 | res = pcmcia_map_mem_page(dev->win, &mem); | 96 | res = pcmcia_map_mem_page(dev, dev->win, &mem); |
117 | if (res != 0) | 97 | if (res != 0) |
118 | goto err_disable; | 98 | goto err_disable; |
119 | 99 | ||
120 | dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 100 | dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
121 | dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
122 | dev->irq.Handler = NULL; /* The handler is registered later. */ | 101 | dev->irq.Handler = NULL; /* The handler is registered later. */ |
123 | dev->irq.Instance = NULL; | ||
124 | res = pcmcia_request_irq(dev, &dev->irq); | 102 | res = pcmcia_request_irq(dev, &dev->irq); |
125 | if (res != 0) | 103 | if (res != 0) |
126 | goto err_disable; | 104 | goto err_disable; |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index ad8eab4a639b..c9640a3e02c9 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
@@ -274,9 +274,6 @@ static int sandisk_enable_wireless(struct net_device *dev) | |||
274 | conf_reg_t reg; | 274 | conf_reg_t reg; |
275 | struct hostap_interface *iface = netdev_priv(dev); | 275 | struct hostap_interface *iface = netdev_priv(dev); |
276 | local_info_t *local = iface->local; | 276 | local_info_t *local = iface->local; |
277 | tuple_t tuple; | ||
278 | cisparse_t *parse = NULL; | ||
279 | u_char buf[64]; | ||
280 | struct hostap_cs_priv *hw_priv = local->hw_priv; | 277 | struct hostap_cs_priv *hw_priv = local->hw_priv; |
281 | 278 | ||
282 | if (hw_priv->link->io.NumPorts1 < 0x42) { | 279 | if (hw_priv->link->io.NumPorts1 < 0x42) { |
@@ -285,28 +282,13 @@ static int sandisk_enable_wireless(struct net_device *dev) | |||
285 | goto done; | 282 | goto done; |
286 | } | 283 | } |
287 | 284 | ||
288 | parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL); | ||
289 | if (parse == NULL) { | ||
290 | ret = -ENOMEM; | ||
291 | goto done; | ||
292 | } | ||
293 | |||
294 | tuple.Attributes = TUPLE_RETURN_COMMON; | ||
295 | tuple.TupleData = buf; | ||
296 | tuple.TupleDataMax = sizeof(buf); | ||
297 | tuple.TupleOffset = 0; | ||
298 | |||
299 | if (hw_priv->link->manf_id != 0xd601 || hw_priv->link->card_id != 0x0101) { | 285 | if (hw_priv->link->manf_id != 0xd601 || hw_priv->link->card_id != 0x0101) { |
300 | /* No SanDisk manfid found */ | 286 | /* No SanDisk manfid found */ |
301 | ret = -ENODEV; | 287 | ret = -ENODEV; |
302 | goto done; | 288 | goto done; |
303 | } | 289 | } |
304 | 290 | ||
305 | tuple.DesiredTuple = CISTPL_LONGLINK_MFC; | 291 | if (hw_priv->link->socket->functions < 2) { |
306 | if (pcmcia_get_first_tuple(hw_priv->link, &tuple) || | ||
307 | pcmcia_get_tuple_data(hw_priv->link, &tuple) || | ||
308 | pcmcia_parse_tuple(&tuple, parse) || | ||
309 | parse->longlink_mfc.nfn < 2) { | ||
310 | /* No multi-function links found */ | 292 | /* No multi-function links found */ |
311 | ret = -ENODEV; | 293 | ret = -ENODEV; |
312 | goto done; | 294 | goto done; |
@@ -354,7 +336,6 @@ static int sandisk_enable_wireless(struct net_device *dev) | |||
354 | udelay(10); | 336 | udelay(10); |
355 | 337 | ||
356 | done: | 338 | done: |
357 | kfree(parse); | ||
358 | return ret; | 339 | return ret; |
359 | } | 340 | } |
360 | 341 | ||
@@ -529,10 +510,6 @@ static void prism2_detach(struct pcmcia_device *link) | |||
529 | } | 510 | } |
530 | 511 | ||
531 | 512 | ||
532 | #define CS_CHECK(fn, ret) \ | ||
533 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
534 | |||
535 | |||
536 | /* run after a CARD_INSERTION event is received to configure the PCMCIA | 513 | /* run after a CARD_INSERTION event is received to configure the PCMCIA |
537 | * socket and make the device available to the system */ | 514 | * socket and make the device available to the system */ |
538 | 515 | ||
@@ -624,7 +601,6 @@ static int prism2_config(struct pcmcia_device *link) | |||
624 | struct hostap_interface *iface; | 601 | struct hostap_interface *iface; |
625 | local_info_t *local; | 602 | local_info_t *local; |
626 | int ret = 1; | 603 | int ret = 1; |
627 | int last_fn, last_ret; | ||
628 | struct hostap_cs_priv *hw_priv; | 604 | struct hostap_cs_priv *hw_priv; |
629 | 605 | ||
630 | PDEBUG(DEBUG_FLOW, "prism2_config()\n"); | 606 | PDEBUG(DEBUG_FLOW, "prism2_config()\n"); |
@@ -636,19 +612,18 @@ static int prism2_config(struct pcmcia_device *link) | |||
636 | } | 612 | } |
637 | 613 | ||
638 | /* Look for an appropriate configuration table entry in the CIS */ | 614 | /* Look for an appropriate configuration table entry in the CIS */ |
639 | last_ret = pcmcia_loop_config(link, prism2_config_check, NULL); | 615 | ret = pcmcia_loop_config(link, prism2_config_check, NULL); |
640 | if (last_ret) { | 616 | if (ret) { |
641 | if (!ignore_cis_vcc) | 617 | if (!ignore_cis_vcc) |
642 | printk(KERN_ERR "GetNextTuple(): No matching " | 618 | printk(KERN_ERR "GetNextTuple(): No matching " |
643 | "CIS configuration. Maybe you need the " | 619 | "CIS configuration. Maybe you need the " |
644 | "ignore_cis_vcc=1 parameter.\n"); | 620 | "ignore_cis_vcc=1 parameter.\n"); |
645 | cs_error(link, RequestIO, last_ret); | ||
646 | goto failed; | 621 | goto failed; |
647 | } | 622 | } |
648 | 623 | ||
649 | /* Need to allocate net_device before requesting IRQ handler */ | 624 | /* Need to allocate net_device before requesting IRQ handler */ |
650 | dev = prism2_init_local_data(&prism2_pccard_funcs, 0, | 625 | dev = prism2_init_local_data(&prism2_pccard_funcs, 0, |
651 | &handle_to_dev(link)); | 626 | &link->dev); |
652 | if (dev == NULL) | 627 | if (dev == NULL) |
653 | goto failed; | 628 | goto failed; |
654 | link->priv = dev; | 629 | link->priv = dev; |
@@ -666,13 +641,11 @@ static int prism2_config(struct pcmcia_device *link) | |||
666 | * irq structure is initialized. | 641 | * irq structure is initialized. |
667 | */ | 642 | */ |
668 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 643 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
669 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | | 644 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
670 | IRQ_HANDLE_PRESENT; | ||
671 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
672 | link->irq.Handler = prism2_interrupt; | 645 | link->irq.Handler = prism2_interrupt; |
673 | link->irq.Instance = dev; | 646 | ret = pcmcia_request_irq(link, &link->irq); |
674 | CS_CHECK(RequestIRQ, | 647 | if (ret) |
675 | pcmcia_request_irq(link, &link->irq)); | 648 | goto failed; |
676 | } | 649 | } |
677 | 650 | ||
678 | /* | 651 | /* |
@@ -680,8 +653,9 @@ static int prism2_config(struct pcmcia_device *link) | |||
680 | * the I/O windows and the interrupt mapping, and putting the | 653 | * the I/O windows and the interrupt mapping, and putting the |
681 | * card and host interface into "Memory and IO" mode. | 654 | * card and host interface into "Memory and IO" mode. |
682 | */ | 655 | */ |
683 | CS_CHECK(RequestConfiguration, | 656 | ret = pcmcia_request_configuration(link, &link->conf); |
684 | pcmcia_request_configuration(link, &link->conf)); | 657 | if (ret) |
658 | goto failed; | ||
685 | 659 | ||
686 | dev->irq = link->irq.AssignedIRQ; | 660 | dev->irq = link->irq.AssignedIRQ; |
687 | dev->base_addr = link->io.BasePort1; | 661 | dev->base_addr = link->io.BasePort1; |
@@ -714,9 +688,6 @@ static int prism2_config(struct pcmcia_device *link) | |||
714 | } | 688 | } |
715 | return ret; | 689 | return ret; |
716 | 690 | ||
717 | cs_failed: | ||
718 | cs_error(link, last_fn, last_ret); | ||
719 | |||
720 | failed: | 691 | failed: |
721 | kfree(hw_priv); | 692 | kfree(hw_priv); |
722 | prism2_release((u_long)link); | 693 | prism2_release((u_long)link); |
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 62381768f2d5..b1d84592b959 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -590,7 +590,7 @@ static int if_cs_prog_helper(struct if_cs_card *card) | |||
590 | 590 | ||
591 | /* TODO: make firmware file configurable */ | 591 | /* TODO: make firmware file configurable */ |
592 | ret = request_firmware(&fw, "libertas_cs_helper.fw", | 592 | ret = request_firmware(&fw, "libertas_cs_helper.fw", |
593 | &handle_to_dev(card->p_dev)); | 593 | &card->p_dev->dev); |
594 | if (ret) { | 594 | if (ret) { |
595 | lbs_pr_err("can't load helper firmware\n"); | 595 | lbs_pr_err("can't load helper firmware\n"); |
596 | ret = -ENODEV; | 596 | ret = -ENODEV; |
@@ -663,7 +663,7 @@ static int if_cs_prog_real(struct if_cs_card *card) | |||
663 | 663 | ||
664 | /* TODO: make firmware file configurable */ | 664 | /* TODO: make firmware file configurable */ |
665 | ret = request_firmware(&fw, "libertas_cs.fw", | 665 | ret = request_firmware(&fw, "libertas_cs.fw", |
666 | &handle_to_dev(card->p_dev)); | 666 | &card->p_dev->dev); |
667 | if (ret) { | 667 | if (ret) { |
668 | lbs_pr_err("can't load firmware\n"); | 668 | lbs_pr_err("can't load firmware\n"); |
669 | ret = -ENODEV; | 669 | ret = -ENODEV; |
@@ -793,18 +793,37 @@ static void if_cs_release(struct pcmcia_device *p_dev) | |||
793 | * configure the card at this point -- we wait until we receive a card | 793 | * configure the card at this point -- we wait until we receive a card |
794 | * insertion event. | 794 | * insertion event. |
795 | */ | 795 | */ |
796 | |||
797 | static int if_cs_ioprobe(struct pcmcia_device *p_dev, | ||
798 | cistpl_cftable_entry_t *cfg, | ||
799 | cistpl_cftable_entry_t *dflt, | ||
800 | unsigned int vcc, | ||
801 | void *priv_data) | ||
802 | { | ||
803 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
804 | p_dev->io.BasePort1 = cfg->io.win[0].base; | ||
805 | p_dev->io.NumPorts1 = cfg->io.win[0].len; | ||
806 | |||
807 | /* Do we need to allocate an interrupt? */ | ||
808 | if (cfg->irq.IRQInfo1) | ||
809 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; | ||
810 | |||
811 | /* IO window settings */ | ||
812 | if (cfg->io.nwin != 1) { | ||
813 | lbs_pr_err("wrong CIS (check number of IO windows)\n"); | ||
814 | return -ENODEV; | ||
815 | } | ||
816 | |||
817 | /* This reserves IO space but doesn't actually enable it */ | ||
818 | return pcmcia_request_io(p_dev, &p_dev->io); | ||
819 | } | ||
820 | |||
796 | static int if_cs_probe(struct pcmcia_device *p_dev) | 821 | static int if_cs_probe(struct pcmcia_device *p_dev) |
797 | { | 822 | { |
798 | int ret = -ENOMEM; | 823 | int ret = -ENOMEM; |
799 | unsigned int prod_id; | 824 | unsigned int prod_id; |
800 | struct lbs_private *priv; | 825 | struct lbs_private *priv; |
801 | struct if_cs_card *card; | 826 | struct if_cs_card *card; |
802 | /* CIS parsing */ | ||
803 | tuple_t tuple; | ||
804 | cisparse_t parse; | ||
805 | cistpl_cftable_entry_t *cfg = &parse.cftable_entry; | ||
806 | cistpl_io_t *io = &cfg->io; | ||
807 | u_char buf[64]; | ||
808 | 827 | ||
809 | lbs_deb_enter(LBS_DEB_CS); | 828 | lbs_deb_enter(LBS_DEB_CS); |
810 | 829 | ||
@@ -818,48 +837,15 @@ static int if_cs_probe(struct pcmcia_device *p_dev) | |||
818 | 837 | ||
819 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 838 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
820 | p_dev->irq.Handler = NULL; | 839 | p_dev->irq.Handler = NULL; |
821 | p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_LEVEL_ID; | ||
822 | 840 | ||
823 | p_dev->conf.Attributes = 0; | 841 | p_dev->conf.Attributes = 0; |
824 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 842 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
825 | 843 | ||
826 | tuple.Attributes = 0; | 844 | if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) { |
827 | tuple.TupleData = buf; | 845 | lbs_pr_err("error in pcmcia_loop_config\n"); |
828 | tuple.TupleDataMax = sizeof(buf); | ||
829 | tuple.TupleOffset = 0; | ||
830 | |||
831 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
832 | if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 || | ||
833 | (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 || | ||
834 | (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) | ||
835 | { | ||
836 | lbs_pr_err("error in pcmcia_get_first_tuple etc\n"); | ||
837 | goto out1; | ||
838 | } | ||
839 | |||
840 | p_dev->conf.ConfigIndex = cfg->index; | ||
841 | |||
842 | /* Do we need to allocate an interrupt? */ | ||
843 | if (cfg->irq.IRQInfo1) { | ||
844 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; | ||
845 | } | ||
846 | |||
847 | /* IO window settings */ | ||
848 | if (cfg->io.nwin != 1) { | ||
849 | lbs_pr_err("wrong CIS (check number of IO windows)\n"); | ||
850 | ret = -ENODEV; | ||
851 | goto out1; | 846 | goto out1; |
852 | } | 847 | } |
853 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
854 | p_dev->io.BasePort1 = io->win[0].base; | ||
855 | p_dev->io.NumPorts1 = io->win[0].len; | ||
856 | 848 | ||
857 | /* This reserves IO space but doesn't actually enable it */ | ||
858 | ret = pcmcia_request_io(p_dev, &p_dev->io); | ||
859 | if (ret) { | ||
860 | lbs_pr_err("error in pcmcia_request_io\n"); | ||
861 | goto out1; | ||
862 | } | ||
863 | 849 | ||
864 | /* | 850 | /* |
865 | * Allocate an interrupt line. Note that this does not assign | 851 | * Allocate an interrupt line. Note that this does not assign |
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index 9498b46c99a4..e61e6b9440ab 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -145,23 +145,6 @@ static const unsigned int txConfEUD = 0x10; /* Enable Uni-Data packets */ | |||
145 | static const unsigned int txConfKey = 0x02; /* Scramble data packets */ | 145 | static const unsigned int txConfKey = 0x02; /* Scramble data packets */ |
146 | static const unsigned int txConfLoop = 0x01; /* Loopback mode */ | 146 | static const unsigned int txConfLoop = 0x01; /* Loopback mode */ |
147 | 147 | ||
148 | /* | ||
149 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
150 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
151 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
152 | be present but disabled -- but it can then be enabled for specific | ||
153 | modules at load time with a 'pc_debug=#' option to insmod. | ||
154 | */ | ||
155 | |||
156 | #ifdef PCMCIA_DEBUG | ||
157 | static int pc_debug = PCMCIA_DEBUG; | ||
158 | module_param(pc_debug, int, 0); | ||
159 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
160 | static char *version = | ||
161 | "netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; | ||
162 | #else | ||
163 | #define DEBUG(n, args...) | ||
164 | #endif | ||
165 | 148 | ||
166 | /*====================================================================*/ | 149 | /*====================================================================*/ |
167 | 150 | ||
@@ -383,7 +366,7 @@ static int netwave_probe(struct pcmcia_device *link) | |||
383 | struct net_device *dev; | 366 | struct net_device *dev; |
384 | netwave_private *priv; | 367 | netwave_private *priv; |
385 | 368 | ||
386 | DEBUG(0, "netwave_attach()\n"); | 369 | dev_dbg(&link->dev, "netwave_attach()\n"); |
387 | 370 | ||
388 | /* Initialize the struct pcmcia_device structure */ | 371 | /* Initialize the struct pcmcia_device structure */ |
389 | dev = alloc_etherdev(sizeof(netwave_private)); | 372 | dev = alloc_etherdev(sizeof(netwave_private)); |
@@ -401,8 +384,7 @@ static int netwave_probe(struct pcmcia_device *link) | |||
401 | link->io.IOAddrLines = 5; | 384 | link->io.IOAddrLines = 5; |
402 | 385 | ||
403 | /* Interrupt setup */ | 386 | /* Interrupt setup */ |
404 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 387 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
405 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
406 | link->irq.Handler = &netwave_interrupt; | 388 | link->irq.Handler = &netwave_interrupt; |
407 | 389 | ||
408 | /* General socket configuration */ | 390 | /* General socket configuration */ |
@@ -421,8 +403,6 @@ static int netwave_probe(struct pcmcia_device *link) | |||
421 | 403 | ||
422 | dev->watchdog_timeo = TX_TIMEOUT; | 404 | dev->watchdog_timeo = TX_TIMEOUT; |
423 | 405 | ||
424 | link->irq.Instance = dev; | ||
425 | |||
426 | return netwave_pcmcia_config( link); | 406 | return netwave_pcmcia_config( link); |
427 | } /* netwave_attach */ | 407 | } /* netwave_attach */ |
428 | 408 | ||
@@ -438,7 +418,7 @@ static void netwave_detach(struct pcmcia_device *link) | |||
438 | { | 418 | { |
439 | struct net_device *dev = link->priv; | 419 | struct net_device *dev = link->priv; |
440 | 420 | ||
441 | DEBUG(0, "netwave_detach(0x%p)\n", link); | 421 | dev_dbg(&link->dev, "netwave_detach\n"); |
442 | 422 | ||
443 | netwave_release(link); | 423 | netwave_release(link); |
444 | 424 | ||
@@ -725,18 +705,15 @@ static const struct iw_handler_def netwave_handler_def = | |||
725 | * | 705 | * |
726 | */ | 706 | */ |
727 | 707 | ||
728 | #define CS_CHECK(fn, ret) \ | ||
729 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
730 | |||
731 | static int netwave_pcmcia_config(struct pcmcia_device *link) { | 708 | static int netwave_pcmcia_config(struct pcmcia_device *link) { |
732 | struct net_device *dev = link->priv; | 709 | struct net_device *dev = link->priv; |
733 | netwave_private *priv = netdev_priv(dev); | 710 | netwave_private *priv = netdev_priv(dev); |
734 | int i, j, last_ret, last_fn; | 711 | int i, j, ret; |
735 | win_req_t req; | 712 | win_req_t req; |
736 | memreq_t mem; | 713 | memreq_t mem; |
737 | u_char __iomem *ramBase = NULL; | 714 | u_char __iomem *ramBase = NULL; |
738 | 715 | ||
739 | DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link); | 716 | dev_dbg(&link->dev, "netwave_pcmcia_config\n"); |
740 | 717 | ||
741 | /* | 718 | /* |
742 | * Try allocating IO ports. This tries a few fixed addresses. | 719 | * Try allocating IO ports. This tries a few fixed addresses. |
@@ -749,22 +726,24 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
749 | if (i == 0) | 726 | if (i == 0) |
750 | break; | 727 | break; |
751 | } | 728 | } |
752 | if (i != 0) { | 729 | if (i != 0) |
753 | cs_error(link, RequestIO, i); | ||
754 | goto failed; | 730 | goto failed; |
755 | } | ||
756 | 731 | ||
757 | /* | 732 | /* |
758 | * Now allocate an interrupt line. Note that this does not | 733 | * Now allocate an interrupt line. Note that this does not |
759 | * actually assign a handler to the interrupt. | 734 | * actually assign a handler to the interrupt. |
760 | */ | 735 | */ |
761 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 736 | ret = pcmcia_request_irq(link, &link->irq); |
737 | if (ret) | ||
738 | goto failed; | ||
762 | 739 | ||
763 | /* | 740 | /* |
764 | * This actually configures the PCMCIA socket -- setting up | 741 | * This actually configures the PCMCIA socket -- setting up |
765 | * the I/O windows and the interrupt mapping. | 742 | * the I/O windows and the interrupt mapping. |
766 | */ | 743 | */ |
767 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 744 | ret = pcmcia_request_configuration(link, &link->conf); |
745 | if (ret) | ||
746 | goto failed; | ||
768 | 747 | ||
769 | /* | 748 | /* |
770 | * Allocate a 32K memory window. Note that the struct pcmcia_device | 749 | * Allocate a 32K memory window. Note that the struct pcmcia_device |
@@ -772,14 +751,18 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
772 | * device needs several windows, you'll need to keep track of | 751 | * device needs several windows, you'll need to keep track of |
773 | * the handles in your private data structure, dev->priv. | 752 | * the handles in your private data structure, dev->priv. |
774 | */ | 753 | */ |
775 | DEBUG(1, "Setting mem speed of %d\n", mem_speed); | 754 | dev_dbg(&link->dev, "Setting mem speed of %d\n", mem_speed); |
776 | 755 | ||
777 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_CM|WIN_ENABLE; | 756 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_CM|WIN_ENABLE; |
778 | req.Base = 0; req.Size = 0x8000; | 757 | req.Base = 0; req.Size = 0x8000; |
779 | req.AccessSpeed = mem_speed; | 758 | req.AccessSpeed = mem_speed; |
780 | CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win)); | 759 | ret = pcmcia_request_window(link, &req, &link->win); |
760 | if (ret) | ||
761 | goto failed; | ||
781 | mem.CardOffset = 0x20000; mem.Page = 0; | 762 | mem.CardOffset = 0x20000; mem.Page = 0; |
782 | CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem)); | 763 | ret = pcmcia_map_mem_page(link, link->win, &mem); |
764 | if (ret) | ||
765 | goto failed; | ||
783 | 766 | ||
784 | /* Store base address of the common window frame */ | 767 | /* Store base address of the common window frame */ |
785 | ramBase = ioremap(req.Base, 0x8000); | 768 | ramBase = ioremap(req.Base, 0x8000); |
@@ -787,7 +770,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
787 | 770 | ||
788 | dev->irq = link->irq.AssignedIRQ; | 771 | dev->irq = link->irq.AssignedIRQ; |
789 | dev->base_addr = link->io.BasePort1; | 772 | dev->base_addr = link->io.BasePort1; |
790 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 773 | SET_NETDEV_DEV(dev, &link->dev); |
791 | 774 | ||
792 | if (register_netdev(dev) != 0) { | 775 | if (register_netdev(dev) != 0) { |
793 | printk(KERN_DEBUG "netwave_cs: register_netdev() failed\n"); | 776 | printk(KERN_DEBUG "netwave_cs: register_netdev() failed\n"); |
@@ -818,8 +801,6 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
818 | get_uint16(ramBase + NETWAVE_EREG_ARW+2)); | 801 | get_uint16(ramBase + NETWAVE_EREG_ARW+2)); |
819 | return 0; | 802 | return 0; |
820 | 803 | ||
821 | cs_failed: | ||
822 | cs_error(link, last_fn, last_ret); | ||
823 | failed: | 804 | failed: |
824 | netwave_release(link); | 805 | netwave_release(link); |
825 | return -ENODEV; | 806 | return -ENODEV; |
@@ -837,7 +818,7 @@ static void netwave_release(struct pcmcia_device *link) | |||
837 | struct net_device *dev = link->priv; | 818 | struct net_device *dev = link->priv; |
838 | netwave_private *priv = netdev_priv(dev); | 819 | netwave_private *priv = netdev_priv(dev); |
839 | 820 | ||
840 | DEBUG(0, "netwave_release(0x%p)\n", link); | 821 | dev_dbg(&link->dev, "netwave_release\n"); |
841 | 822 | ||
842 | pcmcia_disable_device(link); | 823 | pcmcia_disable_device(link); |
843 | if (link->win) | 824 | if (link->win) |
@@ -892,7 +873,7 @@ static void netwave_reset(struct net_device *dev) { | |||
892 | u_char __iomem *ramBase = priv->ramBase; | 873 | u_char __iomem *ramBase = priv->ramBase; |
893 | unsigned int iobase = dev->base_addr; | 874 | unsigned int iobase = dev->base_addr; |
894 | 875 | ||
895 | DEBUG(0, "netwave_reset: Done with hardware reset\n"); | 876 | pr_debug("netwave_reset: Done with hardware reset\n"); |
896 | 877 | ||
897 | priv->timeoutCounter = 0; | 878 | priv->timeoutCounter = 0; |
898 | 879 | ||
@@ -988,7 +969,7 @@ static int netwave_hw_xmit(unsigned char* data, int len, | |||
988 | 969 | ||
989 | dev->stats.tx_bytes += len; | 970 | dev->stats.tx_bytes += len; |
990 | 971 | ||
991 | DEBUG(3, "Transmitting with SPCQ %x SPU %x LIF %x ISPLQ %x\n", | 972 | pr_debug("Transmitting with SPCQ %x SPU %x LIF %x ISPLQ %x\n", |
992 | readb(ramBase + NETWAVE_EREG_SPCQ), | 973 | readb(ramBase + NETWAVE_EREG_SPCQ), |
993 | readb(ramBase + NETWAVE_EREG_SPU), | 974 | readb(ramBase + NETWAVE_EREG_SPU), |
994 | readb(ramBase + NETWAVE_EREG_LIF), | 975 | readb(ramBase + NETWAVE_EREG_LIF), |
@@ -1000,7 +981,7 @@ static int netwave_hw_xmit(unsigned char* data, int len, | |||
1000 | MaxData = get_uint16(ramBase + NETWAVE_EREG_TDP+2); | 981 | MaxData = get_uint16(ramBase + NETWAVE_EREG_TDP+2); |
1001 | DataOffset = get_uint16(ramBase + NETWAVE_EREG_TDP+4); | 982 | DataOffset = get_uint16(ramBase + NETWAVE_EREG_TDP+4); |
1002 | 983 | ||
1003 | DEBUG(3, "TxFreeList %x, MaxData %x, DataOffset %x\n", | 984 | pr_debug("TxFreeList %x, MaxData %x, DataOffset %x\n", |
1004 | TxFreeList, MaxData, DataOffset); | 985 | TxFreeList, MaxData, DataOffset); |
1005 | 986 | ||
1006 | /* Copy packet to the adapter fragment buffers */ | 987 | /* Copy packet to the adapter fragment buffers */ |
@@ -1088,7 +1069,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id) | |||
1088 | status = inb(iobase + NETWAVE_REG_ASR); | 1069 | status = inb(iobase + NETWAVE_REG_ASR); |
1089 | 1070 | ||
1090 | if (!pcmcia_dev_present(link)) { | 1071 | if (!pcmcia_dev_present(link)) { |
1091 | DEBUG(1, "netwave_interrupt: Interrupt with status 0x%x " | 1072 | pr_debug("netwave_interrupt: Interrupt with status 0x%x " |
1092 | "from removed or suspended card!\n", status); | 1073 | "from removed or suspended card!\n", status); |
1093 | break; | 1074 | break; |
1094 | } | 1075 | } |
@@ -1132,7 +1113,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id) | |||
1132 | int txStatus; | 1113 | int txStatus; |
1133 | 1114 | ||
1134 | txStatus = readb(ramBase + NETWAVE_EREG_TSER); | 1115 | txStatus = readb(ramBase + NETWAVE_EREG_TSER); |
1135 | DEBUG(3, "Transmit done. TSER = %x id %x\n", | 1116 | pr_debug("Transmit done. TSER = %x id %x\n", |
1136 | txStatus, readb(ramBase + NETWAVE_EREG_TSER + 1)); | 1117 | txStatus, readb(ramBase + NETWAVE_EREG_TSER + 1)); |
1137 | 1118 | ||
1138 | if (txStatus & 0x20) { | 1119 | if (txStatus & 0x20) { |
@@ -1156,7 +1137,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id) | |||
1156 | * TxGU and TxNOAP is set. (Those are the only ones | 1137 | * TxGU and TxNOAP is set. (Those are the only ones |
1157 | * to set TxErr). | 1138 | * to set TxErr). |
1158 | */ | 1139 | */ |
1159 | DEBUG(3, "netwave_interrupt: TxDN with error status %x\n", | 1140 | pr_debug("netwave_interrupt: TxDN with error status %x\n", |
1160 | txStatus); | 1141 | txStatus); |
1161 | 1142 | ||
1162 | /* Clear out TxGU, TxNOAP, TxErr and TxTrys */ | 1143 | /* Clear out TxGU, TxNOAP, TxErr and TxTrys */ |
@@ -1164,7 +1145,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id) | |||
1164 | writeb(0xdf & txStatus, ramBase+NETWAVE_EREG_TSER+4); | 1145 | writeb(0xdf & txStatus, ramBase+NETWAVE_EREG_TSER+4); |
1165 | ++dev->stats.tx_errors; | 1146 | ++dev->stats.tx_errors; |
1166 | } | 1147 | } |
1167 | DEBUG(3, "New status is TSER %x ASR %x\n", | 1148 | pr_debug("New status is TSER %x ASR %x\n", |
1168 | readb(ramBase + NETWAVE_EREG_TSER), | 1149 | readb(ramBase + NETWAVE_EREG_TSER), |
1169 | inb(iobase + NETWAVE_REG_ASR)); | 1150 | inb(iobase + NETWAVE_REG_ASR)); |
1170 | 1151 | ||
@@ -1172,7 +1153,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id) | |||
1172 | } | 1153 | } |
1173 | /* TxBA, this would trigger on all error packets received */ | 1154 | /* TxBA, this would trigger on all error packets received */ |
1174 | /* if (status & 0x01) { | 1155 | /* if (status & 0x01) { |
1175 | DEBUG(4, "Transmit buffers available, %x\n", status); | 1156 | pr_debug("Transmit buffers available, %x\n", status); |
1176 | } | 1157 | } |
1177 | */ | 1158 | */ |
1178 | } | 1159 | } |
@@ -1190,7 +1171,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id) | |||
1190 | */ | 1171 | */ |
1191 | static void netwave_watchdog(struct net_device *dev) { | 1172 | static void netwave_watchdog(struct net_device *dev) { |
1192 | 1173 | ||
1193 | DEBUG(1, "%s: netwave_watchdog: watchdog timer expired\n", dev->name); | 1174 | pr_debug("%s: netwave_watchdog: watchdog timer expired\n", dev->name); |
1194 | netwave_reset(dev); | 1175 | netwave_reset(dev); |
1195 | dev->trans_start = jiffies; | 1176 | dev->trans_start = jiffies; |
1196 | netif_wake_queue(dev); | 1177 | netif_wake_queue(dev); |
@@ -1211,7 +1192,7 @@ static int netwave_rx(struct net_device *dev) | |||
1211 | int i; | 1192 | int i; |
1212 | u_char *ptr; | 1193 | u_char *ptr; |
1213 | 1194 | ||
1214 | DEBUG(3, "xinw_rx: Receiving ... \n"); | 1195 | pr_debug("xinw_rx: Receiving ... \n"); |
1215 | 1196 | ||
1216 | /* Receive max 10 packets for now. */ | 1197 | /* Receive max 10 packets for now. */ |
1217 | for (i = 0; i < 10; i++) { | 1198 | for (i = 0; i < 10; i++) { |
@@ -1237,7 +1218,7 @@ static int netwave_rx(struct net_device *dev) | |||
1237 | 1218 | ||
1238 | skb = dev_alloc_skb(rcvLen+5); | 1219 | skb = dev_alloc_skb(rcvLen+5); |
1239 | if (skb == NULL) { | 1220 | if (skb == NULL) { |
1240 | DEBUG(1, "netwave_rx: Could not allocate an sk_buff of " | 1221 | pr_debug("netwave_rx: Could not allocate an sk_buff of " |
1241 | "length %d\n", rcvLen); | 1222 | "length %d\n", rcvLen); |
1242 | ++dev->stats.rx_dropped; | 1223 | ++dev->stats.rx_dropped; |
1243 | /* Tell the adapter to skip the packet */ | 1224 | /* Tell the adapter to skip the packet */ |
@@ -1279,7 +1260,7 @@ static int netwave_rx(struct net_device *dev) | |||
1279 | wait_WOC(iobase); | 1260 | wait_WOC(iobase); |
1280 | writeb(NETWAVE_CMD_SRP, ramBase + NETWAVE_EREG_CB + 0); | 1261 | writeb(NETWAVE_CMD_SRP, ramBase + NETWAVE_EREG_CB + 0); |
1281 | writeb(NETWAVE_CMD_EOC, ramBase + NETWAVE_EREG_CB + 1); | 1262 | writeb(NETWAVE_CMD_EOC, ramBase + NETWAVE_EREG_CB + 1); |
1282 | DEBUG(3, "Packet reception ok\n"); | 1263 | pr_debug("Packet reception ok\n"); |
1283 | } | 1264 | } |
1284 | return 0; | 1265 | return 0; |
1285 | } | 1266 | } |
@@ -1288,7 +1269,7 @@ static int netwave_open(struct net_device *dev) { | |||
1288 | netwave_private *priv = netdev_priv(dev); | 1269 | netwave_private *priv = netdev_priv(dev); |
1289 | struct pcmcia_device *link = priv->p_dev; | 1270 | struct pcmcia_device *link = priv->p_dev; |
1290 | 1271 | ||
1291 | DEBUG(1, "netwave_open: starting.\n"); | 1272 | dev_dbg(&link->dev, "netwave_open: starting.\n"); |
1292 | 1273 | ||
1293 | if (!pcmcia_dev_present(link)) | 1274 | if (!pcmcia_dev_present(link)) |
1294 | return -ENODEV; | 1275 | return -ENODEV; |
@@ -1305,7 +1286,7 @@ static int netwave_close(struct net_device *dev) { | |||
1305 | netwave_private *priv = netdev_priv(dev); | 1286 | netwave_private *priv = netdev_priv(dev); |
1306 | struct pcmcia_device *link = priv->p_dev; | 1287 | struct pcmcia_device *link = priv->p_dev; |
1307 | 1288 | ||
1308 | DEBUG(1, "netwave_close: finishing.\n"); | 1289 | dev_dbg(&link->dev, "netwave_close: finishing.\n"); |
1309 | 1290 | ||
1310 | link->open--; | 1291 | link->open--; |
1311 | netif_stop_queue(dev); | 1292 | netif_stop_queue(dev); |
@@ -1358,11 +1339,11 @@ static void set_multicast_list(struct net_device *dev) | |||
1358 | u_char rcvMode = 0; | 1339 | u_char rcvMode = 0; |
1359 | 1340 | ||
1360 | #ifdef PCMCIA_DEBUG | 1341 | #ifdef PCMCIA_DEBUG |
1361 | if (pc_debug > 2) { | 1342 | { |
1362 | static int old; | 1343 | xstatic int old; |
1363 | if (old != dev->mc_count) { | 1344 | if (old != dev->mc_count) { |
1364 | old = dev->mc_count; | 1345 | old = dev->mc_count; |
1365 | DEBUG(0, "%s: setting Rx mode to %d addresses.\n", | 1346 | pr_debug("%s: setting Rx mode to %d addresses.\n", |
1366 | dev->name, dev->mc_count); | 1347 | dev->name, dev->mc_count); |
1367 | } | 1348 | } |
1368 | } | 1349 | } |
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 38c1c9d2abb8..f27bb8367c98 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -109,7 +109,7 @@ orinoco_cs_probe(struct pcmcia_device *link) | |||
109 | struct orinoco_private *priv; | 109 | struct orinoco_private *priv; |
110 | struct orinoco_pccard *card; | 110 | struct orinoco_pccard *card; |
111 | 111 | ||
112 | priv = alloc_orinocodev(sizeof(*card), &handle_to_dev(link), | 112 | priv = alloc_orinocodev(sizeof(*card), &link->dev, |
113 | orinoco_cs_hard_reset, NULL); | 113 | orinoco_cs_hard_reset, NULL); |
114 | if (!priv) | 114 | if (!priv) |
115 | return -ENOMEM; | 115 | return -ENOMEM; |
@@ -120,10 +120,8 @@ orinoco_cs_probe(struct pcmcia_device *link) | |||
120 | link->priv = priv; | 120 | link->priv = priv; |
121 | 121 | ||
122 | /* Interrupt setup */ | 122 | /* Interrupt setup */ |
123 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 123 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
124 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
125 | link->irq.Handler = orinoco_interrupt; | 124 | link->irq.Handler = orinoco_interrupt; |
126 | link->irq.Instance = priv; | ||
127 | 125 | ||
128 | /* General socket configuration defaults can go here. In this | 126 | /* General socket configuration defaults can go here. In this |
129 | * client, we assume very little, and rely on the CIS for | 127 | * client, we assume very little, and rely on the CIS for |
@@ -160,12 +158,6 @@ static void orinoco_cs_detach(struct pcmcia_device *link) | |||
160 | * device available to the system. | 158 | * device available to the system. |
161 | */ | 159 | */ |
162 | 160 | ||
163 | #define CS_CHECK(fn, ret) do { \ | ||
164 | last_fn = (fn); \ | ||
165 | if ((last_ret = (ret)) != 0) \ | ||
166 | goto cs_failed; \ | ||
167 | } while (0) | ||
168 | |||
169 | static int orinoco_cs_config_check(struct pcmcia_device *p_dev, | 161 | static int orinoco_cs_config_check(struct pcmcia_device *p_dev, |
170 | cistpl_cftable_entry_t *cfg, | 162 | cistpl_cftable_entry_t *cfg, |
171 | cistpl_cftable_entry_t *dflt, | 163 | cistpl_cftable_entry_t *dflt, |
@@ -240,7 +232,7 @@ orinoco_cs_config(struct pcmcia_device *link) | |||
240 | struct orinoco_private *priv = link->priv; | 232 | struct orinoco_private *priv = link->priv; |
241 | struct orinoco_pccard *card = priv->card; | 233 | struct orinoco_pccard *card = priv->card; |
242 | hermes_t *hw = &priv->hw; | 234 | hermes_t *hw = &priv->hw; |
243 | int last_fn, last_ret; | 235 | int ret; |
244 | void __iomem *mem; | 236 | void __iomem *mem; |
245 | 237 | ||
246 | /* | 238 | /* |
@@ -257,13 +249,12 @@ orinoco_cs_config(struct pcmcia_device *link) | |||
257 | * and most client drivers will only use the CIS to fill in | 249 | * and most client drivers will only use the CIS to fill in |
258 | * implementation-defined details. | 250 | * implementation-defined details. |
259 | */ | 251 | */ |
260 | last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL); | 252 | ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL); |
261 | if (last_ret) { | 253 | if (ret) { |
262 | if (!ignore_cis_vcc) | 254 | if (!ignore_cis_vcc) |
263 | printk(KERN_ERR PFX "GetNextTuple(): No matching " | 255 | printk(KERN_ERR PFX "GetNextTuple(): No matching " |
264 | "CIS configuration. Maybe you need the " | 256 | "CIS configuration. Maybe you need the " |
265 | "ignore_cis_vcc=1 parameter.\n"); | 257 | "ignore_cis_vcc=1 parameter.\n"); |
266 | cs_error(link, RequestIO, last_ret); | ||
267 | goto failed; | 258 | goto failed; |
268 | } | 259 | } |
269 | 260 | ||
@@ -272,14 +263,16 @@ orinoco_cs_config(struct pcmcia_device *link) | |||
272 | * a handler to the interrupt, unless the 'Handler' member of | 263 | * a handler to the interrupt, unless the 'Handler' member of |
273 | * the irq structure is initialized. | 264 | * the irq structure is initialized. |
274 | */ | 265 | */ |
275 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 266 | ret = pcmcia_request_irq(link, &link->irq); |
267 | if (ret) | ||
268 | goto failed; | ||
276 | 269 | ||
277 | /* We initialize the hermes structure before completing PCMCIA | 270 | /* We initialize the hermes structure before completing PCMCIA |
278 | * configuration just in case the interrupt handler gets | 271 | * configuration just in case the interrupt handler gets |
279 | * called. */ | 272 | * called. */ |
280 | mem = ioport_map(link->io.BasePort1, link->io.NumPorts1); | 273 | mem = ioport_map(link->io.BasePort1, link->io.NumPorts1); |
281 | if (!mem) | 274 | if (!mem) |
282 | goto cs_failed; | 275 | goto failed; |
283 | 276 | ||
284 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); | 277 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); |
285 | 278 | ||
@@ -288,8 +281,9 @@ orinoco_cs_config(struct pcmcia_device *link) | |||
288 | * the I/O windows and the interrupt mapping, and putting the | 281 | * the I/O windows and the interrupt mapping, and putting the |
289 | * card and host interface into "Memory and IO" mode. | 282 | * card and host interface into "Memory and IO" mode. |
290 | */ | 283 | */ |
291 | CS_CHECK(RequestConfiguration, | 284 | ret = pcmcia_request_configuration(link, &link->conf); |
292 | pcmcia_request_configuration(link, &link->conf)); | 285 | if (ret) |
286 | goto failed; | ||
293 | 287 | ||
294 | /* Ok, we have the configuration, prepare to register the netdev */ | 288 | /* Ok, we have the configuration, prepare to register the netdev */ |
295 | card->node.major = card->node.minor = 0; | 289 | card->node.major = card->node.minor = 0; |
@@ -315,9 +309,6 @@ orinoco_cs_config(struct pcmcia_device *link) | |||
315 | * net_device has been registered */ | 309 | * net_device has been registered */ |
316 | return 0; | 310 | return 0; |
317 | 311 | ||
318 | cs_failed: | ||
319 | cs_error(link, last_fn, last_ret); | ||
320 | |||
321 | failed: | 312 | failed: |
322 | orinoco_cs_release(link); | 313 | orinoco_cs_release(link); |
323 | return -ENODEV; | 314 | return -ENODEV; |
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index c361310b885d..59bda240fdc2 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -73,9 +73,6 @@ static void spectrum_cs_release(struct pcmcia_device *link); | |||
73 | #define HCR_MEM16 0x10 /* memory width bit, should be preserved */ | 73 | #define HCR_MEM16 0x10 /* memory width bit, should be preserved */ |
74 | 74 | ||
75 | 75 | ||
76 | #define CS_CHECK(fn, ret) \ | ||
77 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
78 | |||
79 | /* | 76 | /* |
80 | * Reset the card using configuration registers COR and CCSR. | 77 | * Reset the card using configuration registers COR and CCSR. |
81 | * If IDLE is 1, stop the firmware, so that it can be safely rewritten. | 78 | * 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); | |||
83 | static int | 80 | static int |
84 | spectrum_reset(struct pcmcia_device *link, int idle) | 81 | spectrum_reset(struct pcmcia_device *link, int idle) |
85 | { | 82 | { |
86 | int last_ret, last_fn; | 83 | int ret; |
87 | conf_reg_t reg; | 84 | conf_reg_t reg; |
88 | u_int save_cor; | 85 | u_int save_cor; |
89 | 86 | ||
@@ -95,23 +92,26 @@ spectrum_reset(struct pcmcia_device *link, int idle) | |||
95 | reg.Function = 0; | 92 | reg.Function = 0; |
96 | reg.Action = CS_READ; | 93 | reg.Action = CS_READ; |
97 | reg.Offset = CISREG_COR; | 94 | reg.Offset = CISREG_COR; |
98 | CS_CHECK(AccessConfigurationRegister, | 95 | ret = pcmcia_access_configuration_register(link, ®); |
99 | pcmcia_access_configuration_register(link, ®)); | 96 | if (ret) |
97 | goto failed; | ||
100 | save_cor = reg.Value; | 98 | save_cor = reg.Value; |
101 | 99 | ||
102 | /* Soft-Reset card */ | 100 | /* Soft-Reset card */ |
103 | reg.Action = CS_WRITE; | 101 | reg.Action = CS_WRITE; |
104 | reg.Offset = CISREG_COR; | 102 | reg.Offset = CISREG_COR; |
105 | reg.Value = (save_cor | COR_SOFT_RESET); | 103 | reg.Value = (save_cor | COR_SOFT_RESET); |
106 | CS_CHECK(AccessConfigurationRegister, | 104 | ret = pcmcia_access_configuration_register(link, ®); |
107 | pcmcia_access_configuration_register(link, ®)); | 105 | if (ret) |
106 | goto failed; | ||
108 | udelay(1000); | 107 | udelay(1000); |
109 | 108 | ||
110 | /* Read CCSR */ | 109 | /* Read CCSR */ |
111 | reg.Action = CS_READ; | 110 | reg.Action = CS_READ; |
112 | reg.Offset = CISREG_CCSR; | 111 | reg.Offset = CISREG_CCSR; |
113 | CS_CHECK(AccessConfigurationRegister, | 112 | ret = pcmcia_access_configuration_register(link, ®); |
114 | pcmcia_access_configuration_register(link, ®)); | 113 | if (ret) |
114 | goto failed; | ||
115 | 115 | ||
116 | /* | 116 | /* |
117 | * Start or stop the firmware. Memory width bit should be | 117 | * Start or stop the firmware. Memory width bit should be |
@@ -120,21 +120,22 @@ spectrum_reset(struct pcmcia_device *link, int idle) | |||
120 | reg.Action = CS_WRITE; | 120 | reg.Action = CS_WRITE; |
121 | reg.Offset = CISREG_CCSR; | 121 | reg.Offset = CISREG_CCSR; |
122 | reg.Value = (idle ? HCR_IDLE : HCR_RUN) | (reg.Value & HCR_MEM16); | 122 | reg.Value = (idle ? HCR_IDLE : HCR_RUN) | (reg.Value & HCR_MEM16); |
123 | CS_CHECK(AccessConfigurationRegister, | 123 | ret = pcmcia_access_configuration_register(link, ®); |
124 | pcmcia_access_configuration_register(link, ®)); | 124 | if (ret) |
125 | goto failed; | ||
125 | udelay(1000); | 126 | udelay(1000); |
126 | 127 | ||
127 | /* Restore original COR configuration index */ | 128 | /* Restore original COR configuration index */ |
128 | reg.Action = CS_WRITE; | 129 | reg.Action = CS_WRITE; |
129 | reg.Offset = CISREG_COR; | 130 | reg.Offset = CISREG_COR; |
130 | reg.Value = (save_cor & ~COR_SOFT_RESET); | 131 | reg.Value = (save_cor & ~COR_SOFT_RESET); |
131 | CS_CHECK(AccessConfigurationRegister, | 132 | ret = pcmcia_access_configuration_register(link, ®); |
132 | pcmcia_access_configuration_register(link, ®)); | 133 | if (ret) |
134 | goto failed; | ||
133 | udelay(1000); | 135 | udelay(1000); |
134 | return 0; | 136 | return 0; |
135 | 137 | ||
136 | cs_failed: | 138 | failed: |
137 | cs_error(link, last_fn, last_ret); | ||
138 | return -ENODEV; | 139 | return -ENODEV; |
139 | } | 140 | } |
140 | 141 | ||
@@ -181,7 +182,7 @@ spectrum_cs_probe(struct pcmcia_device *link) | |||
181 | struct orinoco_private *priv; | 182 | struct orinoco_private *priv; |
182 | struct orinoco_pccard *card; | 183 | struct orinoco_pccard *card; |
183 | 184 | ||
184 | priv = alloc_orinocodev(sizeof(*card), &handle_to_dev(link), | 185 | priv = alloc_orinocodev(sizeof(*card), &link->dev, |
185 | spectrum_cs_hard_reset, | 186 | spectrum_cs_hard_reset, |
186 | spectrum_cs_stop_firmware); | 187 | spectrum_cs_stop_firmware); |
187 | if (!priv) | 188 | if (!priv) |
@@ -193,10 +194,8 @@ spectrum_cs_probe(struct pcmcia_device *link) | |||
193 | link->priv = priv; | 194 | link->priv = priv; |
194 | 195 | ||
195 | /* Interrupt setup */ | 196 | /* Interrupt setup */ |
196 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 197 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
197 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
198 | link->irq.Handler = orinoco_interrupt; | 198 | link->irq.Handler = orinoco_interrupt; |
199 | link->irq.Instance = priv; | ||
200 | 199 | ||
201 | /* General socket configuration defaults can go here. In this | 200 | /* General socket configuration defaults can go here. In this |
202 | * client, we assume very little, and rely on the CIS for | 201 | * client, we assume very little, and rely on the CIS for |
@@ -307,7 +306,7 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
307 | struct orinoco_private *priv = link->priv; | 306 | struct orinoco_private *priv = link->priv; |
308 | struct orinoco_pccard *card = priv->card; | 307 | struct orinoco_pccard *card = priv->card; |
309 | hermes_t *hw = &priv->hw; | 308 | hermes_t *hw = &priv->hw; |
310 | int last_fn, last_ret; | 309 | int ret; |
311 | void __iomem *mem; | 310 | void __iomem *mem; |
312 | 311 | ||
313 | /* | 312 | /* |
@@ -324,13 +323,12 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
324 | * and most client drivers will only use the CIS to fill in | 323 | * and most client drivers will only use the CIS to fill in |
325 | * implementation-defined details. | 324 | * implementation-defined details. |
326 | */ | 325 | */ |
327 | last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL); | 326 | ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL); |
328 | if (last_ret) { | 327 | if (ret) { |
329 | if (!ignore_cis_vcc) | 328 | if (!ignore_cis_vcc) |
330 | printk(KERN_ERR PFX "GetNextTuple(): No matching " | 329 | printk(KERN_ERR PFX "GetNextTuple(): No matching " |
331 | "CIS configuration. Maybe you need the " | 330 | "CIS configuration. Maybe you need the " |
332 | "ignore_cis_vcc=1 parameter.\n"); | 331 | "ignore_cis_vcc=1 parameter.\n"); |
333 | cs_error(link, RequestIO, last_ret); | ||
334 | goto failed; | 332 | goto failed; |
335 | } | 333 | } |
336 | 334 | ||
@@ -339,14 +337,16 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
339 | * a handler to the interrupt, unless the 'Handler' member of | 337 | * a handler to the interrupt, unless the 'Handler' member of |
340 | * the irq structure is initialized. | 338 | * the irq structure is initialized. |
341 | */ | 339 | */ |
342 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 340 | ret = pcmcia_request_irq(link, &link->irq); |
341 | if (ret) | ||
342 | goto failed; | ||
343 | 343 | ||
344 | /* We initialize the hermes structure before completing PCMCIA | 344 | /* We initialize the hermes structure before completing PCMCIA |
345 | * configuration just in case the interrupt handler gets | 345 | * configuration just in case the interrupt handler gets |
346 | * called. */ | 346 | * called. */ |
347 | mem = ioport_map(link->io.BasePort1, link->io.NumPorts1); | 347 | mem = ioport_map(link->io.BasePort1, link->io.NumPorts1); |
348 | if (!mem) | 348 | if (!mem) |
349 | goto cs_failed; | 349 | goto failed; |
350 | 350 | ||
351 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); | 351 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); |
352 | 352 | ||
@@ -355,8 +355,9 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
355 | * the I/O windows and the interrupt mapping, and putting the | 355 | * the I/O windows and the interrupt mapping, and putting the |
356 | * card and host interface into "Memory and IO" mode. | 356 | * card and host interface into "Memory and IO" mode. |
357 | */ | 357 | */ |
358 | CS_CHECK(RequestConfiguration, | 358 | ret = pcmcia_request_configuration(link, &link->conf); |
359 | pcmcia_request_configuration(link, &link->conf)); | 359 | if (ret) |
360 | goto failed; | ||
360 | 361 | ||
361 | /* Ok, we have the configuration, prepare to register the netdev */ | 362 | /* Ok, we have the configuration, prepare to register the netdev */ |
362 | card->node.major = card->node.minor = 0; | 363 | card->node.major = card->node.minor = 0; |
@@ -386,9 +387,6 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
386 | * net_device has been registered */ | 387 | * net_device has been registered */ |
387 | return 0; | 388 | return 0; |
388 | 389 | ||
389 | cs_failed: | ||
390 | cs_error(link, last_fn, last_ret); | ||
391 | |||
392 | failed: | 390 | failed: |
393 | spectrum_cs_release(link); | 391 | spectrum_cs_release(link); |
394 | return -ENODEV; | 392 | return -ENODEV; |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 1c88c2ea59aa..5b8e3e4cdd9f 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -71,25 +71,7 @@ typedef u_char mac_addr[ETH_ALEN]; /* Hardware address */ | |||
71 | #include "rayctl.h" | 71 | #include "rayctl.h" |
72 | #include "ray_cs.h" | 72 | #include "ray_cs.h" |
73 | 73 | ||
74 | /* All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
75 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
76 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
77 | be present but disabled -- but it can then be enabled for specific | ||
78 | modules at load time with a 'pc_debug=#' option to insmod. | ||
79 | */ | ||
80 | 74 | ||
81 | #ifdef RAYLINK_DEBUG | ||
82 | #define PCMCIA_DEBUG RAYLINK_DEBUG | ||
83 | #endif | ||
84 | #ifdef PCMCIA_DEBUG | ||
85 | static int ray_debug; | ||
86 | static int pc_debug = PCMCIA_DEBUG; | ||
87 | module_param(pc_debug, int, 0); | ||
88 | /* #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); */ | ||
89 | #define DEBUG(n, args...) if (pc_debug > (n)) printk(args); | ||
90 | #else | ||
91 | #define DEBUG(n, args...) | ||
92 | #endif | ||
93 | /** Prototypes based on PCMCIA skeleton driver *******************************/ | 75 | /** Prototypes based on PCMCIA skeleton driver *******************************/ |
94 | static int ray_config(struct pcmcia_device *link); | 76 | static int ray_config(struct pcmcia_device *link); |
95 | static void ray_release(struct pcmcia_device *link); | 77 | static void ray_release(struct pcmcia_device *link); |
@@ -325,7 +307,7 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
325 | ray_dev_t *local; | 307 | ray_dev_t *local; |
326 | struct net_device *dev; | 308 | struct net_device *dev; |
327 | 309 | ||
328 | DEBUG(1, "ray_attach()\n"); | 310 | dev_dbg(&p_dev->dev, "ray_attach()\n"); |
329 | 311 | ||
330 | /* Allocate space for private device-specific data */ | 312 | /* Allocate space for private device-specific data */ |
331 | dev = alloc_etherdev(sizeof(ray_dev_t)); | 313 | dev = alloc_etherdev(sizeof(ray_dev_t)); |
@@ -341,8 +323,7 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
341 | p_dev->io.IOAddrLines = 5; | 323 | p_dev->io.IOAddrLines = 5; |
342 | 324 | ||
343 | /* Interrupt setup. For PCMCIA, driver takes what's given */ | 325 | /* Interrupt setup. For PCMCIA, driver takes what's given */ |
344 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 326 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
345 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
346 | p_dev->irq.Handler = &ray_interrupt; | 327 | p_dev->irq.Handler = &ray_interrupt; |
347 | 328 | ||
348 | /* General socket configuration */ | 329 | /* General socket configuration */ |
@@ -351,13 +332,12 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
351 | p_dev->conf.ConfigIndex = 1; | 332 | p_dev->conf.ConfigIndex = 1; |
352 | 333 | ||
353 | p_dev->priv = dev; | 334 | p_dev->priv = dev; |
354 | p_dev->irq.Instance = dev; | ||
355 | 335 | ||
356 | local->finder = p_dev; | 336 | local->finder = p_dev; |
357 | local->card_status = CARD_INSERTED; | 337 | local->card_status = CARD_INSERTED; |
358 | local->authentication_state = UNAUTHENTICATED; | 338 | local->authentication_state = UNAUTHENTICATED; |
359 | local->num_multi = 0; | 339 | local->num_multi = 0; |
360 | DEBUG(2, "ray_attach p_dev = %p, dev = %p, local = %p, intr = %p\n", | 340 | dev_dbg(&p_dev->dev, "ray_attach p_dev = %p, dev = %p, local = %p, intr = %p\n", |
361 | p_dev, dev, local, &ray_interrupt); | 341 | p_dev, dev, local, &ray_interrupt); |
362 | 342 | ||
363 | /* Raylink entries in the device structure */ | 343 | /* Raylink entries in the device structure */ |
@@ -370,7 +350,7 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
370 | #endif /* WIRELESS_SPY */ | 350 | #endif /* WIRELESS_SPY */ |
371 | 351 | ||
372 | 352 | ||
373 | DEBUG(2, "ray_cs ray_attach calling ether_setup.)\n"); | 353 | dev_dbg(&p_dev->dev, "ray_cs ray_attach calling ether_setup.)\n"); |
374 | netif_stop_queue(dev); | 354 | netif_stop_queue(dev); |
375 | 355 | ||
376 | init_timer(&local->timer); | 356 | init_timer(&local->timer); |
@@ -393,7 +373,7 @@ static void ray_detach(struct pcmcia_device *link) | |||
393 | struct net_device *dev; | 373 | struct net_device *dev; |
394 | ray_dev_t *local; | 374 | ray_dev_t *local; |
395 | 375 | ||
396 | DEBUG(1, "ray_detach(0x%p)\n", link); | 376 | dev_dbg(&link->dev, "ray_detach\n"); |
397 | 377 | ||
398 | this_device = NULL; | 378 | this_device = NULL; |
399 | dev = link->priv; | 379 | dev = link->priv; |
@@ -408,7 +388,7 @@ static void ray_detach(struct pcmcia_device *link) | |||
408 | unregister_netdev(dev); | 388 | unregister_netdev(dev); |
409 | free_netdev(dev); | 389 | free_netdev(dev); |
410 | } | 390 | } |
411 | DEBUG(2, "ray_cs ray_detach ending\n"); | 391 | dev_dbg(&link->dev, "ray_cs ray_detach ending\n"); |
412 | } /* ray_detach */ | 392 | } /* ray_detach */ |
413 | 393 | ||
414 | /*============================================================================= | 394 | /*============================================================================= |
@@ -416,19 +396,17 @@ static void ray_detach(struct pcmcia_device *link) | |||
416 | is received, to configure the PCMCIA socket, and to make the | 396 | is received, to configure the PCMCIA socket, and to make the |
417 | ethernet device available to the system. | 397 | ethernet device available to the system. |
418 | =============================================================================*/ | 398 | =============================================================================*/ |
419 | #define CS_CHECK(fn, ret) \ | ||
420 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
421 | #define MAX_TUPLE_SIZE 128 | 399 | #define MAX_TUPLE_SIZE 128 |
422 | static int ray_config(struct pcmcia_device *link) | 400 | static int ray_config(struct pcmcia_device *link) |
423 | { | 401 | { |
424 | int last_fn = 0, last_ret = 0; | 402 | int ret = 0; |
425 | int i; | 403 | int i; |
426 | win_req_t req; | 404 | win_req_t req; |
427 | memreq_t mem; | 405 | memreq_t mem; |
428 | struct net_device *dev = (struct net_device *)link->priv; | 406 | struct net_device *dev = (struct net_device *)link->priv; |
429 | ray_dev_t *local = netdev_priv(dev); | 407 | ray_dev_t *local = netdev_priv(dev); |
430 | 408 | ||
431 | DEBUG(1, "ray_config(0x%p)\n", link); | 409 | dev_dbg(&link->dev, "ray_config\n"); |
432 | 410 | ||
433 | /* Determine card type and firmware version */ | 411 | /* Determine card type and firmware version */ |
434 | printk(KERN_INFO "ray_cs Detected: %s%s%s%s\n", | 412 | printk(KERN_INFO "ray_cs Detected: %s%s%s%s\n", |
@@ -440,14 +418,17 @@ static int ray_config(struct pcmcia_device *link) | |||
440 | /* Now allocate an interrupt line. Note that this does not | 418 | /* Now allocate an interrupt line. Note that this does not |
441 | actually assign a handler to the interrupt. | 419 | actually assign a handler to the interrupt. |
442 | */ | 420 | */ |
443 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 421 | ret = pcmcia_request_irq(link, &link->irq); |
422 | if (ret) | ||
423 | goto failed; | ||
444 | dev->irq = link->irq.AssignedIRQ; | 424 | dev->irq = link->irq.AssignedIRQ; |
445 | 425 | ||
446 | /* This actually configures the PCMCIA socket -- setting up | 426 | /* This actually configures the PCMCIA socket -- setting up |
447 | the I/O windows and the interrupt mapping. | 427 | the I/O windows and the interrupt mapping. |
448 | */ | 428 | */ |
449 | CS_CHECK(RequestConfiguration, | 429 | ret = pcmcia_request_configuration(link, &link->conf); |
450 | pcmcia_request_configuration(link, &link->conf)); | 430 | if (ret) |
431 | goto failed; | ||
451 | 432 | ||
452 | /*** Set up 32k window for shared memory (transmit and control) ************/ | 433 | /*** Set up 32k window for shared memory (transmit and control) ************/ |
453 | req.Attributes = | 434 | req.Attributes = |
@@ -455,10 +436,14 @@ static int ray_config(struct pcmcia_device *link) | |||
455 | req.Base = 0; | 436 | req.Base = 0; |
456 | req.Size = 0x8000; | 437 | req.Size = 0x8000; |
457 | req.AccessSpeed = ray_mem_speed; | 438 | req.AccessSpeed = ray_mem_speed; |
458 | CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win)); | 439 | ret = pcmcia_request_window(link, &req, &link->win); |
440 | if (ret) | ||
441 | goto failed; | ||
459 | mem.CardOffset = 0x0000; | 442 | mem.CardOffset = 0x0000; |
460 | mem.Page = 0; | 443 | mem.Page = 0; |
461 | CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem)); | 444 | ret = pcmcia_map_mem_page(link, link->win, &mem); |
445 | if (ret) | ||
446 | goto failed; | ||
462 | local->sram = ioremap(req.Base, req.Size); | 447 | local->sram = ioremap(req.Base, req.Size); |
463 | 448 | ||
464 | /*** Set up 16k window for shared memory (receive buffer) ***************/ | 449 | /*** Set up 16k window for shared memory (receive buffer) ***************/ |
@@ -467,11 +452,14 @@ static int ray_config(struct pcmcia_device *link) | |||
467 | req.Base = 0; | 452 | req.Base = 0; |
468 | req.Size = 0x4000; | 453 | req.Size = 0x4000; |
469 | req.AccessSpeed = ray_mem_speed; | 454 | req.AccessSpeed = ray_mem_speed; |
470 | CS_CHECK(RequestWindow, | 455 | ret = pcmcia_request_window(link, &req, &local->rmem_handle); |
471 | pcmcia_request_window(&link, &req, &local->rmem_handle)); | 456 | if (ret) |
457 | goto failed; | ||
472 | mem.CardOffset = 0x8000; | 458 | mem.CardOffset = 0x8000; |
473 | mem.Page = 0; | 459 | mem.Page = 0; |
474 | CS_CHECK(MapMemPage, pcmcia_map_mem_page(local->rmem_handle, &mem)); | 460 | ret = pcmcia_map_mem_page(link, local->rmem_handle, &mem); |
461 | if (ret) | ||
462 | goto failed; | ||
475 | local->rmem = ioremap(req.Base, req.Size); | 463 | local->rmem = ioremap(req.Base, req.Size); |
476 | 464 | ||
477 | /*** Set up window for attribute memory ***********************************/ | 465 | /*** Set up window for attribute memory ***********************************/ |
@@ -480,22 +468,25 @@ static int ray_config(struct pcmcia_device *link) | |||
480 | req.Base = 0; | 468 | req.Base = 0; |
481 | req.Size = 0x1000; | 469 | req.Size = 0x1000; |
482 | req.AccessSpeed = ray_mem_speed; | 470 | req.AccessSpeed = ray_mem_speed; |
483 | CS_CHECK(RequestWindow, | 471 | ret = pcmcia_request_window(link, &req, &local->amem_handle); |
484 | pcmcia_request_window(&link, &req, &local->amem_handle)); | 472 | if (ret) |
473 | goto failed; | ||
485 | mem.CardOffset = 0x0000; | 474 | mem.CardOffset = 0x0000; |
486 | mem.Page = 0; | 475 | mem.Page = 0; |
487 | CS_CHECK(MapMemPage, pcmcia_map_mem_page(local->amem_handle, &mem)); | 476 | ret = pcmcia_map_mem_page(link, local->amem_handle, &mem); |
477 | if (ret) | ||
478 | goto failed; | ||
488 | local->amem = ioremap(req.Base, req.Size); | 479 | local->amem = ioremap(req.Base, req.Size); |
489 | 480 | ||
490 | DEBUG(3, "ray_config sram=%p\n", local->sram); | 481 | dev_dbg(&link->dev, "ray_config sram=%p\n", local->sram); |
491 | DEBUG(3, "ray_config rmem=%p\n", local->rmem); | 482 | dev_dbg(&link->dev, "ray_config rmem=%p\n", local->rmem); |
492 | DEBUG(3, "ray_config amem=%p\n", local->amem); | 483 | dev_dbg(&link->dev, "ray_config amem=%p\n", local->amem); |
493 | if (ray_init(dev) < 0) { | 484 | if (ray_init(dev) < 0) { |
494 | ray_release(link); | 485 | ray_release(link); |
495 | return -ENODEV; | 486 | return -ENODEV; |
496 | } | 487 | } |
497 | 488 | ||
498 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 489 | SET_NETDEV_DEV(dev, &link->dev); |
499 | i = register_netdev(dev); | 490 | i = register_netdev(dev); |
500 | if (i != 0) { | 491 | if (i != 0) { |
501 | printk("ray_config register_netdev() failed\n"); | 492 | printk("ray_config register_netdev() failed\n"); |
@@ -511,9 +502,7 @@ static int ray_config(struct pcmcia_device *link) | |||
511 | 502 | ||
512 | return 0; | 503 | return 0; |
513 | 504 | ||
514 | cs_failed: | 505 | failed: |
515 | cs_error(link, last_fn, last_ret); | ||
516 | |||
517 | ray_release(link); | 506 | ray_release(link); |
518 | return -ENODEV; | 507 | return -ENODEV; |
519 | } /* ray_config */ | 508 | } /* ray_config */ |
@@ -543,9 +532,9 @@ static int ray_init(struct net_device *dev) | |||
543 | struct ccs __iomem *pccs; | 532 | struct ccs __iomem *pccs; |
544 | ray_dev_t *local = netdev_priv(dev); | 533 | ray_dev_t *local = netdev_priv(dev); |
545 | struct pcmcia_device *link = local->finder; | 534 | struct pcmcia_device *link = local->finder; |
546 | DEBUG(1, "ray_init(0x%p)\n", dev); | 535 | dev_dbg(&link->dev, "ray_init(0x%p)\n", dev); |
547 | if (!(pcmcia_dev_present(link))) { | 536 | if (!(pcmcia_dev_present(link))) { |
548 | DEBUG(0, "ray_init - device not present\n"); | 537 | dev_dbg(&link->dev, "ray_init - device not present\n"); |
549 | return -1; | 538 | return -1; |
550 | } | 539 | } |
551 | 540 | ||
@@ -567,13 +556,13 @@ static int ray_init(struct net_device *dev) | |||
567 | local->fw_ver = local->startup_res.firmware_version[0]; | 556 | local->fw_ver = local->startup_res.firmware_version[0]; |
568 | local->fw_bld = local->startup_res.firmware_version[1]; | 557 | local->fw_bld = local->startup_res.firmware_version[1]; |
569 | local->fw_var = local->startup_res.firmware_version[2]; | 558 | local->fw_var = local->startup_res.firmware_version[2]; |
570 | DEBUG(1, "ray_init firmware version %d.%d \n", local->fw_ver, | 559 | dev_dbg(&link->dev, "ray_init firmware version %d.%d \n", local->fw_ver, |
571 | local->fw_bld); | 560 | local->fw_bld); |
572 | 561 | ||
573 | local->tib_length = 0x20; | 562 | local->tib_length = 0x20; |
574 | if ((local->fw_ver == 5) && (local->fw_bld >= 30)) | 563 | if ((local->fw_ver == 5) && (local->fw_bld >= 30)) |
575 | local->tib_length = local->startup_res.tib_length; | 564 | local->tib_length = local->startup_res.tib_length; |
576 | DEBUG(2, "ray_init tib_length = 0x%02x\n", local->tib_length); | 565 | dev_dbg(&link->dev, "ray_init tib_length = 0x%02x\n", local->tib_length); |
577 | /* Initialize CCS's to buffer free state */ | 566 | /* Initialize CCS's to buffer free state */ |
578 | pccs = ccs_base(local); | 567 | pccs = ccs_base(local); |
579 | for (i = 0; i < NUMBER_OF_CCS; i++) { | 568 | for (i = 0; i < NUMBER_OF_CCS; i++) { |
@@ -592,7 +581,7 @@ static int ray_init(struct net_device *dev) | |||
592 | 581 | ||
593 | clear_interrupt(local); /* Clear any interrupt from the card */ | 582 | clear_interrupt(local); /* Clear any interrupt from the card */ |
594 | local->card_status = CARD_AWAITING_PARAM; | 583 | local->card_status = CARD_AWAITING_PARAM; |
595 | DEBUG(2, "ray_init ending\n"); | 584 | dev_dbg(&link->dev, "ray_init ending\n"); |
596 | return 0; | 585 | return 0; |
597 | } /* ray_init */ | 586 | } /* ray_init */ |
598 | 587 | ||
@@ -605,9 +594,9 @@ static int dl_startup_params(struct net_device *dev) | |||
605 | struct ccs __iomem *pccs; | 594 | struct ccs __iomem *pccs; |
606 | struct pcmcia_device *link = local->finder; | 595 | struct pcmcia_device *link = local->finder; |
607 | 596 | ||
608 | DEBUG(1, "dl_startup_params entered\n"); | 597 | dev_dbg(&link->dev, "dl_startup_params entered\n"); |
609 | if (!(pcmcia_dev_present(link))) { | 598 | if (!(pcmcia_dev_present(link))) { |
610 | DEBUG(2, "ray_cs dl_startup_params - device not present\n"); | 599 | dev_dbg(&link->dev, "ray_cs dl_startup_params - device not present\n"); |
611 | return -1; | 600 | return -1; |
612 | } | 601 | } |
613 | 602 | ||
@@ -625,7 +614,7 @@ static int dl_startup_params(struct net_device *dev) | |||
625 | local->dl_param_ccs = ccsindex; | 614 | local->dl_param_ccs = ccsindex; |
626 | pccs = ccs_base(local) + ccsindex; | 615 | pccs = ccs_base(local) + ccsindex; |
627 | writeb(CCS_DOWNLOAD_STARTUP_PARAMS, &pccs->cmd); | 616 | writeb(CCS_DOWNLOAD_STARTUP_PARAMS, &pccs->cmd); |
628 | DEBUG(2, "dl_startup_params start ccsindex = %d\n", | 617 | dev_dbg(&link->dev, "dl_startup_params start ccsindex = %d\n", |
629 | local->dl_param_ccs); | 618 | local->dl_param_ccs); |
630 | /* Interrupt the firmware to process the command */ | 619 | /* Interrupt the firmware to process the command */ |
631 | if (interrupt_ecf(local, ccsindex)) { | 620 | if (interrupt_ecf(local, ccsindex)) { |
@@ -641,7 +630,7 @@ static int dl_startup_params(struct net_device *dev) | |||
641 | local->timer.data = (long)local; | 630 | local->timer.data = (long)local; |
642 | local->timer.function = &verify_dl_startup; | 631 | local->timer.function = &verify_dl_startup; |
643 | add_timer(&local->timer); | 632 | add_timer(&local->timer); |
644 | DEBUG(2, | 633 | dev_dbg(&link->dev, |
645 | "ray_cs dl_startup_params started timer for verify_dl_startup\n"); | 634 | "ray_cs dl_startup_params started timer for verify_dl_startup\n"); |
646 | return 0; | 635 | return 0; |
647 | } /* dl_startup_params */ | 636 | } /* dl_startup_params */ |
@@ -717,11 +706,11 @@ static void verify_dl_startup(u_long data) | |||
717 | struct pcmcia_device *link = local->finder; | 706 | struct pcmcia_device *link = local->finder; |
718 | 707 | ||
719 | if (!(pcmcia_dev_present(link))) { | 708 | if (!(pcmcia_dev_present(link))) { |
720 | DEBUG(2, "ray_cs verify_dl_startup - device not present\n"); | 709 | dev_dbg(&link->dev, "ray_cs verify_dl_startup - device not present\n"); |
721 | return; | 710 | return; |
722 | } | 711 | } |
723 | #ifdef PCMCIA_DEBUG | 712 | #if 0 |
724 | if (pc_debug > 2) { | 713 | { |
725 | int i; | 714 | int i; |
726 | printk(KERN_DEBUG | 715 | printk(KERN_DEBUG |
727 | "verify_dl_startup parameters sent via ccs %d:\n", | 716 | "verify_dl_startup parameters sent via ccs %d:\n", |
@@ -760,7 +749,7 @@ static void start_net(u_long data) | |||
760 | int ccsindex; | 749 | int ccsindex; |
761 | struct pcmcia_device *link = local->finder; | 750 | struct pcmcia_device *link = local->finder; |
762 | if (!(pcmcia_dev_present(link))) { | 751 | if (!(pcmcia_dev_present(link))) { |
763 | DEBUG(2, "ray_cs start_net - device not present\n"); | 752 | dev_dbg(&link->dev, "ray_cs start_net - device not present\n"); |
764 | return; | 753 | return; |
765 | } | 754 | } |
766 | /* Fill in the CCS fields for the ECF */ | 755 | /* Fill in the CCS fields for the ECF */ |
@@ -771,7 +760,7 @@ static void start_net(u_long data) | |||
771 | writeb(0, &pccs->var.start_network.update_param); | 760 | writeb(0, &pccs->var.start_network.update_param); |
772 | /* Interrupt the firmware to process the command */ | 761 | /* Interrupt the firmware to process the command */ |
773 | if (interrupt_ecf(local, ccsindex)) { | 762 | if (interrupt_ecf(local, ccsindex)) { |
774 | DEBUG(1, "ray start net failed - card not ready for intr\n"); | 763 | dev_dbg(&link->dev, "ray start net failed - card not ready for intr\n"); |
775 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); | 764 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); |
776 | return; | 765 | return; |
777 | } | 766 | } |
@@ -790,7 +779,7 @@ static void join_net(u_long data) | |||
790 | struct pcmcia_device *link = local->finder; | 779 | struct pcmcia_device *link = local->finder; |
791 | 780 | ||
792 | if (!(pcmcia_dev_present(link))) { | 781 | if (!(pcmcia_dev_present(link))) { |
793 | DEBUG(2, "ray_cs join_net - device not present\n"); | 782 | dev_dbg(&link->dev, "ray_cs join_net - device not present\n"); |
794 | return; | 783 | return; |
795 | } | 784 | } |
796 | /* Fill in the CCS fields for the ECF */ | 785 | /* Fill in the CCS fields for the ECF */ |
@@ -802,7 +791,7 @@ static void join_net(u_long data) | |||
802 | writeb(0, &pccs->var.join_network.net_initiated); | 791 | writeb(0, &pccs->var.join_network.net_initiated); |
803 | /* Interrupt the firmware to process the command */ | 792 | /* Interrupt the firmware to process the command */ |
804 | if (interrupt_ecf(local, ccsindex)) { | 793 | if (interrupt_ecf(local, ccsindex)) { |
805 | DEBUG(1, "ray join net failed - card not ready for intr\n"); | 794 | dev_dbg(&link->dev, "ray join net failed - card not ready for intr\n"); |
806 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); | 795 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); |
807 | return; | 796 | return; |
808 | } | 797 | } |
@@ -821,7 +810,7 @@ static void ray_release(struct pcmcia_device *link) | |||
821 | ray_dev_t *local = netdev_priv(dev); | 810 | ray_dev_t *local = netdev_priv(dev); |
822 | int i; | 811 | int i; |
823 | 812 | ||
824 | DEBUG(1, "ray_release(0x%p)\n", link); | 813 | dev_dbg(&link->dev, "ray_release\n"); |
825 | 814 | ||
826 | del_timer(&local->timer); | 815 | del_timer(&local->timer); |
827 | 816 | ||
@@ -829,15 +818,15 @@ static void ray_release(struct pcmcia_device *link) | |||
829 | iounmap(local->rmem); | 818 | iounmap(local->rmem); |
830 | iounmap(local->amem); | 819 | iounmap(local->amem); |
831 | /* Do bother checking to see if these succeed or not */ | 820 | /* Do bother checking to see if these succeed or not */ |
832 | i = pcmcia_release_window(local->amem_handle); | 821 | i = pcmcia_release_window(link, local->amem_handle); |
833 | if (i != 0) | 822 | if (i != 0) |
834 | DEBUG(0, "ReleaseWindow(local->amem) ret = %x\n", i); | 823 | dev_dbg(&link->dev, "ReleaseWindow(local->amem) ret = %x\n", i); |
835 | i = pcmcia_release_window(local->rmem_handle); | 824 | i = pcmcia_release_window(link, local->rmem_handle); |
836 | if (i != 0) | 825 | if (i != 0) |
837 | DEBUG(0, "ReleaseWindow(local->rmem) ret = %x\n", i); | 826 | dev_dbg(&link->dev, "ReleaseWindow(local->rmem) ret = %x\n", i); |
838 | pcmcia_disable_device(link); | 827 | pcmcia_disable_device(link); |
839 | 828 | ||
840 | DEBUG(2, "ray_release ending\n"); | 829 | dev_dbg(&link->dev, "ray_release ending\n"); |
841 | } | 830 | } |
842 | 831 | ||
843 | static int ray_suspend(struct pcmcia_device *link) | 832 | static int ray_suspend(struct pcmcia_device *link) |
@@ -871,9 +860,9 @@ static int ray_dev_init(struct net_device *dev) | |||
871 | ray_dev_t *local = netdev_priv(dev); | 860 | ray_dev_t *local = netdev_priv(dev); |
872 | struct pcmcia_device *link = local->finder; | 861 | struct pcmcia_device *link = local->finder; |
873 | 862 | ||
874 | DEBUG(1, "ray_dev_init(dev=%p)\n", dev); | 863 | dev_dbg(&link->dev, "ray_dev_init(dev=%p)\n", dev); |
875 | if (!(pcmcia_dev_present(link))) { | 864 | if (!(pcmcia_dev_present(link))) { |
876 | DEBUG(2, "ray_dev_init - device not present\n"); | 865 | dev_dbg(&link->dev, "ray_dev_init - device not present\n"); |
877 | return -1; | 866 | return -1; |
878 | } | 867 | } |
879 | #ifdef RAY_IMMEDIATE_INIT | 868 | #ifdef RAY_IMMEDIATE_INIT |
@@ -887,7 +876,7 @@ static int ray_dev_init(struct net_device *dev) | |||
887 | /* Postpone the card init so that we can still configure the card, | 876 | /* Postpone the card init so that we can still configure the card, |
888 | * for example using the Wireless Extensions. The init will happen | 877 | * for example using the Wireless Extensions. The init will happen |
889 | * in ray_open() - Jean II */ | 878 | * in ray_open() - Jean II */ |
890 | DEBUG(1, | 879 | dev_dbg(&link->dev, |
891 | "ray_dev_init: postponing card init to ray_open() ; Status = %d\n", | 880 | "ray_dev_init: postponing card init to ray_open() ; Status = %d\n", |
892 | local->card_status); | 881 | local->card_status); |
893 | #endif /* RAY_IMMEDIATE_INIT */ | 882 | #endif /* RAY_IMMEDIATE_INIT */ |
@@ -896,7 +885,7 @@ static int ray_dev_init(struct net_device *dev) | |||
896 | memcpy(dev->dev_addr, &local->sparm.b4.a_mac_addr, ADDRLEN); | 885 | memcpy(dev->dev_addr, &local->sparm.b4.a_mac_addr, ADDRLEN); |
897 | memset(dev->broadcast, 0xff, ETH_ALEN); | 886 | memset(dev->broadcast, 0xff, ETH_ALEN); |
898 | 887 | ||
899 | DEBUG(2, "ray_dev_init ending\n"); | 888 | dev_dbg(&link->dev, "ray_dev_init ending\n"); |
900 | return 0; | 889 | return 0; |
901 | } | 890 | } |
902 | 891 | ||
@@ -906,9 +895,9 @@ static int ray_dev_config(struct net_device *dev, struct ifmap *map) | |||
906 | ray_dev_t *local = netdev_priv(dev); | 895 | ray_dev_t *local = netdev_priv(dev); |
907 | struct pcmcia_device *link = local->finder; | 896 | struct pcmcia_device *link = local->finder; |
908 | /* Dummy routine to satisfy device structure */ | 897 | /* Dummy routine to satisfy device structure */ |
909 | DEBUG(1, "ray_dev_config(dev=%p,ifmap=%p)\n", dev, map); | 898 | dev_dbg(&link->dev, "ray_dev_config(dev=%p,ifmap=%p)\n", dev, map); |
910 | if (!(pcmcia_dev_present(link))) { | 899 | if (!(pcmcia_dev_present(link))) { |
911 | DEBUG(2, "ray_dev_config - device not present\n"); | 900 | dev_dbg(&link->dev, "ray_dev_config - device not present\n"); |
912 | return -1; | 901 | return -1; |
913 | } | 902 | } |
914 | 903 | ||
@@ -924,14 +913,14 @@ static netdev_tx_t ray_dev_start_xmit(struct sk_buff *skb, | |||
924 | short length = skb->len; | 913 | short length = skb->len; |
925 | 914 | ||
926 | if (!pcmcia_dev_present(link)) { | 915 | if (!pcmcia_dev_present(link)) { |
927 | DEBUG(2, "ray_dev_start_xmit - device not present\n"); | 916 | dev_dbg(&link->dev, "ray_dev_start_xmit - device not present\n"); |
928 | dev_kfree_skb(skb); | 917 | dev_kfree_skb(skb); |
929 | return NETDEV_TX_OK; | 918 | return NETDEV_TX_OK; |
930 | } | 919 | } |
931 | 920 | ||
932 | DEBUG(3, "ray_dev_start_xmit(skb=%p, dev=%p)\n", skb, dev); | 921 | dev_dbg(&link->dev, "ray_dev_start_xmit(skb=%p, dev=%p)\n", skb, dev); |
933 | if (local->authentication_state == NEED_TO_AUTH) { | 922 | if (local->authentication_state == NEED_TO_AUTH) { |
934 | DEBUG(0, "ray_cs Sending authentication request.\n"); | 923 | dev_dbg(&link->dev, "ray_cs Sending authentication request.\n"); |
935 | if (!build_auth_frame(local, local->auth_id, OPEN_AUTH_REQUEST)) { | 924 | if (!build_auth_frame(local, local->auth_id, OPEN_AUTH_REQUEST)) { |
936 | local->authentication_state = AUTHENTICATED; | 925 | local->authentication_state = AUTHENTICATED; |
937 | netif_stop_queue(dev); | 926 | netif_stop_queue(dev); |
@@ -971,7 +960,7 @@ static int ray_hw_xmit(unsigned char *data, int len, struct net_device *dev, | |||
971 | struct tx_msg __iomem *ptx; /* Address of xmit buffer in PC space */ | 960 | struct tx_msg __iomem *ptx; /* Address of xmit buffer in PC space */ |
972 | short int addr; /* Address of xmit buffer in card space */ | 961 | short int addr; /* Address of xmit buffer in card space */ |
973 | 962 | ||
974 | DEBUG(3, "ray_hw_xmit(data=%p, len=%d, dev=%p)\n", data, len, dev); | 963 | pr_debug("ray_hw_xmit(data=%p, len=%d, dev=%p)\n", data, len, dev); |
975 | if (len + TX_HEADER_LENGTH > TX_BUF_SIZE) { | 964 | if (len + TX_HEADER_LENGTH > TX_BUF_SIZE) { |
976 | printk(KERN_INFO "ray_hw_xmit packet too large: %d bytes\n", | 965 | printk(KERN_INFO "ray_hw_xmit packet too large: %d bytes\n", |
977 | len); | 966 | len); |
@@ -979,9 +968,9 @@ static int ray_hw_xmit(unsigned char *data, int len, struct net_device *dev, | |||
979 | } | 968 | } |
980 | switch (ccsindex = get_free_tx_ccs(local)) { | 969 | switch (ccsindex = get_free_tx_ccs(local)) { |
981 | case ECCSBUSY: | 970 | case ECCSBUSY: |
982 | DEBUG(2, "ray_hw_xmit tx_ccs table busy\n"); | 971 | pr_debug("ray_hw_xmit tx_ccs table busy\n"); |
983 | case ECCSFULL: | 972 | case ECCSFULL: |
984 | DEBUG(2, "ray_hw_xmit No free tx ccs\n"); | 973 | pr_debug("ray_hw_xmit No free tx ccs\n"); |
985 | case ECARDGONE: | 974 | case ECARDGONE: |
986 | netif_stop_queue(dev); | 975 | netif_stop_queue(dev); |
987 | return XMIT_NO_CCS; | 976 | return XMIT_NO_CCS; |
@@ -1018,12 +1007,12 @@ static int ray_hw_xmit(unsigned char *data, int len, struct net_device *dev, | |||
1018 | writeb(PSM_CAM, &pccs->var.tx_request.pow_sav_mode); | 1007 | writeb(PSM_CAM, &pccs->var.tx_request.pow_sav_mode); |
1019 | writeb(local->net_default_tx_rate, &pccs->var.tx_request.tx_rate); | 1008 | writeb(local->net_default_tx_rate, &pccs->var.tx_request.tx_rate); |
1020 | writeb(0, &pccs->var.tx_request.antenna); | 1009 | writeb(0, &pccs->var.tx_request.antenna); |
1021 | DEBUG(3, "ray_hw_xmit default_tx_rate = 0x%x\n", | 1010 | pr_debug("ray_hw_xmit default_tx_rate = 0x%x\n", |
1022 | local->net_default_tx_rate); | 1011 | local->net_default_tx_rate); |
1023 | 1012 | ||
1024 | /* Interrupt the firmware to process the command */ | 1013 | /* Interrupt the firmware to process the command */ |
1025 | if (interrupt_ecf(local, ccsindex)) { | 1014 | if (interrupt_ecf(local, ccsindex)) { |
1026 | DEBUG(2, "ray_hw_xmit failed - ECF not ready for intr\n"); | 1015 | pr_debug("ray_hw_xmit failed - ECF not ready for intr\n"); |
1027 | /* TBD very inefficient to copy packet to buffer, and then not | 1016 | /* TBD very inefficient to copy packet to buffer, and then not |
1028 | send it, but the alternative is to queue the messages and that | 1017 | send it, but the alternative is to queue the messages and that |
1029 | won't be done for a while. Maybe set tbusy until a CCS is free? | 1018 | won't be done for a while. Maybe set tbusy until a CCS is free? |
@@ -1040,7 +1029,7 @@ static int translate_frame(ray_dev_t *local, struct tx_msg __iomem *ptx, | |||
1040 | { | 1029 | { |
1041 | __be16 proto = ((struct ethhdr *)data)->h_proto; | 1030 | __be16 proto = ((struct ethhdr *)data)->h_proto; |
1042 | if (ntohs(proto) >= 1536) { /* DIX II ethernet frame */ | 1031 | if (ntohs(proto) >= 1536) { /* DIX II ethernet frame */ |
1043 | DEBUG(3, "ray_cs translate_frame DIX II\n"); | 1032 | pr_debug("ray_cs translate_frame DIX II\n"); |
1044 | /* Copy LLC header to card buffer */ | 1033 | /* Copy LLC header to card buffer */ |
1045 | memcpy_toio(&ptx->var, eth2_llc, sizeof(eth2_llc)); | 1034 | memcpy_toio(&ptx->var, eth2_llc, sizeof(eth2_llc)); |
1046 | memcpy_toio(((void __iomem *)&ptx->var) + sizeof(eth2_llc), | 1035 | memcpy_toio(((void __iomem *)&ptx->var) + sizeof(eth2_llc), |
@@ -1056,9 +1045,9 @@ static int translate_frame(ray_dev_t *local, struct tx_msg __iomem *ptx, | |||
1056 | len - ETH_HLEN); | 1045 | len - ETH_HLEN); |
1057 | return (int)sizeof(struct snaphdr_t) - ETH_HLEN; | 1046 | return (int)sizeof(struct snaphdr_t) - ETH_HLEN; |
1058 | } else { /* already 802 type, and proto is length */ | 1047 | } else { /* already 802 type, and proto is length */ |
1059 | DEBUG(3, "ray_cs translate_frame 802\n"); | 1048 | pr_debug("ray_cs translate_frame 802\n"); |
1060 | if (proto == htons(0xffff)) { /* evil netware IPX 802.3 without LLC */ | 1049 | if (proto == htons(0xffff)) { /* evil netware IPX 802.3 without LLC */ |
1061 | DEBUG(3, "ray_cs translate_frame evil IPX\n"); | 1050 | pr_debug("ray_cs translate_frame evil IPX\n"); |
1062 | memcpy_toio(&ptx->var, data + ETH_HLEN, len - ETH_HLEN); | 1051 | memcpy_toio(&ptx->var, data + ETH_HLEN, len - ETH_HLEN); |
1063 | return 0 - ETH_HLEN; | 1052 | return 0 - ETH_HLEN; |
1064 | } | 1053 | } |
@@ -1603,7 +1592,7 @@ static int ray_open(struct net_device *dev) | |||
1603 | struct pcmcia_device *link; | 1592 | struct pcmcia_device *link; |
1604 | link = local->finder; | 1593 | link = local->finder; |
1605 | 1594 | ||
1606 | DEBUG(1, "ray_open('%s')\n", dev->name); | 1595 | dev_dbg(&link->dev, "ray_open('%s')\n", dev->name); |
1607 | 1596 | ||
1608 | if (link->open == 0) | 1597 | if (link->open == 0) |
1609 | local->num_multi = 0; | 1598 | local->num_multi = 0; |
@@ -1613,7 +1602,7 @@ static int ray_open(struct net_device *dev) | |||
1613 | if (local->card_status == CARD_AWAITING_PARAM) { | 1602 | if (local->card_status == CARD_AWAITING_PARAM) { |
1614 | int i; | 1603 | int i; |
1615 | 1604 | ||
1616 | DEBUG(1, "ray_open: doing init now !\n"); | 1605 | dev_dbg(&link->dev, "ray_open: doing init now !\n"); |
1617 | 1606 | ||
1618 | /* Download startup parameters */ | 1607 | /* Download startup parameters */ |
1619 | if ((i = dl_startup_params(dev)) < 0) { | 1608 | if ((i = dl_startup_params(dev)) < 0) { |
@@ -1629,7 +1618,7 @@ static int ray_open(struct net_device *dev) | |||
1629 | else | 1618 | else |
1630 | netif_start_queue(dev); | 1619 | netif_start_queue(dev); |
1631 | 1620 | ||
1632 | DEBUG(2, "ray_open ending\n"); | 1621 | dev_dbg(&link->dev, "ray_open ending\n"); |
1633 | return 0; | 1622 | return 0; |
1634 | } /* end ray_open */ | 1623 | } /* end ray_open */ |
1635 | 1624 | ||
@@ -1640,7 +1629,7 @@ static int ray_dev_close(struct net_device *dev) | |||
1640 | struct pcmcia_device *link; | 1629 | struct pcmcia_device *link; |
1641 | link = local->finder; | 1630 | link = local->finder; |
1642 | 1631 | ||
1643 | DEBUG(1, "ray_dev_close('%s')\n", dev->name); | 1632 | dev_dbg(&link->dev, "ray_dev_close('%s')\n", dev->name); |
1644 | 1633 | ||
1645 | link->open--; | 1634 | link->open--; |
1646 | netif_stop_queue(dev); | 1635 | netif_stop_queue(dev); |
@@ -1656,7 +1645,7 @@ static int ray_dev_close(struct net_device *dev) | |||
1656 | /*===========================================================================*/ | 1645 | /*===========================================================================*/ |
1657 | static void ray_reset(struct net_device *dev) | 1646 | static void ray_reset(struct net_device *dev) |
1658 | { | 1647 | { |
1659 | DEBUG(1, "ray_reset entered\n"); | 1648 | pr_debug("ray_reset entered\n"); |
1660 | return; | 1649 | return; |
1661 | } | 1650 | } |
1662 | 1651 | ||
@@ -1669,17 +1658,17 @@ static int interrupt_ecf(ray_dev_t *local, int ccs) | |||
1669 | struct pcmcia_device *link = local->finder; | 1658 | struct pcmcia_device *link = local->finder; |
1670 | 1659 | ||
1671 | if (!(pcmcia_dev_present(link))) { | 1660 | if (!(pcmcia_dev_present(link))) { |
1672 | DEBUG(2, "ray_cs interrupt_ecf - device not present\n"); | 1661 | dev_dbg(&link->dev, "ray_cs interrupt_ecf - device not present\n"); |
1673 | return -1; | 1662 | return -1; |
1674 | } | 1663 | } |
1675 | DEBUG(2, "interrupt_ecf(local=%p, ccs = 0x%x\n", local, ccs); | 1664 | dev_dbg(&link->dev, "interrupt_ecf(local=%p, ccs = 0x%x\n", local, ccs); |
1676 | 1665 | ||
1677 | while (i && | 1666 | while (i && |
1678 | (readb(local->amem + CIS_OFFSET + ECF_INTR_OFFSET) & | 1667 | (readb(local->amem + CIS_OFFSET + ECF_INTR_OFFSET) & |
1679 | ECF_INTR_SET)) | 1668 | ECF_INTR_SET)) |
1680 | i--; | 1669 | i--; |
1681 | if (i == 0) { | 1670 | if (i == 0) { |
1682 | DEBUG(2, "ray_cs interrupt_ecf card not ready for interrupt\n"); | 1671 | dev_dbg(&link->dev, "ray_cs interrupt_ecf card not ready for interrupt\n"); |
1683 | return -1; | 1672 | return -1; |
1684 | } | 1673 | } |
1685 | /* Fill the mailbox, then kick the card */ | 1674 | /* Fill the mailbox, then kick the card */ |
@@ -1698,12 +1687,12 @@ static int get_free_tx_ccs(ray_dev_t *local) | |||
1698 | struct pcmcia_device *link = local->finder; | 1687 | struct pcmcia_device *link = local->finder; |
1699 | 1688 | ||
1700 | if (!(pcmcia_dev_present(link))) { | 1689 | if (!(pcmcia_dev_present(link))) { |
1701 | DEBUG(2, "ray_cs get_free_tx_ccs - device not present\n"); | 1690 | dev_dbg(&link->dev, "ray_cs get_free_tx_ccs - device not present\n"); |
1702 | return ECARDGONE; | 1691 | return ECARDGONE; |
1703 | } | 1692 | } |
1704 | 1693 | ||
1705 | if (test_and_set_bit(0, &local->tx_ccs_lock)) { | 1694 | if (test_and_set_bit(0, &local->tx_ccs_lock)) { |
1706 | DEBUG(1, "ray_cs tx_ccs_lock busy\n"); | 1695 | dev_dbg(&link->dev, "ray_cs tx_ccs_lock busy\n"); |
1707 | return ECCSBUSY; | 1696 | return ECCSBUSY; |
1708 | } | 1697 | } |
1709 | 1698 | ||
@@ -1716,7 +1705,7 @@ static int get_free_tx_ccs(ray_dev_t *local) | |||
1716 | } | 1705 | } |
1717 | } | 1706 | } |
1718 | local->tx_ccs_lock = 0; | 1707 | local->tx_ccs_lock = 0; |
1719 | DEBUG(2, "ray_cs ERROR no free tx CCS for raylink card\n"); | 1708 | dev_dbg(&link->dev, "ray_cs ERROR no free tx CCS for raylink card\n"); |
1720 | return ECCSFULL; | 1709 | return ECCSFULL; |
1721 | } /* get_free_tx_ccs */ | 1710 | } /* get_free_tx_ccs */ |
1722 | 1711 | ||
@@ -1730,11 +1719,11 @@ static int get_free_ccs(ray_dev_t *local) | |||
1730 | struct pcmcia_device *link = local->finder; | 1719 | struct pcmcia_device *link = local->finder; |
1731 | 1720 | ||
1732 | if (!(pcmcia_dev_present(link))) { | 1721 | if (!(pcmcia_dev_present(link))) { |
1733 | DEBUG(2, "ray_cs get_free_ccs - device not present\n"); | 1722 | dev_dbg(&link->dev, "ray_cs get_free_ccs - device not present\n"); |
1734 | return ECARDGONE; | 1723 | return ECARDGONE; |
1735 | } | 1724 | } |
1736 | if (test_and_set_bit(0, &local->ccs_lock)) { | 1725 | if (test_and_set_bit(0, &local->ccs_lock)) { |
1737 | DEBUG(1, "ray_cs ccs_lock busy\n"); | 1726 | dev_dbg(&link->dev, "ray_cs ccs_lock busy\n"); |
1738 | return ECCSBUSY; | 1727 | return ECCSBUSY; |
1739 | } | 1728 | } |
1740 | 1729 | ||
@@ -1747,7 +1736,7 @@ static int get_free_ccs(ray_dev_t *local) | |||
1747 | } | 1736 | } |
1748 | } | 1737 | } |
1749 | local->ccs_lock = 0; | 1738 | local->ccs_lock = 0; |
1750 | DEBUG(1, "ray_cs ERROR no free CCS for raylink card\n"); | 1739 | dev_dbg(&link->dev, "ray_cs ERROR no free CCS for raylink card\n"); |
1751 | return ECCSFULL; | 1740 | return ECCSFULL; |
1752 | } /* get_free_ccs */ | 1741 | } /* get_free_ccs */ |
1753 | 1742 | ||
@@ -1823,7 +1812,7 @@ static struct net_device_stats *ray_get_stats(struct net_device *dev) | |||
1823 | struct pcmcia_device *link = local->finder; | 1812 | struct pcmcia_device *link = local->finder; |
1824 | struct status __iomem *p = local->sram + STATUS_BASE; | 1813 | struct status __iomem *p = local->sram + STATUS_BASE; |
1825 | if (!(pcmcia_dev_present(link))) { | 1814 | if (!(pcmcia_dev_present(link))) { |
1826 | DEBUG(2, "ray_cs net_device_stats - device not present\n"); | 1815 | dev_dbg(&link->dev, "ray_cs net_device_stats - device not present\n"); |
1827 | return &local->stats; | 1816 | return &local->stats; |
1828 | } | 1817 | } |
1829 | if (readb(&p->mrx_overflow_for_host)) { | 1818 | if (readb(&p->mrx_overflow_for_host)) { |
@@ -1856,12 +1845,12 @@ static void ray_update_parm(struct net_device *dev, UCHAR objid, UCHAR *value, | |||
1856 | struct ccs __iomem *pccs; | 1845 | struct ccs __iomem *pccs; |
1857 | 1846 | ||
1858 | if (!(pcmcia_dev_present(link))) { | 1847 | if (!(pcmcia_dev_present(link))) { |
1859 | DEBUG(2, "ray_update_parm - device not present\n"); | 1848 | dev_dbg(&link->dev, "ray_update_parm - device not present\n"); |
1860 | return; | 1849 | return; |
1861 | } | 1850 | } |
1862 | 1851 | ||
1863 | if ((ccsindex = get_free_ccs(local)) < 0) { | 1852 | if ((ccsindex = get_free_ccs(local)) < 0) { |
1864 | DEBUG(0, "ray_update_parm - No free ccs\n"); | 1853 | dev_dbg(&link->dev, "ray_update_parm - No free ccs\n"); |
1865 | return; | 1854 | return; |
1866 | } | 1855 | } |
1867 | pccs = ccs_base(local) + ccsindex; | 1856 | pccs = ccs_base(local) + ccsindex; |
@@ -1874,7 +1863,7 @@ static void ray_update_parm(struct net_device *dev, UCHAR objid, UCHAR *value, | |||
1874 | } | 1863 | } |
1875 | /* Interrupt the firmware to process the command */ | 1864 | /* Interrupt the firmware to process the command */ |
1876 | if (interrupt_ecf(local, ccsindex)) { | 1865 | if (interrupt_ecf(local, ccsindex)) { |
1877 | DEBUG(0, "ray_cs associate failed - ECF not ready for intr\n"); | 1866 | dev_dbg(&link->dev, "ray_cs associate failed - ECF not ready for intr\n"); |
1878 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); | 1867 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); |
1879 | } | 1868 | } |
1880 | } | 1869 | } |
@@ -1891,12 +1880,12 @@ static void ray_update_multi_list(struct net_device *dev, int all) | |||
1891 | void __iomem *p = local->sram + HOST_TO_ECF_BASE; | 1880 | void __iomem *p = local->sram + HOST_TO_ECF_BASE; |
1892 | 1881 | ||
1893 | if (!(pcmcia_dev_present(link))) { | 1882 | if (!(pcmcia_dev_present(link))) { |
1894 | DEBUG(2, "ray_update_multi_list - device not present\n"); | 1883 | dev_dbg(&link->dev, "ray_update_multi_list - device not present\n"); |
1895 | return; | 1884 | return; |
1896 | } else | 1885 | } else |
1897 | DEBUG(2, "ray_update_multi_list(%p)\n", dev); | 1886 | dev_dbg(&link->dev, "ray_update_multi_list(%p)\n", dev); |
1898 | if ((ccsindex = get_free_ccs(local)) < 0) { | 1887 | if ((ccsindex = get_free_ccs(local)) < 0) { |
1899 | DEBUG(1, "ray_update_multi - No free ccs\n"); | 1888 | dev_dbg(&link->dev, "ray_update_multi - No free ccs\n"); |
1900 | return; | 1889 | return; |
1901 | } | 1890 | } |
1902 | pccs = ccs_base(local) + ccsindex; | 1891 | pccs = ccs_base(local) + ccsindex; |
@@ -1910,7 +1899,7 @@ static void ray_update_multi_list(struct net_device *dev, int all) | |||
1910 | for (dmip = &dev->mc_list; (dmi = *dmip) != NULL; | 1899 | for (dmip = &dev->mc_list; (dmi = *dmip) != NULL; |
1911 | dmip = &dmi->next) { | 1900 | dmip = &dmi->next) { |
1912 | memcpy_toio(p, dmi->dmi_addr, ETH_ALEN); | 1901 | memcpy_toio(p, dmi->dmi_addr, ETH_ALEN); |
1913 | DEBUG(1, | 1902 | dev_dbg(&link->dev, |
1914 | "ray_update_multi add addr %02x%02x%02x%02x%02x%02x\n", | 1903 | "ray_update_multi add addr %02x%02x%02x%02x%02x%02x\n", |
1915 | dmi->dmi_addr[0], dmi->dmi_addr[1], | 1904 | dmi->dmi_addr[0], dmi->dmi_addr[1], |
1916 | dmi->dmi_addr[2], dmi->dmi_addr[3], | 1905 | dmi->dmi_addr[2], dmi->dmi_addr[3], |
@@ -1921,12 +1910,12 @@ static void ray_update_multi_list(struct net_device *dev, int all) | |||
1921 | if (i > 256 / ADDRLEN) | 1910 | if (i > 256 / ADDRLEN) |
1922 | i = 256 / ADDRLEN; | 1911 | i = 256 / ADDRLEN; |
1923 | writeb((UCHAR) i, &pccs->var); | 1912 | writeb((UCHAR) i, &pccs->var); |
1924 | DEBUG(1, "ray_cs update_multi %d addresses in list\n", i); | 1913 | dev_dbg(&link->dev, "ray_cs update_multi %d addresses in list\n", i); |
1925 | /* Interrupt the firmware to process the command */ | 1914 | /* Interrupt the firmware to process the command */ |
1926 | local->num_multi = i; | 1915 | local->num_multi = i; |
1927 | } | 1916 | } |
1928 | if (interrupt_ecf(local, ccsindex)) { | 1917 | if (interrupt_ecf(local, ccsindex)) { |
1929 | DEBUG(1, | 1918 | dev_dbg(&link->dev, |
1930 | "ray_cs update_multi failed - ECF not ready for intr\n"); | 1919 | "ray_cs update_multi failed - ECF not ready for intr\n"); |
1931 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); | 1920 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); |
1932 | } | 1921 | } |
@@ -1938,11 +1927,11 @@ static void set_multicast_list(struct net_device *dev) | |||
1938 | ray_dev_t *local = netdev_priv(dev); | 1927 | ray_dev_t *local = netdev_priv(dev); |
1939 | UCHAR promisc; | 1928 | UCHAR promisc; |
1940 | 1929 | ||
1941 | DEBUG(2, "ray_cs set_multicast_list(%p)\n", dev); | 1930 | pr_debug("ray_cs set_multicast_list(%p)\n", dev); |
1942 | 1931 | ||
1943 | if (dev->flags & IFF_PROMISC) { | 1932 | if (dev->flags & IFF_PROMISC) { |
1944 | if (local->sparm.b5.a_promiscuous_mode == 0) { | 1933 | if (local->sparm.b5.a_promiscuous_mode == 0) { |
1945 | DEBUG(1, "ray_cs set_multicast_list promisc on\n"); | 1934 | pr_debug("ray_cs set_multicast_list promisc on\n"); |
1946 | local->sparm.b5.a_promiscuous_mode = 1; | 1935 | local->sparm.b5.a_promiscuous_mode = 1; |
1947 | promisc = 1; | 1936 | promisc = 1; |
1948 | ray_update_parm(dev, OBJID_promiscuous_mode, | 1937 | ray_update_parm(dev, OBJID_promiscuous_mode, |
@@ -1950,7 +1939,7 @@ static void set_multicast_list(struct net_device *dev) | |||
1950 | } | 1939 | } |
1951 | } else { | 1940 | } else { |
1952 | if (local->sparm.b5.a_promiscuous_mode == 1) { | 1941 | if (local->sparm.b5.a_promiscuous_mode == 1) { |
1953 | DEBUG(1, "ray_cs set_multicast_list promisc off\n"); | 1942 | pr_debug("ray_cs set_multicast_list promisc off\n"); |
1954 | local->sparm.b5.a_promiscuous_mode = 0; | 1943 | local->sparm.b5.a_promiscuous_mode = 0; |
1955 | promisc = 0; | 1944 | promisc = 0; |
1956 | ray_update_parm(dev, OBJID_promiscuous_mode, | 1945 | ray_update_parm(dev, OBJID_promiscuous_mode, |
@@ -1984,19 +1973,19 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
1984 | if (dev == NULL) /* Note that we want interrupts with dev->start == 0 */ | 1973 | if (dev == NULL) /* Note that we want interrupts with dev->start == 0 */ |
1985 | return IRQ_NONE; | 1974 | return IRQ_NONE; |
1986 | 1975 | ||
1987 | DEBUG(4, "ray_cs: interrupt for *dev=%p\n", dev); | 1976 | pr_debug("ray_cs: interrupt for *dev=%p\n", dev); |
1988 | 1977 | ||
1989 | local = netdev_priv(dev); | 1978 | local = netdev_priv(dev); |
1990 | link = (struct pcmcia_device *)local->finder; | 1979 | link = (struct pcmcia_device *)local->finder; |
1991 | if (!pcmcia_dev_present(link)) { | 1980 | if (!pcmcia_dev_present(link)) { |
1992 | DEBUG(2, | 1981 | pr_debug( |
1993 | "ray_cs interrupt from device not present or suspended.\n"); | 1982 | "ray_cs interrupt from device not present or suspended.\n"); |
1994 | return IRQ_NONE; | 1983 | return IRQ_NONE; |
1995 | } | 1984 | } |
1996 | rcsindex = readb(&((struct scb __iomem *)(local->sram))->rcs_index); | 1985 | rcsindex = readb(&((struct scb __iomem *)(local->sram))->rcs_index); |
1997 | 1986 | ||
1998 | if (rcsindex >= (NUMBER_OF_CCS + NUMBER_OF_RCS)) { | 1987 | if (rcsindex >= (NUMBER_OF_CCS + NUMBER_OF_RCS)) { |
1999 | DEBUG(1, "ray_cs interrupt bad rcsindex = 0x%x\n", rcsindex); | 1988 | dev_dbg(&link->dev, "ray_cs interrupt bad rcsindex = 0x%x\n", rcsindex); |
2000 | clear_interrupt(local); | 1989 | clear_interrupt(local); |
2001 | return IRQ_HANDLED; | 1990 | return IRQ_HANDLED; |
2002 | } | 1991 | } |
@@ -2008,33 +1997,33 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2008 | case CCS_DOWNLOAD_STARTUP_PARAMS: /* Happens in firmware someday */ | 1997 | case CCS_DOWNLOAD_STARTUP_PARAMS: /* Happens in firmware someday */ |
2009 | del_timer(&local->timer); | 1998 | del_timer(&local->timer); |
2010 | if (status == CCS_COMMAND_COMPLETE) { | 1999 | if (status == CCS_COMMAND_COMPLETE) { |
2011 | DEBUG(1, | 2000 | dev_dbg(&link->dev, |
2012 | "ray_cs interrupt download_startup_parameters OK\n"); | 2001 | "ray_cs interrupt download_startup_parameters OK\n"); |
2013 | } else { | 2002 | } else { |
2014 | DEBUG(1, | 2003 | dev_dbg(&link->dev, |
2015 | "ray_cs interrupt download_startup_parameters fail\n"); | 2004 | "ray_cs interrupt download_startup_parameters fail\n"); |
2016 | } | 2005 | } |
2017 | break; | 2006 | break; |
2018 | case CCS_UPDATE_PARAMS: | 2007 | case CCS_UPDATE_PARAMS: |
2019 | DEBUG(1, "ray_cs interrupt update params done\n"); | 2008 | dev_dbg(&link->dev, "ray_cs interrupt update params done\n"); |
2020 | if (status != CCS_COMMAND_COMPLETE) { | 2009 | if (status != CCS_COMMAND_COMPLETE) { |
2021 | tmp = | 2010 | tmp = |
2022 | readb(&pccs->var.update_param. | 2011 | readb(&pccs->var.update_param. |
2023 | failure_cause); | 2012 | failure_cause); |
2024 | DEBUG(0, | 2013 | dev_dbg(&link->dev, |
2025 | "ray_cs interrupt update params failed - reason %d\n", | 2014 | "ray_cs interrupt update params failed - reason %d\n", |
2026 | tmp); | 2015 | tmp); |
2027 | } | 2016 | } |
2028 | break; | 2017 | break; |
2029 | case CCS_REPORT_PARAMS: | 2018 | case CCS_REPORT_PARAMS: |
2030 | DEBUG(1, "ray_cs interrupt report params done\n"); | 2019 | dev_dbg(&link->dev, "ray_cs interrupt report params done\n"); |
2031 | break; | 2020 | break; |
2032 | case CCS_UPDATE_MULTICAST_LIST: /* Note that this CCS isn't returned */ | 2021 | case CCS_UPDATE_MULTICAST_LIST: /* Note that this CCS isn't returned */ |
2033 | DEBUG(1, | 2022 | dev_dbg(&link->dev, |
2034 | "ray_cs interrupt CCS Update Multicast List done\n"); | 2023 | "ray_cs interrupt CCS Update Multicast List done\n"); |
2035 | break; | 2024 | break; |
2036 | case CCS_UPDATE_POWER_SAVINGS_MODE: | 2025 | case CCS_UPDATE_POWER_SAVINGS_MODE: |
2037 | DEBUG(1, | 2026 | dev_dbg(&link->dev, |
2038 | "ray_cs interrupt update power save mode done\n"); | 2027 | "ray_cs interrupt update power save mode done\n"); |
2039 | break; | 2028 | break; |
2040 | case CCS_START_NETWORK: | 2029 | case CCS_START_NETWORK: |
@@ -2043,11 +2032,11 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2043 | if (readb | 2032 | if (readb |
2044 | (&pccs->var.start_network.net_initiated) == | 2033 | (&pccs->var.start_network.net_initiated) == |
2045 | 1) { | 2034 | 1) { |
2046 | DEBUG(0, | 2035 | dev_dbg(&link->dev, |
2047 | "ray_cs interrupt network \"%s\" started\n", | 2036 | "ray_cs interrupt network \"%s\" started\n", |
2048 | local->sparm.b4.a_current_ess_id); | 2037 | local->sparm.b4.a_current_ess_id); |
2049 | } else { | 2038 | } else { |
2050 | DEBUG(0, | 2039 | dev_dbg(&link->dev, |
2051 | "ray_cs interrupt network \"%s\" joined\n", | 2040 | "ray_cs interrupt network \"%s\" joined\n", |
2052 | local->sparm.b4.a_current_ess_id); | 2041 | local->sparm.b4.a_current_ess_id); |
2053 | } | 2042 | } |
@@ -2075,12 +2064,12 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2075 | local->timer.expires = jiffies + HZ * 5; | 2064 | local->timer.expires = jiffies + HZ * 5; |
2076 | local->timer.data = (long)local; | 2065 | local->timer.data = (long)local; |
2077 | if (status == CCS_START_NETWORK) { | 2066 | if (status == CCS_START_NETWORK) { |
2078 | DEBUG(0, | 2067 | dev_dbg(&link->dev, |
2079 | "ray_cs interrupt network \"%s\" start failed\n", | 2068 | "ray_cs interrupt network \"%s\" start failed\n", |
2080 | local->sparm.b4.a_current_ess_id); | 2069 | local->sparm.b4.a_current_ess_id); |
2081 | local->timer.function = &start_net; | 2070 | local->timer.function = &start_net; |
2082 | } else { | 2071 | } else { |
2083 | DEBUG(0, | 2072 | dev_dbg(&link->dev, |
2084 | "ray_cs interrupt network \"%s\" join failed\n", | 2073 | "ray_cs interrupt network \"%s\" join failed\n", |
2085 | local->sparm.b4.a_current_ess_id); | 2074 | local->sparm.b4.a_current_ess_id); |
2086 | local->timer.function = &join_net; | 2075 | local->timer.function = &join_net; |
@@ -2091,19 +2080,19 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2091 | case CCS_START_ASSOCIATION: | 2080 | case CCS_START_ASSOCIATION: |
2092 | if (status == CCS_COMMAND_COMPLETE) { | 2081 | if (status == CCS_COMMAND_COMPLETE) { |
2093 | local->card_status = CARD_ASSOC_COMPLETE; | 2082 | local->card_status = CARD_ASSOC_COMPLETE; |
2094 | DEBUG(0, "ray_cs association successful\n"); | 2083 | dev_dbg(&link->dev, "ray_cs association successful\n"); |
2095 | } else { | 2084 | } else { |
2096 | DEBUG(0, "ray_cs association failed,\n"); | 2085 | dev_dbg(&link->dev, "ray_cs association failed,\n"); |
2097 | local->card_status = CARD_ASSOC_FAILED; | 2086 | local->card_status = CARD_ASSOC_FAILED; |
2098 | join_net((u_long) local); | 2087 | join_net((u_long) local); |
2099 | } | 2088 | } |
2100 | break; | 2089 | break; |
2101 | case CCS_TX_REQUEST: | 2090 | case CCS_TX_REQUEST: |
2102 | if (status == CCS_COMMAND_COMPLETE) { | 2091 | if (status == CCS_COMMAND_COMPLETE) { |
2103 | DEBUG(3, | 2092 | dev_dbg(&link->dev, |
2104 | "ray_cs interrupt tx request complete\n"); | 2093 | "ray_cs interrupt tx request complete\n"); |
2105 | } else { | 2094 | } else { |
2106 | DEBUG(1, | 2095 | dev_dbg(&link->dev, |
2107 | "ray_cs interrupt tx request failed\n"); | 2096 | "ray_cs interrupt tx request failed\n"); |
2108 | } | 2097 | } |
2109 | if (!sniffer) | 2098 | if (!sniffer) |
@@ -2111,21 +2100,21 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2111 | netif_wake_queue(dev); | 2100 | netif_wake_queue(dev); |
2112 | break; | 2101 | break; |
2113 | case CCS_TEST_MEMORY: | 2102 | case CCS_TEST_MEMORY: |
2114 | DEBUG(1, "ray_cs interrupt mem test done\n"); | 2103 | dev_dbg(&link->dev, "ray_cs interrupt mem test done\n"); |
2115 | break; | 2104 | break; |
2116 | case CCS_SHUTDOWN: | 2105 | case CCS_SHUTDOWN: |
2117 | DEBUG(1, | 2106 | dev_dbg(&link->dev, |
2118 | "ray_cs interrupt Unexpected CCS returned - Shutdown\n"); | 2107 | "ray_cs interrupt Unexpected CCS returned - Shutdown\n"); |
2119 | break; | 2108 | break; |
2120 | case CCS_DUMP_MEMORY: | 2109 | case CCS_DUMP_MEMORY: |
2121 | DEBUG(1, "ray_cs interrupt dump memory done\n"); | 2110 | dev_dbg(&link->dev, "ray_cs interrupt dump memory done\n"); |
2122 | break; | 2111 | break; |
2123 | case CCS_START_TIMER: | 2112 | case CCS_START_TIMER: |
2124 | DEBUG(2, | 2113 | dev_dbg(&link->dev, |
2125 | "ray_cs interrupt DING - raylink timer expired\n"); | 2114 | "ray_cs interrupt DING - raylink timer expired\n"); |
2126 | break; | 2115 | break; |
2127 | default: | 2116 | default: |
2128 | DEBUG(1, | 2117 | dev_dbg(&link->dev, |
2129 | "ray_cs interrupt Unexpected CCS 0x%x returned 0x%x\n", | 2118 | "ray_cs interrupt Unexpected CCS 0x%x returned 0x%x\n", |
2130 | rcsindex, cmd); | 2119 | rcsindex, cmd); |
2131 | } | 2120 | } |
@@ -2139,7 +2128,7 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2139 | ray_rx(dev, local, prcs); | 2128 | ray_rx(dev, local, prcs); |
2140 | break; | 2129 | break; |
2141 | case REJOIN_NET_COMPLETE: | 2130 | case REJOIN_NET_COMPLETE: |
2142 | DEBUG(1, "ray_cs interrupt rejoin net complete\n"); | 2131 | dev_dbg(&link->dev, "ray_cs interrupt rejoin net complete\n"); |
2143 | local->card_status = CARD_ACQ_COMPLETE; | 2132 | local->card_status = CARD_ACQ_COMPLETE; |
2144 | /* do we need to clear tx buffers CCS's? */ | 2133 | /* do we need to clear tx buffers CCS's? */ |
2145 | if (local->sparm.b4.a_network_type == ADHOC) { | 2134 | if (local->sparm.b4.a_network_type == ADHOC) { |
@@ -2149,7 +2138,7 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2149 | memcpy_fromio(&local->bss_id, | 2138 | memcpy_fromio(&local->bss_id, |
2150 | prcs->var.rejoin_net_complete. | 2139 | prcs->var.rejoin_net_complete. |
2151 | bssid, ADDRLEN); | 2140 | bssid, ADDRLEN); |
2152 | DEBUG(1, | 2141 | dev_dbg(&link->dev, |
2153 | "ray_cs new BSSID = %02x%02x%02x%02x%02x%02x\n", | 2142 | "ray_cs new BSSID = %02x%02x%02x%02x%02x%02x\n", |
2154 | local->bss_id[0], local->bss_id[1], | 2143 | local->bss_id[0], local->bss_id[1], |
2155 | local->bss_id[2], local->bss_id[3], | 2144 | local->bss_id[2], local->bss_id[3], |
@@ -2159,15 +2148,15 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
2159 | } | 2148 | } |
2160 | break; | 2149 | break; |
2161 | case ROAMING_INITIATED: | 2150 | case ROAMING_INITIATED: |
2162 | DEBUG(1, "ray_cs interrupt roaming initiated\n"); | 2151 | dev_dbg(&link->dev, "ray_cs interrupt roaming initiated\n"); |
2163 | netif_stop_queue(dev); | 2152 | netif_stop_queue(dev); |
2164 | local->card_status = CARD_DOING_ACQ; | 2153 | local->card_status = CARD_DOING_ACQ; |
2165 | break; | 2154 | break; |
2166 | case JAPAN_CALL_SIGN_RXD: | 2155 | case JAPAN_CALL_SIGN_RXD: |
2167 | DEBUG(1, "ray_cs interrupt japan call sign rx\n"); | 2156 | dev_dbg(&link->dev, "ray_cs interrupt japan call sign rx\n"); |
2168 | break; | 2157 | break; |
2169 | default: | 2158 | default: |
2170 | DEBUG(1, | 2159 | dev_dbg(&link->dev, |
2171 | "ray_cs Unexpected interrupt for RCS 0x%x cmd = 0x%x\n", | 2160 | "ray_cs Unexpected interrupt for RCS 0x%x cmd = 0x%x\n", |
2172 | rcsindex, | 2161 | rcsindex, |
2173 | (unsigned int)readb(&prcs->interrupt_id)); | 2162 | (unsigned int)readb(&prcs->interrupt_id)); |
@@ -2186,7 +2175,7 @@ static void ray_rx(struct net_device *dev, ray_dev_t *local, | |||
2186 | int rx_len; | 2175 | int rx_len; |
2187 | unsigned int pkt_addr; | 2176 | unsigned int pkt_addr; |
2188 | void __iomem *pmsg; | 2177 | void __iomem *pmsg; |
2189 | DEBUG(4, "ray_rx process rx packet\n"); | 2178 | pr_debug("ray_rx process rx packet\n"); |
2190 | 2179 | ||
2191 | /* Calculate address of packet within Rx buffer */ | 2180 | /* Calculate address of packet within Rx buffer */ |
2192 | pkt_addr = ((readb(&prcs->var.rx_packet.rx_data_ptr[0]) << 8) | 2181 | pkt_addr = ((readb(&prcs->var.rx_packet.rx_data_ptr[0]) << 8) |
@@ -2199,28 +2188,28 @@ static void ray_rx(struct net_device *dev, ray_dev_t *local, | |||
2199 | pmsg = local->rmem + pkt_addr; | 2188 | pmsg = local->rmem + pkt_addr; |
2200 | switch (readb(pmsg)) { | 2189 | switch (readb(pmsg)) { |
2201 | case DATA_TYPE: | 2190 | case DATA_TYPE: |
2202 | DEBUG(4, "ray_rx data type\n"); | 2191 | pr_debug("ray_rx data type\n"); |
2203 | rx_data(dev, prcs, pkt_addr, rx_len); | 2192 | rx_data(dev, prcs, pkt_addr, rx_len); |
2204 | break; | 2193 | break; |
2205 | case AUTHENTIC_TYPE: | 2194 | case AUTHENTIC_TYPE: |
2206 | DEBUG(4, "ray_rx authentic type\n"); | 2195 | pr_debug("ray_rx authentic type\n"); |
2207 | if (sniffer) | 2196 | if (sniffer) |
2208 | rx_data(dev, prcs, pkt_addr, rx_len); | 2197 | rx_data(dev, prcs, pkt_addr, rx_len); |
2209 | else | 2198 | else |
2210 | rx_authenticate(local, prcs, pkt_addr, rx_len); | 2199 | rx_authenticate(local, prcs, pkt_addr, rx_len); |
2211 | break; | 2200 | break; |
2212 | case DEAUTHENTIC_TYPE: | 2201 | case DEAUTHENTIC_TYPE: |
2213 | DEBUG(4, "ray_rx deauth type\n"); | 2202 | pr_debug("ray_rx deauth type\n"); |
2214 | if (sniffer) | 2203 | if (sniffer) |
2215 | rx_data(dev, prcs, pkt_addr, rx_len); | 2204 | rx_data(dev, prcs, pkt_addr, rx_len); |
2216 | else | 2205 | else |
2217 | rx_deauthenticate(local, prcs, pkt_addr, rx_len); | 2206 | rx_deauthenticate(local, prcs, pkt_addr, rx_len); |
2218 | break; | 2207 | break; |
2219 | case NULL_MSG_TYPE: | 2208 | case NULL_MSG_TYPE: |
2220 | DEBUG(3, "ray_cs rx NULL msg\n"); | 2209 | pr_debug("ray_cs rx NULL msg\n"); |
2221 | break; | 2210 | break; |
2222 | case BEACON_TYPE: | 2211 | case BEACON_TYPE: |
2223 | DEBUG(4, "ray_rx beacon type\n"); | 2212 | pr_debug("ray_rx beacon type\n"); |
2224 | if (sniffer) | 2213 | if (sniffer) |
2225 | rx_data(dev, prcs, pkt_addr, rx_len); | 2214 | rx_data(dev, prcs, pkt_addr, rx_len); |
2226 | 2215 | ||
@@ -2233,7 +2222,7 @@ static void ray_rx(struct net_device *dev, ray_dev_t *local, | |||
2233 | ray_get_stats(dev); | 2222 | ray_get_stats(dev); |
2234 | break; | 2223 | break; |
2235 | default: | 2224 | default: |
2236 | DEBUG(0, "ray_cs unknown pkt type %2x\n", | 2225 | pr_debug("ray_cs unknown pkt type %2x\n", |
2237 | (unsigned int)readb(pmsg)); | 2226 | (unsigned int)readb(pmsg)); |
2238 | break; | 2227 | break; |
2239 | } | 2228 | } |
@@ -2262,7 +2251,7 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, | |||
2262 | rx_len > | 2251 | rx_len > |
2263 | (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + | 2252 | (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + |
2264 | FCS_LEN)) { | 2253 | FCS_LEN)) { |
2265 | DEBUG(0, | 2254 | pr_debug( |
2266 | "ray_cs invalid packet length %d received \n", | 2255 | "ray_cs invalid packet length %d received \n", |
2267 | rx_len); | 2256 | rx_len); |
2268 | return; | 2257 | return; |
@@ -2273,17 +2262,17 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, | |||
2273 | rx_len > | 2262 | rx_len > |
2274 | (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + | 2263 | (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + |
2275 | FCS_LEN)) { | 2264 | FCS_LEN)) { |
2276 | DEBUG(0, | 2265 | pr_debug( |
2277 | "ray_cs invalid packet length %d received \n", | 2266 | "ray_cs invalid packet length %d received \n", |
2278 | rx_len); | 2267 | rx_len); |
2279 | return; | 2268 | return; |
2280 | } | 2269 | } |
2281 | } | 2270 | } |
2282 | } | 2271 | } |
2283 | DEBUG(4, "ray_cs rx_data packet\n"); | 2272 | pr_debug("ray_cs rx_data packet\n"); |
2284 | /* If fragmented packet, verify sizes of fragments add up */ | 2273 | /* If fragmented packet, verify sizes of fragments add up */ |
2285 | if (readb(&prcs->var.rx_packet.next_frag_rcs_index) != 0xFF) { | 2274 | if (readb(&prcs->var.rx_packet.next_frag_rcs_index) != 0xFF) { |
2286 | DEBUG(1, "ray_cs rx'ed fragment\n"); | 2275 | pr_debug("ray_cs rx'ed fragment\n"); |
2287 | tmp = (readb(&prcs->var.rx_packet.totalpacketlength[0]) << 8) | 2276 | tmp = (readb(&prcs->var.rx_packet.totalpacketlength[0]) << 8) |
2288 | + readb(&prcs->var.rx_packet.totalpacketlength[1]); | 2277 | + readb(&prcs->var.rx_packet.totalpacketlength[1]); |
2289 | total_len = tmp; | 2278 | total_len = tmp; |
@@ -2301,7 +2290,7 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, | |||
2301 | } while (1); | 2290 | } while (1); |
2302 | 2291 | ||
2303 | if (tmp < 0) { | 2292 | if (tmp < 0) { |
2304 | DEBUG(0, | 2293 | pr_debug( |
2305 | "ray_cs rx_data fragment lengths don't add up\n"); | 2294 | "ray_cs rx_data fragment lengths don't add up\n"); |
2306 | local->stats.rx_dropped++; | 2295 | local->stats.rx_dropped++; |
2307 | release_frag_chain(local, prcs); | 2296 | release_frag_chain(local, prcs); |
@@ -2313,7 +2302,7 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, | |||
2313 | 2302 | ||
2314 | skb = dev_alloc_skb(total_len + 5); | 2303 | skb = dev_alloc_skb(total_len + 5); |
2315 | if (skb == NULL) { | 2304 | if (skb == NULL) { |
2316 | DEBUG(0, "ray_cs rx_data could not allocate skb\n"); | 2305 | pr_debug("ray_cs rx_data could not allocate skb\n"); |
2317 | local->stats.rx_dropped++; | 2306 | local->stats.rx_dropped++; |
2318 | if (readb(&prcs->var.rx_packet.next_frag_rcs_index) != 0xFF) | 2307 | if (readb(&prcs->var.rx_packet.next_frag_rcs_index) != 0xFF) |
2319 | release_frag_chain(local, prcs); | 2308 | release_frag_chain(local, prcs); |
@@ -2321,7 +2310,7 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, | |||
2321 | } | 2310 | } |
2322 | skb_reserve(skb, 2); /* Align IP on 16 byte (TBD check this) */ | 2311 | skb_reserve(skb, 2); /* Align IP on 16 byte (TBD check this) */ |
2323 | 2312 | ||
2324 | DEBUG(4, "ray_cs rx_data total_len = %x, rx_len = %x\n", total_len, | 2313 | pr_debug("ray_cs rx_data total_len = %x, rx_len = %x\n", total_len, |
2325 | rx_len); | 2314 | rx_len); |
2326 | 2315 | ||
2327 | /************************/ | 2316 | /************************/ |
@@ -2354,7 +2343,7 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, | |||
2354 | tmp = 17; | 2343 | tmp = 17; |
2355 | if (readb(&prcs->var.rx_packet.next_frag_rcs_index) != 0xFF) { | 2344 | if (readb(&prcs->var.rx_packet.next_frag_rcs_index) != 0xFF) { |
2356 | prcslink = prcs; | 2345 | prcslink = prcs; |
2357 | DEBUG(1, "ray_cs rx_data in fragment loop\n"); | 2346 | pr_debug("ray_cs rx_data in fragment loop\n"); |
2358 | do { | 2347 | do { |
2359 | prcslink = rcs_base(local) | 2348 | prcslink = rcs_base(local) |
2360 | + | 2349 | + |
@@ -2426,8 +2415,8 @@ static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len) | |||
2426 | memcpy(destaddr, ieee80211_get_DA(pmac), ADDRLEN); | 2415 | memcpy(destaddr, ieee80211_get_DA(pmac), ADDRLEN); |
2427 | memcpy(srcaddr, ieee80211_get_SA(pmac), ADDRLEN); | 2416 | memcpy(srcaddr, ieee80211_get_SA(pmac), ADDRLEN); |
2428 | 2417 | ||
2429 | #ifdef PCMCIA_DEBUG | 2418 | #if 0 |
2430 | if (pc_debug > 3) { | 2419 | if { |
2431 | print_hex_dump(KERN_DEBUG, "skb->data before untranslate: ", | 2420 | print_hex_dump(KERN_DEBUG, "skb->data before untranslate: ", |
2432 | DUMP_PREFIX_NONE, 16, 1, | 2421 | DUMP_PREFIX_NONE, 16, 1, |
2433 | skb->data, 64, true); | 2422 | skb->data, 64, true); |
@@ -2441,7 +2430,7 @@ static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len) | |||
2441 | 2430 | ||
2442 | if (psnap->dsap != 0xaa || psnap->ssap != 0xaa || psnap->ctrl != 3) { | 2431 | if (psnap->dsap != 0xaa || psnap->ssap != 0xaa || psnap->ctrl != 3) { |
2443 | /* not a snap type so leave it alone */ | 2432 | /* not a snap type so leave it alone */ |
2444 | DEBUG(3, "ray_cs untranslate NOT SNAP %02x %02x %02x\n", | 2433 | pr_debug("ray_cs untranslate NOT SNAP %02x %02x %02x\n", |
2445 | psnap->dsap, psnap->ssap, psnap->ctrl); | 2434 | psnap->dsap, psnap->ssap, psnap->ctrl); |
2446 | 2435 | ||
2447 | delta = RX_MAC_HEADER_LENGTH - ETH_HLEN; | 2436 | delta = RX_MAC_HEADER_LENGTH - ETH_HLEN; |
@@ -2450,7 +2439,7 @@ static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len) | |||
2450 | } else { /* Its a SNAP */ | 2439 | } else { /* Its a SNAP */ |
2451 | if (memcmp(psnap->org, org_bridge, 3) == 0) { | 2440 | if (memcmp(psnap->org, org_bridge, 3) == 0) { |
2452 | /* EtherII and nuke the LLC */ | 2441 | /* EtherII and nuke the LLC */ |
2453 | DEBUG(3, "ray_cs untranslate Bridge encap\n"); | 2442 | pr_debug("ray_cs untranslate Bridge encap\n"); |
2454 | delta = RX_MAC_HEADER_LENGTH | 2443 | delta = RX_MAC_HEADER_LENGTH |
2455 | + sizeof(struct snaphdr_t) - ETH_HLEN; | 2444 | + sizeof(struct snaphdr_t) - ETH_HLEN; |
2456 | peth = (struct ethhdr *)(skb->data + delta); | 2445 | peth = (struct ethhdr *)(skb->data + delta); |
@@ -2459,14 +2448,14 @@ static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len) | |||
2459 | switch (ntohs(type)) { | 2448 | switch (ntohs(type)) { |
2460 | case ETH_P_IPX: | 2449 | case ETH_P_IPX: |
2461 | case ETH_P_AARP: | 2450 | case ETH_P_AARP: |
2462 | DEBUG(3, "ray_cs untranslate RFC IPX/AARP\n"); | 2451 | pr_debug("ray_cs untranslate RFC IPX/AARP\n"); |
2463 | delta = RX_MAC_HEADER_LENGTH - ETH_HLEN; | 2452 | delta = RX_MAC_HEADER_LENGTH - ETH_HLEN; |
2464 | peth = (struct ethhdr *)(skb->data + delta); | 2453 | peth = (struct ethhdr *)(skb->data + delta); |
2465 | peth->h_proto = | 2454 | peth->h_proto = |
2466 | htons(len - RX_MAC_HEADER_LENGTH); | 2455 | htons(len - RX_MAC_HEADER_LENGTH); |
2467 | break; | 2456 | break; |
2468 | default: | 2457 | default: |
2469 | DEBUG(3, "ray_cs untranslate RFC default\n"); | 2458 | pr_debug("ray_cs untranslate RFC default\n"); |
2470 | delta = RX_MAC_HEADER_LENGTH + | 2459 | delta = RX_MAC_HEADER_LENGTH + |
2471 | sizeof(struct snaphdr_t) - ETH_HLEN; | 2460 | sizeof(struct snaphdr_t) - ETH_HLEN; |
2472 | peth = (struct ethhdr *)(skb->data + delta); | 2461 | peth = (struct ethhdr *)(skb->data + delta); |
@@ -2482,12 +2471,12 @@ static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len) | |||
2482 | } | 2471 | } |
2483 | /* TBD reserve skb_reserve(skb, delta); */ | 2472 | /* TBD reserve skb_reserve(skb, delta); */ |
2484 | skb_pull(skb, delta); | 2473 | skb_pull(skb, delta); |
2485 | DEBUG(3, "untranslate after skb_pull(%d), skb->data = %p\n", delta, | 2474 | pr_debug("untranslate after skb_pull(%d), skb->data = %p\n", delta, |
2486 | skb->data); | 2475 | skb->data); |
2487 | memcpy(peth->h_dest, destaddr, ADDRLEN); | 2476 | memcpy(peth->h_dest, destaddr, ADDRLEN); |
2488 | memcpy(peth->h_source, srcaddr, ADDRLEN); | 2477 | memcpy(peth->h_source, srcaddr, ADDRLEN); |
2489 | #ifdef PCMCIA_DEBUG | 2478 | #if 0 |
2490 | if (pc_debug > 3) { | 2479 | { |
2491 | int i; | 2480 | int i; |
2492 | printk(KERN_DEBUG "skb->data after untranslate:"); | 2481 | printk(KERN_DEBUG "skb->data after untranslate:"); |
2493 | for (i = 0; i < 64; i++) | 2482 | for (i = 0; i < 64; i++) |
@@ -2529,7 +2518,7 @@ static void release_frag_chain(ray_dev_t *local, struct rcs __iomem *prcs) | |||
2529 | while (tmp--) { | 2518 | while (tmp--) { |
2530 | writeb(CCS_BUFFER_FREE, &prcslink->buffer_status); | 2519 | writeb(CCS_BUFFER_FREE, &prcslink->buffer_status); |
2531 | if (rcsindex >= (NUMBER_OF_CCS + NUMBER_OF_RCS)) { | 2520 | if (rcsindex >= (NUMBER_OF_CCS + NUMBER_OF_RCS)) { |
2532 | DEBUG(1, "ray_cs interrupt bad rcsindex = 0x%x\n", | 2521 | pr_debug("ray_cs interrupt bad rcsindex = 0x%x\n", |
2533 | rcsindex); | 2522 | rcsindex); |
2534 | break; | 2523 | break; |
2535 | } | 2524 | } |
@@ -2543,9 +2532,9 @@ static void release_frag_chain(ray_dev_t *local, struct rcs __iomem *prcs) | |||
2543 | static void authenticate(ray_dev_t *local) | 2532 | static void authenticate(ray_dev_t *local) |
2544 | { | 2533 | { |
2545 | struct pcmcia_device *link = local->finder; | 2534 | struct pcmcia_device *link = local->finder; |
2546 | DEBUG(0, "ray_cs Starting authentication.\n"); | 2535 | dev_dbg(&link->dev, "ray_cs Starting authentication.\n"); |
2547 | if (!(pcmcia_dev_present(link))) { | 2536 | if (!(pcmcia_dev_present(link))) { |
2548 | DEBUG(2, "ray_cs authenticate - device not present\n"); | 2537 | dev_dbg(&link->dev, "ray_cs authenticate - device not present\n"); |
2549 | return; | 2538 | return; |
2550 | } | 2539 | } |
2551 | 2540 | ||
@@ -2573,11 +2562,11 @@ static void rx_authenticate(ray_dev_t *local, struct rcs __iomem *prcs, | |||
2573 | copy_from_rx_buff(local, buff, pkt_addr, rx_len & 0xff); | 2562 | copy_from_rx_buff(local, buff, pkt_addr, rx_len & 0xff); |
2574 | /* if we are trying to get authenticated */ | 2563 | /* if we are trying to get authenticated */ |
2575 | if (local->sparm.b4.a_network_type == ADHOC) { | 2564 | if (local->sparm.b4.a_network_type == ADHOC) { |
2576 | DEBUG(1, "ray_cs rx_auth var= %02x %02x %02x %02x %02x %02x\n", | 2565 | pr_debug("ray_cs rx_auth var= %02x %02x %02x %02x %02x %02x\n", |
2577 | msg->var[0], msg->var[1], msg->var[2], msg->var[3], | 2566 | msg->var[0], msg->var[1], msg->var[2], msg->var[3], |
2578 | msg->var[4], msg->var[5]); | 2567 | msg->var[4], msg->var[5]); |
2579 | if (msg->var[2] == 1) { | 2568 | if (msg->var[2] == 1) { |
2580 | DEBUG(0, "ray_cs Sending authentication response.\n"); | 2569 | pr_debug("ray_cs Sending authentication response.\n"); |
2581 | if (!build_auth_frame | 2570 | if (!build_auth_frame |
2582 | (local, msg->mac.addr_2, OPEN_AUTH_RESPONSE)) { | 2571 | (local, msg->mac.addr_2, OPEN_AUTH_RESPONSE)) { |
2583 | local->authentication_state = NEED_TO_AUTH; | 2572 | local->authentication_state = NEED_TO_AUTH; |
@@ -2591,13 +2580,13 @@ static void rx_authenticate(ray_dev_t *local, struct rcs __iomem *prcs, | |||
2591 | /* Verify authentication sequence #2 and success */ | 2580 | /* Verify authentication sequence #2 and success */ |
2592 | if (msg->var[2] == 2) { | 2581 | if (msg->var[2] == 2) { |
2593 | if ((msg->var[3] | msg->var[4]) == 0) { | 2582 | if ((msg->var[3] | msg->var[4]) == 0) { |
2594 | DEBUG(1, "Authentication successful\n"); | 2583 | pr_debug("Authentication successful\n"); |
2595 | local->card_status = CARD_AUTH_COMPLETE; | 2584 | local->card_status = CARD_AUTH_COMPLETE; |
2596 | associate(local); | 2585 | associate(local); |
2597 | local->authentication_state = | 2586 | local->authentication_state = |
2598 | AUTHENTICATED; | 2587 | AUTHENTICATED; |
2599 | } else { | 2588 | } else { |
2600 | DEBUG(0, "Authentication refused\n"); | 2589 | pr_debug("Authentication refused\n"); |
2601 | local->card_status = CARD_AUTH_REFUSED; | 2590 | local->card_status = CARD_AUTH_REFUSED; |
2602 | join_net((u_long) local); | 2591 | join_net((u_long) local); |
2603 | local->authentication_state = | 2592 | local->authentication_state = |
@@ -2617,22 +2606,22 @@ static void associate(ray_dev_t *local) | |||
2617 | struct net_device *dev = link->priv; | 2606 | struct net_device *dev = link->priv; |
2618 | int ccsindex; | 2607 | int ccsindex; |
2619 | if (!(pcmcia_dev_present(link))) { | 2608 | if (!(pcmcia_dev_present(link))) { |
2620 | DEBUG(2, "ray_cs associate - device not present\n"); | 2609 | dev_dbg(&link->dev, "ray_cs associate - device not present\n"); |
2621 | return; | 2610 | return; |
2622 | } | 2611 | } |
2623 | /* If no tx buffers available, return */ | 2612 | /* If no tx buffers available, return */ |
2624 | if ((ccsindex = get_free_ccs(local)) < 0) { | 2613 | if ((ccsindex = get_free_ccs(local)) < 0) { |
2625 | /* TBD should never be here but... what if we are? */ | 2614 | /* TBD should never be here but... what if we are? */ |
2626 | DEBUG(1, "ray_cs associate - No free ccs\n"); | 2615 | dev_dbg(&link->dev, "ray_cs associate - No free ccs\n"); |
2627 | return; | 2616 | return; |
2628 | } | 2617 | } |
2629 | DEBUG(1, "ray_cs Starting association with access point\n"); | 2618 | dev_dbg(&link->dev, "ray_cs Starting association with access point\n"); |
2630 | pccs = ccs_base(local) + ccsindex; | 2619 | pccs = ccs_base(local) + ccsindex; |
2631 | /* fill in the CCS */ | 2620 | /* fill in the CCS */ |
2632 | writeb(CCS_START_ASSOCIATION, &pccs->cmd); | 2621 | writeb(CCS_START_ASSOCIATION, &pccs->cmd); |
2633 | /* Interrupt the firmware to process the command */ | 2622 | /* Interrupt the firmware to process the command */ |
2634 | if (interrupt_ecf(local, ccsindex)) { | 2623 | if (interrupt_ecf(local, ccsindex)) { |
2635 | DEBUG(1, "ray_cs associate failed - ECF not ready for intr\n"); | 2624 | dev_dbg(&link->dev, "ray_cs associate failed - ECF not ready for intr\n"); |
2636 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); | 2625 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); |
2637 | 2626 | ||
2638 | del_timer(&local->timer); | 2627 | del_timer(&local->timer); |
@@ -2655,7 +2644,7 @@ static void rx_deauthenticate(ray_dev_t *local, struct rcs __iomem *prcs, | |||
2655 | /* UCHAR buff[256]; | 2644 | /* UCHAR buff[256]; |
2656 | struct rx_msg *msg = (struct rx_msg *)buff; | 2645 | struct rx_msg *msg = (struct rx_msg *)buff; |
2657 | */ | 2646 | */ |
2658 | DEBUG(0, "Deauthentication frame received\n"); | 2647 | pr_debug("Deauthentication frame received\n"); |
2659 | local->authentication_state = UNAUTHENTICATED; | 2648 | local->authentication_state = UNAUTHENTICATED; |
2660 | /* Need to reauthenticate or rejoin depending on reason code */ | 2649 | /* Need to reauthenticate or rejoin depending on reason code */ |
2661 | /* copy_from_rx_buff(local, buff, pkt_addr, rx_len & 0xff); | 2650 | /* copy_from_rx_buff(local, buff, pkt_addr, rx_len & 0xff); |
@@ -2823,7 +2812,7 @@ static int build_auth_frame(ray_dev_t *local, UCHAR *dest, int auth_type) | |||
2823 | 2812 | ||
2824 | /* If no tx buffers available, return */ | 2813 | /* If no tx buffers available, return */ |
2825 | if ((ccsindex = get_free_tx_ccs(local)) < 0) { | 2814 | if ((ccsindex = get_free_tx_ccs(local)) < 0) { |
2826 | DEBUG(1, "ray_cs send authenticate - No free tx ccs\n"); | 2815 | pr_debug("ray_cs send authenticate - No free tx ccs\n"); |
2827 | return -1; | 2816 | return -1; |
2828 | } | 2817 | } |
2829 | 2818 | ||
@@ -2855,7 +2844,7 @@ static int build_auth_frame(ray_dev_t *local, UCHAR *dest, int auth_type) | |||
2855 | 2844 | ||
2856 | /* Interrupt the firmware to process the command */ | 2845 | /* Interrupt the firmware to process the command */ |
2857 | if (interrupt_ecf(local, ccsindex)) { | 2846 | if (interrupt_ecf(local, ccsindex)) { |
2858 | DEBUG(1, | 2847 | pr_debug( |
2859 | "ray_cs send authentication request failed - ECF not ready for intr\n"); | 2848 | "ray_cs send authentication request failed - ECF not ready for intr\n"); |
2860 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); | 2849 | writeb(CCS_BUFFER_FREE, &(pccs++)->buffer_status); |
2861 | return -1; | 2850 | return -1; |
@@ -2942,9 +2931,9 @@ static int __init init_ray_cs(void) | |||
2942 | { | 2931 | { |
2943 | int rc; | 2932 | int rc; |
2944 | 2933 | ||
2945 | DEBUG(1, "%s\n", rcsid); | 2934 | pr_debug("%s\n", rcsid); |
2946 | rc = pcmcia_register_driver(&ray_driver); | 2935 | rc = pcmcia_register_driver(&ray_driver); |
2947 | DEBUG(1, "raylink init_module register_pcmcia_driver returns 0x%x\n", | 2936 | pr_debug("raylink init_module register_pcmcia_driver returns 0x%x\n", |
2948 | rc); | 2937 | rc); |
2949 | 2938 | ||
2950 | #ifdef CONFIG_PROC_FS | 2939 | #ifdef CONFIG_PROC_FS |
@@ -2964,7 +2953,7 @@ static int __init init_ray_cs(void) | |||
2964 | 2953 | ||
2965 | static void __exit exit_ray_cs(void) | 2954 | static void __exit exit_ray_cs(void) |
2966 | { | 2955 | { |
2967 | DEBUG(0, "ray_cs: cleanup_module\n"); | 2956 | pr_debug("ray_cs: cleanup_module\n"); |
2968 | 2957 | ||
2969 | #ifdef CONFIG_PROC_FS | 2958 | #ifdef CONFIG_PROC_FS |
2970 | remove_proc_entry("driver/ray_cs/ray_cs", NULL); | 2959 | remove_proc_entry("driver/ray_cs/ray_cs", NULL); |
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 431a20ec6db6..33918fd5b231 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -3656,10 +3656,7 @@ wv_pcmcia_reset(struct net_device * dev) | |||
3656 | 3656 | ||
3657 | i = pcmcia_access_configuration_register(link, ®); | 3657 | i = pcmcia_access_configuration_register(link, ®); |
3658 | if (i != 0) | 3658 | if (i != 0) |
3659 | { | ||
3660 | cs_error(link, AccessConfigurationRegister, i); | ||
3661 | return FALSE; | 3659 | return FALSE; |
3662 | } | ||
3663 | 3660 | ||
3664 | #ifdef DEBUG_CONFIG_INFO | 3661 | #ifdef DEBUG_CONFIG_INFO |
3665 | printk(KERN_DEBUG "%s: wavelan_pcmcia_reset(): Config reg is 0x%x\n", | 3662 | printk(KERN_DEBUG "%s: wavelan_pcmcia_reset(): Config reg is 0x%x\n", |
@@ -3670,19 +3667,13 @@ wv_pcmcia_reset(struct net_device * dev) | |||
3670 | reg.Value = reg.Value | COR_SW_RESET; | 3667 | reg.Value = reg.Value | COR_SW_RESET; |
3671 | i = pcmcia_access_configuration_register(link, ®); | 3668 | i = pcmcia_access_configuration_register(link, ®); |
3672 | if (i != 0) | 3669 | if (i != 0) |
3673 | { | ||
3674 | cs_error(link, AccessConfigurationRegister, i); | ||
3675 | return FALSE; | 3670 | return FALSE; |
3676 | } | ||
3677 | 3671 | ||
3678 | reg.Action = CS_WRITE; | 3672 | reg.Action = CS_WRITE; |
3679 | reg.Value = COR_LEVEL_IRQ | COR_CONFIG; | 3673 | reg.Value = COR_LEVEL_IRQ | COR_CONFIG; |
3680 | i = pcmcia_access_configuration_register(link, ®); | 3674 | i = pcmcia_access_configuration_register(link, ®); |
3681 | if (i != 0) | 3675 | if (i != 0) |
3682 | { | ||
3683 | cs_error(link, AccessConfigurationRegister, i); | ||
3684 | return FALSE; | 3676 | return FALSE; |
3685 | } | ||
3686 | 3677 | ||
3687 | #ifdef DEBUG_CONFIG_TRACE | 3678 | #ifdef DEBUG_CONFIG_TRACE |
3688 | printk(KERN_DEBUG "%s: <-wv_pcmcia_reset()\n", dev->name); | 3679 | printk(KERN_DEBUG "%s: <-wv_pcmcia_reset()\n", dev->name); |
@@ -3857,10 +3848,7 @@ wv_pcmcia_config(struct pcmcia_device * link) | |||
3857 | { | 3848 | { |
3858 | i = pcmcia_request_io(link, &link->io); | 3849 | i = pcmcia_request_io(link, &link->io); |
3859 | if (i != 0) | 3850 | if (i != 0) |
3860 | { | ||
3861 | cs_error(link, RequestIO, i); | ||
3862 | break; | 3851 | break; |
3863 | } | ||
3864 | 3852 | ||
3865 | /* | 3853 | /* |
3866 | * Now allocate an interrupt line. Note that this does not | 3854 | * Now allocate an interrupt line. Note that this does not |
@@ -3868,10 +3856,7 @@ wv_pcmcia_config(struct pcmcia_device * link) | |||
3868 | */ | 3856 | */ |
3869 | i = pcmcia_request_irq(link, &link->irq); | 3857 | i = pcmcia_request_irq(link, &link->irq); |
3870 | if (i != 0) | 3858 | if (i != 0) |
3871 | { | ||
3872 | cs_error(link, RequestIRQ, i); | ||
3873 | break; | 3859 | break; |
3874 | } | ||
3875 | 3860 | ||
3876 | /* | 3861 | /* |
3877 | * This actually configures the PCMCIA socket -- setting up | 3862 | * This actually configures the PCMCIA socket -- setting up |
@@ -3880,10 +3865,7 @@ wv_pcmcia_config(struct pcmcia_device * link) | |||
3880 | link->conf.ConfigIndex = 1; | 3865 | link->conf.ConfigIndex = 1; |
3881 | i = pcmcia_request_configuration(link, &link->conf); | 3866 | i = pcmcia_request_configuration(link, &link->conf); |
3882 | if (i != 0) | 3867 | if (i != 0) |
3883 | { | ||
3884 | cs_error(link, RequestConfiguration, i); | ||
3885 | break; | 3868 | break; |
3886 | } | ||
3887 | 3869 | ||
3888 | /* | 3870 | /* |
3889 | * Allocate a small memory window. Note that the struct pcmcia_device | 3871 | * Allocate a small memory window. Note that the struct pcmcia_device |
@@ -3894,24 +3876,18 @@ wv_pcmcia_config(struct pcmcia_device * link) | |||
3894 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 3876 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
3895 | req.Base = req.Size = 0; | 3877 | req.Base = req.Size = 0; |
3896 | req.AccessSpeed = mem_speed; | 3878 | req.AccessSpeed = mem_speed; |
3897 | i = pcmcia_request_window(&link, &req, &link->win); | 3879 | i = pcmcia_request_window(link, &req, &link->win); |
3898 | if (i != 0) | 3880 | if (i != 0) |
3899 | { | ||
3900 | cs_error(link, RequestWindow, i); | ||
3901 | break; | 3881 | break; |
3902 | } | ||
3903 | 3882 | ||
3904 | lp->mem = ioremap(req.Base, req.Size); | 3883 | lp->mem = ioremap(req.Base, req.Size); |
3905 | dev->mem_start = (u_long)lp->mem; | 3884 | dev->mem_start = (u_long)lp->mem; |
3906 | dev->mem_end = dev->mem_start + req.Size; | 3885 | dev->mem_end = dev->mem_start + req.Size; |
3907 | 3886 | ||
3908 | mem.CardOffset = 0; mem.Page = 0; | 3887 | mem.CardOffset = 0; mem.Page = 0; |
3909 | i = pcmcia_map_mem_page(link->win, &mem); | 3888 | i = pcmcia_map_mem_page(link, link->win, &mem); |
3910 | if (i != 0) | 3889 | if (i != 0) |
3911 | { | ||
3912 | cs_error(link, MapMemPage, i); | ||
3913 | break; | 3890 | break; |
3914 | } | ||
3915 | 3891 | ||
3916 | /* Feed device with this info... */ | 3892 | /* Feed device with this info... */ |
3917 | dev->irq = link->irq.AssignedIRQ; | 3893 | dev->irq = link->irq.AssignedIRQ; |
@@ -3923,7 +3899,7 @@ wv_pcmcia_config(struct pcmcia_device * link) | |||
3923 | lp->mem, dev->irq, (u_int) dev->base_addr); | 3899 | lp->mem, dev->irq, (u_int) dev->base_addr); |
3924 | #endif | 3900 | #endif |
3925 | 3901 | ||
3926 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 3902 | SET_NETDEV_DEV(dev, &link->dev); |
3927 | i = register_netdev(dev); | 3903 | i = register_netdev(dev); |
3928 | if(i != 0) | 3904 | if(i != 0) |
3929 | { | 3905 | { |
@@ -4462,8 +4438,7 @@ wavelan_probe(struct pcmcia_device *p_dev) | |||
4462 | p_dev->io.IOAddrLines = 3; | 4438 | p_dev->io.IOAddrLines = 3; |
4463 | 4439 | ||
4464 | /* Interrupt setup */ | 4440 | /* Interrupt setup */ |
4465 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 4441 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
4466 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
4467 | p_dev->irq.Handler = wavelan_interrupt; | 4442 | p_dev->irq.Handler = wavelan_interrupt; |
4468 | 4443 | ||
4469 | /* General socket configuration */ | 4444 | /* General socket configuration */ |
@@ -4475,7 +4450,7 @@ wavelan_probe(struct pcmcia_device *p_dev) | |||
4475 | if (!dev) | 4450 | if (!dev) |
4476 | return -ENOMEM; | 4451 | return -ENOMEM; |
4477 | 4452 | ||
4478 | p_dev->priv = p_dev->irq.Instance = dev; | 4453 | p_dev->priv = dev; |
4479 | 4454 | ||
4480 | lp = netdev_priv(dev); | 4455 | lp = netdev_priv(dev); |
4481 | 4456 | ||
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 4f1e0cfe609b..5f0401a52cff 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -67,23 +67,7 @@ | |||
67 | /* For rough constant delay */ | 67 | /* For rough constant delay */ |
68 | #define WL3501_NOPLOOP(n) { int x = 0; while (x++ < n) slow_down_io(); } | 68 | #define WL3501_NOPLOOP(n) { int x = 0; while (x++ < n) slow_down_io(); } |
69 | 69 | ||
70 | /* | 70 | |
71 | * All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If you do not | ||
72 | * define PCMCIA_DEBUG at all, all the debug code will be left out. If you | ||
73 | * compile with PCMCIA_DEBUG=0, the debug code will be present but disabled -- | ||
74 | * but it can then be enabled for specific modules at load time with a | ||
75 | * 'pc_debug=#' option to insmod. | ||
76 | */ | ||
77 | #define PCMCIA_DEBUG 0 | ||
78 | #ifdef PCMCIA_DEBUG | ||
79 | static int pc_debug = PCMCIA_DEBUG; | ||
80 | module_param(pc_debug, int, 0); | ||
81 | #define dprintk(n, format, args...) \ | ||
82 | { if (pc_debug > (n)) \ | ||
83 | printk(KERN_INFO "%s: " format "\n", __func__ , ##args); } | ||
84 | #else | ||
85 | #define dprintk(n, format, args...) | ||
86 | #endif | ||
87 | 71 | ||
88 | #define wl3501_outb(a, b) { outb(a, b); slow_down_io(); } | 72 | #define wl3501_outb(a, b) { outb(a, b); slow_down_io(); } |
89 | #define wl3501_outb_p(a, b) { outb_p(a, b); slow_down_io(); } | 73 | #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) | |||
684 | int matchflag = 0; | 668 | int matchflag = 0; |
685 | struct wl3501_scan_confirm sig; | 669 | struct wl3501_scan_confirm sig; |
686 | 670 | ||
687 | dprintk(3, "entry"); | 671 | pr_debug("entry"); |
688 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); | 672 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); |
689 | if (sig.status == WL3501_STATUS_SUCCESS) { | 673 | if (sig.status == WL3501_STATUS_SUCCESS) { |
690 | dprintk(3, "success"); | 674 | pr_debug("success"); |
691 | if ((this->net_type == IW_MODE_INFRA && | 675 | if ((this->net_type == IW_MODE_INFRA && |
692 | (sig.cap_info & WL3501_MGMT_CAPABILITY_ESS)) || | 676 | (sig.cap_info & WL3501_MGMT_CAPABILITY_ESS)) || |
693 | (this->net_type == IW_MODE_ADHOC && | 677 | (this->net_type == IW_MODE_ADHOC && |
@@ -722,7 +706,7 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr) | |||
722 | } | 706 | } |
723 | } | 707 | } |
724 | } else if (sig.status == WL3501_STATUS_TIMEOUT) { | 708 | } else if (sig.status == WL3501_STATUS_TIMEOUT) { |
725 | dprintk(3, "timeout"); | 709 | pr_debug("timeout"); |
726 | this->join_sta_bss = 0; | 710 | this->join_sta_bss = 0; |
727 | for (i = this->join_sta_bss; i < this->bss_cnt; i++) | 711 | for (i = this->join_sta_bss; i < this->bss_cnt; i++) |
728 | if (!wl3501_mgmt_join(this, i)) | 712 | if (!wl3501_mgmt_join(this, i)) |
@@ -879,7 +863,7 @@ static int wl3501_mgmt_auth(struct wl3501_card *this) | |||
879 | .timeout = 1000, | 863 | .timeout = 1000, |
880 | }; | 864 | }; |
881 | 865 | ||
882 | dprintk(3, "entry"); | 866 | pr_debug("entry"); |
883 | memcpy(sig.mac_addr, this->bssid, ETH_ALEN); | 867 | memcpy(sig.mac_addr, this->bssid, ETH_ALEN); |
884 | return wl3501_esbq_exec(this, &sig, sizeof(sig)); | 868 | return wl3501_esbq_exec(this, &sig, sizeof(sig)); |
885 | } | 869 | } |
@@ -893,7 +877,7 @@ static int wl3501_mgmt_association(struct wl3501_card *this) | |||
893 | .cap_info = this->cap_info, | 877 | .cap_info = this->cap_info, |
894 | }; | 878 | }; |
895 | 879 | ||
896 | dprintk(3, "entry"); | 880 | pr_debug("entry"); |
897 | memcpy(sig.mac_addr, this->bssid, ETH_ALEN); | 881 | memcpy(sig.mac_addr, this->bssid, ETH_ALEN); |
898 | return wl3501_esbq_exec(this, &sig, sizeof(sig)); | 882 | return wl3501_esbq_exec(this, &sig, sizeof(sig)); |
899 | } | 883 | } |
@@ -903,7 +887,7 @@ static void wl3501_mgmt_join_confirm(struct net_device *dev, u16 addr) | |||
903 | struct wl3501_card *this = netdev_priv(dev); | 887 | struct wl3501_card *this = netdev_priv(dev); |
904 | struct wl3501_join_confirm sig; | 888 | struct wl3501_join_confirm sig; |
905 | 889 | ||
906 | dprintk(3, "entry"); | 890 | pr_debug("entry"); |
907 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); | 891 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); |
908 | if (sig.status == WL3501_STATUS_SUCCESS) { | 892 | if (sig.status == WL3501_STATUS_SUCCESS) { |
909 | if (this->net_type == IW_MODE_INFRA) { | 893 | if (this->net_type == IW_MODE_INFRA) { |
@@ -962,7 +946,7 @@ static inline void wl3501_md_confirm_interrupt(struct net_device *dev, | |||
962 | { | 946 | { |
963 | struct wl3501_md_confirm sig; | 947 | struct wl3501_md_confirm sig; |
964 | 948 | ||
965 | dprintk(3, "entry"); | 949 | pr_debug("entry"); |
966 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); | 950 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); |
967 | wl3501_free_tx_buffer(this, sig.data); | 951 | wl3501_free_tx_buffer(this, sig.data); |
968 | if (netif_queue_stopped(dev)) | 952 | if (netif_queue_stopped(dev)) |
@@ -1017,7 +1001,7 @@ static inline void wl3501_md_ind_interrupt(struct net_device *dev, | |||
1017 | static inline void wl3501_get_confirm_interrupt(struct wl3501_card *this, | 1001 | static inline void wl3501_get_confirm_interrupt(struct wl3501_card *this, |
1018 | u16 addr, void *sig, int size) | 1002 | u16 addr, void *sig, int size) |
1019 | { | 1003 | { |
1020 | dprintk(3, "entry"); | 1004 | pr_debug("entry"); |
1021 | wl3501_get_from_wla(this, addr, &this->sig_get_confirm, | 1005 | wl3501_get_from_wla(this, addr, &this->sig_get_confirm, |
1022 | sizeof(this->sig_get_confirm)); | 1006 | sizeof(this->sig_get_confirm)); |
1023 | wake_up(&this->wait); | 1007 | wake_up(&this->wait); |
@@ -1029,7 +1013,7 @@ static inline void wl3501_start_confirm_interrupt(struct net_device *dev, | |||
1029 | { | 1013 | { |
1030 | struct wl3501_start_confirm sig; | 1014 | struct wl3501_start_confirm sig; |
1031 | 1015 | ||
1032 | dprintk(3, "entry"); | 1016 | pr_debug("entry"); |
1033 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); | 1017 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); |
1034 | if (sig.status == WL3501_STATUS_SUCCESS) | 1018 | if (sig.status == WL3501_STATUS_SUCCESS) |
1035 | netif_wake_queue(dev); | 1019 | netif_wake_queue(dev); |
@@ -1041,7 +1025,7 @@ static inline void wl3501_assoc_confirm_interrupt(struct net_device *dev, | |||
1041 | struct wl3501_card *this = netdev_priv(dev); | 1025 | struct wl3501_card *this = netdev_priv(dev); |
1042 | struct wl3501_assoc_confirm sig; | 1026 | struct wl3501_assoc_confirm sig; |
1043 | 1027 | ||
1044 | dprintk(3, "entry"); | 1028 | pr_debug("entry"); |
1045 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); | 1029 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); |
1046 | 1030 | ||
1047 | if (sig.status == WL3501_STATUS_SUCCESS) | 1031 | if (sig.status == WL3501_STATUS_SUCCESS) |
@@ -1053,7 +1037,7 @@ static inline void wl3501_auth_confirm_interrupt(struct wl3501_card *this, | |||
1053 | { | 1037 | { |
1054 | struct wl3501_auth_confirm sig; | 1038 | struct wl3501_auth_confirm sig; |
1055 | 1039 | ||
1056 | dprintk(3, "entry"); | 1040 | pr_debug("entry"); |
1057 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); | 1041 | wl3501_get_from_wla(this, addr, &sig, sizeof(sig)); |
1058 | 1042 | ||
1059 | if (sig.status == WL3501_STATUS_SUCCESS) | 1043 | if (sig.status == WL3501_STATUS_SUCCESS) |
@@ -1069,7 +1053,7 @@ static inline void wl3501_rx_interrupt(struct net_device *dev) | |||
1069 | u8 sig_id; | 1053 | u8 sig_id; |
1070 | struct wl3501_card *this = netdev_priv(dev); | 1054 | struct wl3501_card *this = netdev_priv(dev); |
1071 | 1055 | ||
1072 | dprintk(3, "entry"); | 1056 | pr_debug("entry"); |
1073 | loop: | 1057 | loop: |
1074 | morepkts = 0; | 1058 | morepkts = 0; |
1075 | if (!wl3501_esbq_confirm(this)) | 1059 | if (!wl3501_esbq_confirm(this)) |
@@ -1302,7 +1286,7 @@ static int wl3501_reset(struct net_device *dev) | |||
1302 | wl3501_ack_interrupt(this); | 1286 | wl3501_ack_interrupt(this); |
1303 | wl3501_unblock_interrupt(this); | 1287 | wl3501_unblock_interrupt(this); |
1304 | wl3501_mgmt_scan(this, 100); | 1288 | wl3501_mgmt_scan(this, 100); |
1305 | dprintk(1, "%s: device reset", dev->name); | 1289 | pr_debug("%s: device reset", dev->name); |
1306 | rc = 0; | 1290 | rc = 0; |
1307 | out: | 1291 | out: |
1308 | return rc; | 1292 | return rc; |
@@ -1376,7 +1360,7 @@ static int wl3501_open(struct net_device *dev) | |||
1376 | link->open++; | 1360 | link->open++; |
1377 | 1361 | ||
1378 | /* Initial WL3501 firmware */ | 1362 | /* Initial WL3501 firmware */ |
1379 | dprintk(1, "%s: Initialize WL3501 firmware...", dev->name); | 1363 | pr_debug("%s: Initialize WL3501 firmware...", dev->name); |
1380 | if (wl3501_init_firmware(this)) | 1364 | if (wl3501_init_firmware(this)) |
1381 | goto fail; | 1365 | goto fail; |
1382 | /* Initial device variables */ | 1366 | /* Initial device variables */ |
@@ -1388,7 +1372,7 @@ static int wl3501_open(struct net_device *dev) | |||
1388 | wl3501_unblock_interrupt(this); | 1372 | wl3501_unblock_interrupt(this); |
1389 | wl3501_mgmt_scan(this, 100); | 1373 | wl3501_mgmt_scan(this, 100); |
1390 | rc = 0; | 1374 | rc = 0; |
1391 | dprintk(1, "%s: WL3501 opened", dev->name); | 1375 | pr_debug("%s: WL3501 opened", dev->name); |
1392 | printk(KERN_INFO "%s: Card Name: %s\n" | 1376 | printk(KERN_INFO "%s: Card Name: %s\n" |
1393 | "%s: Firmware Date: %s\n", | 1377 | "%s: Firmware Date: %s\n", |
1394 | dev->name, this->card_name, | 1378 | dev->name, this->card_name, |
@@ -1914,8 +1898,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) | |||
1914 | p_dev->io.IOAddrLines = 5; | 1898 | p_dev->io.IOAddrLines = 5; |
1915 | 1899 | ||
1916 | /* Interrupt setup */ | 1900 | /* Interrupt setup */ |
1917 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 1901 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
1918 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
1919 | p_dev->irq.Handler = wl3501_interrupt; | 1902 | p_dev->irq.Handler = wl3501_interrupt; |
1920 | 1903 | ||
1921 | /* General socket configuration */ | 1904 | /* General socket configuration */ |
@@ -1938,16 +1921,13 @@ static int wl3501_probe(struct pcmcia_device *p_dev) | |||
1938 | dev->wireless_handlers = &wl3501_handler_def; | 1921 | dev->wireless_handlers = &wl3501_handler_def; |
1939 | SET_ETHTOOL_OPS(dev, &ops); | 1922 | SET_ETHTOOL_OPS(dev, &ops); |
1940 | netif_stop_queue(dev); | 1923 | netif_stop_queue(dev); |
1941 | p_dev->priv = p_dev->irq.Instance = dev; | 1924 | p_dev->priv = dev; |
1942 | 1925 | ||
1943 | return wl3501_config(p_dev); | 1926 | return wl3501_config(p_dev); |
1944 | out_link: | 1927 | out_link: |
1945 | return -ENOMEM; | 1928 | return -ENOMEM; |
1946 | } | 1929 | } |
1947 | 1930 | ||
1948 | #define CS_CHECK(fn, ret) \ | ||
1949 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
1950 | |||
1951 | /** | 1931 | /** |
1952 | * wl3501_config - configure the PCMCIA socket and make eth device available | 1932 | * wl3501_config - configure the PCMCIA socket and make eth device available |
1953 | * @link - FILL_IN | 1933 | * @link - FILL_IN |
@@ -1959,7 +1939,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | |||
1959 | static int wl3501_config(struct pcmcia_device *link) | 1939 | static int wl3501_config(struct pcmcia_device *link) |
1960 | { | 1940 | { |
1961 | struct net_device *dev = link->priv; | 1941 | struct net_device *dev = link->priv; |
1962 | int i = 0, j, last_fn, last_ret; | 1942 | int i = 0, j, ret; |
1963 | struct wl3501_card *this; | 1943 | struct wl3501_card *this; |
1964 | 1944 | ||
1965 | /* Try allocating IO ports. This tries a few fixed addresses. If you | 1945 | /* Try allocating IO ports. This tries a few fixed addresses. If you |
@@ -1975,24 +1955,26 @@ static int wl3501_config(struct pcmcia_device *link) | |||
1975 | if (i == 0) | 1955 | if (i == 0) |
1976 | break; | 1956 | break; |
1977 | } | 1957 | } |
1978 | if (i != 0) { | 1958 | if (i != 0) |
1979 | cs_error(link, RequestIO, i); | ||
1980 | goto failed; | 1959 | goto failed; |
1981 | } | ||
1982 | 1960 | ||
1983 | /* Now allocate an interrupt line. Note that this does not actually | 1961 | /* Now allocate an interrupt line. Note that this does not actually |
1984 | * assign a handler to the interrupt. */ | 1962 | * assign a handler to the interrupt. */ |
1985 | 1963 | ||
1986 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 1964 | ret = pcmcia_request_irq(link, &link->irq); |
1965 | if (ret) | ||
1966 | goto failed; | ||
1987 | 1967 | ||
1988 | /* This actually configures the PCMCIA socket -- setting up the I/O | 1968 | /* This actually configures the PCMCIA socket -- setting up the I/O |
1989 | * windows and the interrupt mapping. */ | 1969 | * windows and the interrupt mapping. */ |
1990 | 1970 | ||
1991 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 1971 | ret = pcmcia_request_configuration(link, &link->conf); |
1972 | if (ret) | ||
1973 | goto failed; | ||
1992 | 1974 | ||
1993 | dev->irq = link->irq.AssignedIRQ; | 1975 | dev->irq = link->irq.AssignedIRQ; |
1994 | dev->base_addr = link->io.BasePort1; | 1976 | dev->base_addr = link->io.BasePort1; |
1995 | SET_NETDEV_DEV(dev, &handle_to_dev(link)); | 1977 | SET_NETDEV_DEV(dev, &link->dev); |
1996 | if (register_netdev(dev)) { | 1978 | if (register_netdev(dev)) { |
1997 | printk(KERN_NOTICE "wl3501_cs: register_netdev() failed\n"); | 1979 | printk(KERN_NOTICE "wl3501_cs: register_netdev() failed\n"); |
1998 | goto failed; | 1980 | goto failed; |
@@ -2041,8 +2023,6 @@ static int wl3501_config(struct pcmcia_device *link) | |||
2041 | netif_start_queue(dev); | 2023 | netif_start_queue(dev); |
2042 | return 0; | 2024 | return 0; |
2043 | 2025 | ||
2044 | cs_failed: | ||
2045 | cs_error(link, last_fn, last_ret); | ||
2046 | failed: | 2026 | failed: |
2047 | wl3501_release(link); | 2027 | wl3501_release(link); |
2048 | return -ENODEV; | 2028 | return -ENODEV; |
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 8fdfa4f537a6..7dd370fa3439 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -67,14 +67,6 @@ MODULE_LICENSE("Dual MPL/GPL"); | |||
67 | 67 | ||
68 | INT_MODULE_PARM(epp_mode, 1); | 68 | INT_MODULE_PARM(epp_mode, 1); |
69 | 69 | ||
70 | #ifdef PCMCIA_DEBUG | ||
71 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | ||
72 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
73 | static char *version = | ||
74 | "parport_cs.c 1.29 2002/10/11 06:57:41 (David Hinds)"; | ||
75 | #else | ||
76 | #define DEBUG(n, args...) | ||
77 | #endif | ||
78 | 70 | ||
79 | /*====================================================================*/ | 71 | /*====================================================================*/ |
80 | 72 | ||
@@ -103,7 +95,7 @@ static int parport_probe(struct pcmcia_device *link) | |||
103 | { | 95 | { |
104 | parport_info_t *info; | 96 | parport_info_t *info; |
105 | 97 | ||
106 | DEBUG(0, "parport_attach()\n"); | 98 | dev_dbg(&link->dev, "parport_attach()\n"); |
107 | 99 | ||
108 | /* Create new parport device */ | 100 | /* Create new parport device */ |
109 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 101 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
@@ -114,7 +106,6 @@ static int parport_probe(struct pcmcia_device *link) | |||
114 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 106 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
115 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 107 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
116 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 108 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
117 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
118 | link->conf.Attributes = CONF_ENABLE_IRQ; | 109 | link->conf.Attributes = CONF_ENABLE_IRQ; |
119 | link->conf.IntType = INT_MEMORY_AND_IO; | 110 | link->conf.IntType = INT_MEMORY_AND_IO; |
120 | 111 | ||
@@ -132,7 +123,7 @@ static int parport_probe(struct pcmcia_device *link) | |||
132 | 123 | ||
133 | static void parport_detach(struct pcmcia_device *link) | 124 | static void parport_detach(struct pcmcia_device *link) |
134 | { | 125 | { |
135 | DEBUG(0, "parport_detach(0x%p)\n", link); | 126 | dev_dbg(&link->dev, "parport_detach\n"); |
136 | 127 | ||
137 | parport_cs_release(link); | 128 | parport_cs_release(link); |
138 | 129 | ||
@@ -147,9 +138,6 @@ static void parport_detach(struct pcmcia_device *link) | |||
147 | 138 | ||
148 | ======================================================================*/ | 139 | ======================================================================*/ |
149 | 140 | ||
150 | #define CS_CHECK(fn, ret) \ | ||
151 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
152 | |||
153 | static int parport_config_check(struct pcmcia_device *p_dev, | 141 | static int parport_config_check(struct pcmcia_device *p_dev, |
154 | cistpl_cftable_entry_t *cfg, | 142 | cistpl_cftable_entry_t *cfg, |
155 | cistpl_cftable_entry_t *dflt, | 143 | cistpl_cftable_entry_t *dflt, |
@@ -178,18 +166,20 @@ static int parport_config(struct pcmcia_device *link) | |||
178 | { | 166 | { |
179 | parport_info_t *info = link->priv; | 167 | parport_info_t *info = link->priv; |
180 | struct parport *p; | 168 | struct parport *p; |
181 | int last_ret, last_fn; | 169 | int ret; |
182 | 170 | ||
183 | DEBUG(0, "parport_config(0x%p)\n", link); | 171 | dev_dbg(&link->dev, "parport_config\n"); |
184 | 172 | ||
185 | last_ret = pcmcia_loop_config(link, parport_config_check, NULL); | 173 | ret = pcmcia_loop_config(link, parport_config_check, NULL); |
186 | if (last_ret) { | 174 | if (ret) |
187 | cs_error(link, RequestIO, last_ret); | ||
188 | goto failed; | 175 | goto failed; |
189 | } | ||
190 | 176 | ||
191 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 177 | ret = pcmcia_request_irq(link, &link->irq); |
192 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 178 | if (ret) |
179 | goto failed; | ||
180 | ret = pcmcia_request_configuration(link, &link->conf); | ||
181 | if (ret) | ||
182 | goto failed; | ||
193 | 183 | ||
194 | p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2, | 184 | p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2, |
195 | link->irq.AssignedIRQ, PARPORT_DMA_NONE, | 185 | link->irq.AssignedIRQ, PARPORT_DMA_NONE, |
@@ -213,8 +203,6 @@ static int parport_config(struct pcmcia_device *link) | |||
213 | 203 | ||
214 | return 0; | 204 | return 0; |
215 | 205 | ||
216 | cs_failed: | ||
217 | cs_error(link, last_fn, last_ret); | ||
218 | failed: | 206 | failed: |
219 | parport_cs_release(link); | 207 | parport_cs_release(link); |
220 | return -ENODEV; | 208 | return -ENODEV; |
@@ -232,7 +220,7 @@ static void parport_cs_release(struct pcmcia_device *link) | |||
232 | { | 220 | { |
233 | parport_info_t *info = link->priv; | 221 | parport_info_t *info = link->priv; |
234 | 222 | ||
235 | DEBUG(0, "parport_release(0x%p)\n", link); | 223 | dev_dbg(&link->dev, "parport_release\n"); |
236 | 224 | ||
237 | if (info->ndev) { | 225 | if (info->ndev) { |
238 | struct parport *p = info->port; | 226 | struct parport *p = info->port; |
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 17f38a781d47..f3ccbccf5f21 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
@@ -17,24 +17,6 @@ menuconfig PCCARD | |||
17 | 17 | ||
18 | if PCCARD | 18 | if PCCARD |
19 | 19 | ||
20 | config PCMCIA_DEBUG | ||
21 | bool "Enable PCCARD debugging" | ||
22 | help | ||
23 | Say Y here to enable PCMCIA subsystem debugging. You | ||
24 | will need to choose the debugging level either via the | ||
25 | kernel command line, or module options depending whether | ||
26 | you build the PCMCIA as modules. | ||
27 | |||
28 | The kernel command line options are: | ||
29 | pcmcia_core.pc_debug=N | ||
30 | pcmcia.pc_debug=N | ||
31 | sa11xx_core.pc_debug=N | ||
32 | |||
33 | The module option is called pc_debug=N | ||
34 | |||
35 | In all the above examples, N is the debugging verbosity | ||
36 | level. | ||
37 | |||
38 | config PCMCIA | 20 | config PCMCIA |
39 | tristate "16-bit PCMCIA support" | 21 | tristate "16-bit PCMCIA support" |
40 | select CRC32 | 22 | select CRC32 |
@@ -196,9 +178,13 @@ config PCMCIA_BCM63XX | |||
196 | tristate "bcm63xx pcmcia support" | 178 | tristate "bcm63xx pcmcia support" |
197 | depends on BCM63XX && PCMCIA | 179 | depends on BCM63XX && PCMCIA |
198 | 180 | ||
181 | config PCMCIA_SOC_COMMON | ||
182 | bool | ||
183 | |||
199 | config PCMCIA_SA1100 | 184 | config PCMCIA_SA1100 |
200 | tristate "SA1100 support" | 185 | tristate "SA1100 support" |
201 | depends on ARM && ARCH_SA1100 && PCMCIA | 186 | depends on ARM && ARCH_SA1100 && PCMCIA |
187 | select PCMCIA_SOC_COMMON | ||
202 | help | 188 | help |
203 | Say Y here to include support for SA11x0-based PCMCIA or CF | 189 | Say Y here to include support for SA11x0-based PCMCIA or CF |
204 | sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/ | 190 | sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/ |
@@ -209,6 +195,7 @@ config PCMCIA_SA1100 | |||
209 | config PCMCIA_SA1111 | 195 | config PCMCIA_SA1111 |
210 | tristate "SA1111 support" | 196 | tristate "SA1111 support" |
211 | depends on ARM && ARCH_SA1100 && SA1111 && PCMCIA | 197 | depends on ARM && ARCH_SA1100 && SA1111 && PCMCIA |
198 | select PCMCIA_SOC_COMMON | ||
212 | help | 199 | help |
213 | Say Y here to include support for SA1111-based PCMCIA or CF | 200 | Say Y here to include support for SA1111-based PCMCIA or CF |
214 | sockets, found on the Jornada 720, Graphicsmaster and other | 201 | sockets, found on the Jornada 720, Graphicsmaster and other |
@@ -222,9 +209,28 @@ config PCMCIA_PXA2XX | |||
222 | depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ | 209 | depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ |
223 | || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ | 210 | || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ |
224 | || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2) | 211 | || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2) |
212 | select PCMCIA_SOC_COMMON | ||
225 | help | 213 | help |
226 | Say Y here to include support for the PXA2xx PCMCIA controller | 214 | Say Y here to include support for the PXA2xx PCMCIA controller |
227 | 215 | ||
216 | config PCMCIA_DEBUG | ||
217 | bool "Enable debugging" | ||
218 | depends on (PCMCIA_SA1111 || PCMCIA_SA1100 || PCMCIA_PXA2XX) | ||
219 | help | ||
220 | Say Y here to enable debugging for the SoC PCMCIA layer. | ||
221 | You will need to choose the debugging level either via the | ||
222 | kernel command line, or module options depending whether | ||
223 | you build the drivers as modules. | ||
224 | |||
225 | The kernel command line options are: | ||
226 | sa11xx_core.pc_debug=N | ||
227 | pxa2xx_core.pc_debug=N | ||
228 | |||
229 | The module option is called pc_debug=N | ||
230 | |||
231 | In all the above examples, N is the debugging verbosity | ||
232 | level. | ||
233 | |||
228 | config PCMCIA_PROBE | 234 | config PCMCIA_PROBE |
229 | bool | 235 | bool |
230 | default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X && !PARISC | 236 | default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X && !PARISC |
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index a03a38acd77d..382938313991 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile | |||
@@ -22,8 +22,9 @@ obj-$(CONFIG_I82365) += i82365.o | |||
22 | obj-$(CONFIG_I82092) += i82092.o | 22 | obj-$(CONFIG_I82092) += i82092.o |
23 | obj-$(CONFIG_TCIC) += tcic.o | 23 | obj-$(CONFIG_TCIC) += tcic.o |
24 | obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o | 24 | obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o |
25 | obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o | 25 | obj-$(CONFIG_PCMCIA_SOC_COMMON) += soc_common.o |
26 | obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_core.o sa1111_cs.o | 26 | obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_base.o sa1100_cs.o |
27 | obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_base.o sa1111_cs.o | ||
27 | obj-$(CONFIG_M32R_PCC) += m32r_pcc.o | 28 | obj-$(CONFIG_M32R_PCC) += m32r_pcc.o |
28 | obj-$(CONFIG_M32R_CFC) += m32r_cfc.o | 29 | obj-$(CONFIG_M32R_CFC) += m32r_cfc.o |
29 | obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o | 30 | obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o |
@@ -35,9 +36,6 @@ obj-$(CONFIG_BFIN_CFPCMCIA) += bfin_cf_pcmcia.o | |||
35 | obj-$(CONFIG_AT91_CF) += at91_cf.o | 36 | obj-$(CONFIG_AT91_CF) += at91_cf.o |
36 | obj-$(CONFIG_ELECTRA_CF) += electra_cf.o | 37 | obj-$(CONFIG_ELECTRA_CF) += electra_cf.o |
37 | 38 | ||
38 | sa11xx_core-y += soc_common.o sa11xx_base.o | ||
39 | pxa2xx_core-y += soc_common.o pxa2xx_base.o | ||
40 | |||
41 | au1x00_ss-y += au1000_generic.o | 39 | au1x00_ss-y += au1000_generic.o |
42 | au1x00_ss-$(CONFIG_MIPS_PB1000) += au1000_pb1x00.o | 40 | au1x00_ss-$(CONFIG_MIPS_PB1000) += au1000_pb1x00.o |
43 | au1x00_ss-$(CONFIG_MIPS_PB1100) += au1000_pb1x00.o | 41 | au1x00_ss-$(CONFIG_MIPS_PB1100) += au1000_pb1x00.o |
@@ -77,4 +75,4 @@ pxa2xx-obj-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o | |||
77 | pxa2xx-obj-$(CONFIG_MACH_E740) += pxa2xx_e740.o | 75 | pxa2xx-obj-$(CONFIG_MACH_E740) += pxa2xx_e740.o |
78 | pxa2xx-obj-$(CONFIG_MACH_STARGATE2) += pxa2xx_stargate2.o | 76 | pxa2xx-obj-$(CONFIG_MACH_STARGATE2) += pxa2xx_stargate2.o |
79 | 77 | ||
80 | obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_core.o $(pxa2xx-obj-y) | 78 | obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_base.o $(pxa2xx-obj-y) |
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c index db77e1f3309a..4cd70d056810 100644 --- a/drivers/pcmcia/cardbus.c +++ b/drivers/pcmcia/cardbus.c | |||
@@ -91,7 +91,7 @@ static u_int xlate_rom_addr(void __iomem *b, u_int addr) | |||
91 | static void cb_release_cis_mem(struct pcmcia_socket * s) | 91 | static void cb_release_cis_mem(struct pcmcia_socket * s) |
92 | { | 92 | { |
93 | if (s->cb_cis_virt) { | 93 | if (s->cb_cis_virt) { |
94 | cs_dbg(s, 1, "cb_release_cis_mem()\n"); | 94 | dev_dbg(&s->dev, "cb_release_cis_mem()\n"); |
95 | iounmap(s->cb_cis_virt); | 95 | iounmap(s->cb_cis_virt); |
96 | s->cb_cis_virt = NULL; | 96 | s->cb_cis_virt = NULL; |
97 | s->cb_cis_res = NULL; | 97 | s->cb_cis_res = NULL; |
@@ -132,7 +132,7 @@ int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void | |||
132 | struct pci_dev *dev; | 132 | struct pci_dev *dev; |
133 | struct resource *res; | 133 | struct resource *res; |
134 | 134 | ||
135 | cs_dbg(s, 3, "read_cb_mem(%d, %#x, %u)\n", space, addr, len); | 135 | dev_dbg(&s->dev, "read_cb_mem(%d, %#x, %u)\n", space, addr, len); |
136 | 136 | ||
137 | dev = pci_get_slot(s->cb_dev->subordinate, 0); | 137 | dev = pci_get_slot(s->cb_dev->subordinate, 0); |
138 | if (!dev) | 138 | if (!dev) |
diff --git a/drivers/pcmcia/cirrus.h b/drivers/pcmcia/cirrus.h index ecd4fc7f666f..446a4576e73e 100644 --- a/drivers/pcmcia/cirrus.h +++ b/drivers/pcmcia/cirrus.h | |||
@@ -30,16 +30,6 @@ | |||
30 | #ifndef _LINUX_CIRRUS_H | 30 | #ifndef _LINUX_CIRRUS_H |
31 | #define _LINUX_CIRRUS_H | 31 | #define _LINUX_CIRRUS_H |
32 | 32 | ||
33 | #ifndef PCI_VENDOR_ID_CIRRUS | ||
34 | #define PCI_VENDOR_ID_CIRRUS 0x1013 | ||
35 | #endif | ||
36 | #ifndef PCI_DEVICE_ID_CIRRUS_6729 | ||
37 | #define PCI_DEVICE_ID_CIRRUS_6729 0x1100 | ||
38 | #endif | ||
39 | #ifndef PCI_DEVICE_ID_CIRRUS_6832 | ||
40 | #define PCI_DEVICE_ID_CIRRUS_6832 0x1110 | ||
41 | #endif | ||
42 | |||
43 | #define PD67_MISC_CTL_1 0x16 /* Misc control 1 */ | 33 | #define PD67_MISC_CTL_1 0x16 /* Misc control 1 */ |
44 | #define PD67_FIFO_CTL 0x17 /* FIFO control */ | 34 | #define PD67_FIFO_CTL 0x17 /* FIFO control */ |
45 | #define PD67_MISC_CTL_2 0x1E /* Misc control 2 */ | 35 | #define PD67_MISC_CTL_2 0x1E /* Misc control 2 */ |
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 6c4a4fc83630..8c1b73cf021b 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c | |||
@@ -138,7 +138,7 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | |||
138 | void __iomem *sys, *end; | 138 | void __iomem *sys, *end; |
139 | unsigned char *buf = ptr; | 139 | unsigned char *buf = ptr; |
140 | 140 | ||
141 | cs_dbg(s, 3, "pcmcia_read_cis_mem(%d, %#x, %u)\n", attr, addr, len); | 141 | dev_dbg(&s->dev, "pcmcia_read_cis_mem(%d, %#x, %u)\n", attr, addr, len); |
142 | 142 | ||
143 | if (attr & IS_INDIRECT) { | 143 | if (attr & IS_INDIRECT) { |
144 | /* Indirect accesses use a bunch of special registers at fixed | 144 | /* Indirect accesses use a bunch of special registers at fixed |
@@ -190,7 +190,7 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | |||
190 | addr = 0; | 190 | addr = 0; |
191 | } | 191 | } |
192 | } | 192 | } |
193 | cs_dbg(s, 3, " %#2.2x %#2.2x %#2.2x %#2.2x ...\n", | 193 | dev_dbg(&s->dev, " %#2.2x %#2.2x %#2.2x %#2.2x ...\n", |
194 | *(u_char *)(ptr+0), *(u_char *)(ptr+1), | 194 | *(u_char *)(ptr+0), *(u_char *)(ptr+1), |
195 | *(u_char *)(ptr+2), *(u_char *)(ptr+3)); | 195 | *(u_char *)(ptr+2), *(u_char *)(ptr+3)); |
196 | return 0; | 196 | return 0; |
@@ -204,7 +204,7 @@ void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | |||
204 | void __iomem *sys, *end; | 204 | void __iomem *sys, *end; |
205 | unsigned char *buf = ptr; | 205 | unsigned char *buf = ptr; |
206 | 206 | ||
207 | cs_dbg(s, 3, "pcmcia_write_cis_mem(%d, %#x, %u)\n", attr, addr, len); | 207 | dev_dbg(&s->dev, "pcmcia_write_cis_mem(%d, %#x, %u)\n", attr, addr, len); |
208 | 208 | ||
209 | if (attr & IS_INDIRECT) { | 209 | if (attr & IS_INDIRECT) { |
210 | /* Indirect accesses use a bunch of special registers at fixed | 210 | /* Indirect accesses use a bunch of special registers at fixed |
@@ -584,7 +584,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_ | |||
584 | ofs += link[1] + 2; | 584 | ofs += link[1] + 2; |
585 | } | 585 | } |
586 | if (i == MAX_TUPLES) { | 586 | if (i == MAX_TUPLES) { |
587 | cs_dbg(s, 1, "cs: overrun in pcmcia_get_next_tuple\n"); | 587 | dev_dbg(&s->dev, "cs: overrun in pcmcia_get_next_tuple\n"); |
588 | return -ENOSPC; | 588 | return -ENOSPC; |
589 | } | 589 | } |
590 | 590 | ||
@@ -1440,7 +1440,7 @@ int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse) | |||
1440 | break; | 1440 | break; |
1441 | } | 1441 | } |
1442 | if (ret) | 1442 | if (ret) |
1443 | __cs_dbg(0, "parse_tuple failed %d\n", ret); | 1443 | pr_debug("parse_tuple failed %d\n", ret); |
1444 | return ret; | 1444 | return ret; |
1445 | } | 1445 | } |
1446 | EXPORT_SYMBOL(pcmcia_parse_tuple); | 1446 | EXPORT_SYMBOL(pcmcia_parse_tuple); |
@@ -1482,6 +1482,67 @@ done: | |||
1482 | } | 1482 | } |
1483 | EXPORT_SYMBOL(pccard_read_tuple); | 1483 | EXPORT_SYMBOL(pccard_read_tuple); |
1484 | 1484 | ||
1485 | |||
1486 | /** | ||
1487 | * pccard_loop_tuple() - loop over tuples in the CIS | ||
1488 | * @s: the struct pcmcia_socket where the card is inserted | ||
1489 | * @function: the device function we loop for | ||
1490 | * @code: which CIS code shall we look for? | ||
1491 | * @parse: buffer where the tuple shall be parsed (or NULL, if no parse) | ||
1492 | * @priv_data: private data to be passed to the loop_tuple function. | ||
1493 | * @loop_tuple: function to call for each CIS entry of type @function. IT | ||
1494 | * gets passed the raw tuple, the paresed tuple (if @parse is | ||
1495 | * set) and @priv_data. | ||
1496 | * | ||
1497 | * pccard_loop_tuple() loops over all CIS entries of type @function, and | ||
1498 | * calls the @loop_tuple function for each entry. If the call to @loop_tuple | ||
1499 | * returns 0, the loop exits. Returns 0 on success or errorcode otherwise. | ||
1500 | */ | ||
1501 | int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function, | ||
1502 | cisdata_t code, cisparse_t *parse, void *priv_data, | ||
1503 | int (*loop_tuple) (tuple_t *tuple, | ||
1504 | cisparse_t *parse, | ||
1505 | void *priv_data)) | ||
1506 | { | ||
1507 | tuple_t tuple; | ||
1508 | cisdata_t *buf; | ||
1509 | int ret; | ||
1510 | |||
1511 | buf = kzalloc(256, GFP_KERNEL); | ||
1512 | if (buf == NULL) { | ||
1513 | dev_printk(KERN_WARNING, &s->dev, "no memory to read tuple\n"); | ||
1514 | return -ENOMEM; | ||
1515 | } | ||
1516 | |||
1517 | tuple.TupleData = buf; | ||
1518 | tuple.TupleDataMax = 255; | ||
1519 | tuple.TupleOffset = 0; | ||
1520 | tuple.DesiredTuple = code; | ||
1521 | tuple.Attributes = 0; | ||
1522 | |||
1523 | ret = pccard_get_first_tuple(s, function, &tuple); | ||
1524 | while (!ret) { | ||
1525 | if (pccard_get_tuple_data(s, &tuple)) | ||
1526 | goto next_entry; | ||
1527 | |||
1528 | if (parse) | ||
1529 | if (pcmcia_parse_tuple(&tuple, parse)) | ||
1530 | goto next_entry; | ||
1531 | |||
1532 | ret = loop_tuple(&tuple, parse, priv_data); | ||
1533 | if (!ret) | ||
1534 | break; | ||
1535 | |||
1536 | next_entry: | ||
1537 | ret = pccard_get_next_tuple(s, function, &tuple); | ||
1538 | } | ||
1539 | |||
1540 | kfree(buf); | ||
1541 | return ret; | ||
1542 | } | ||
1543 | EXPORT_SYMBOL(pccard_loop_tuple); | ||
1544 | |||
1545 | |||
1485 | /*====================================================================== | 1546 | /*====================================================================== |
1486 | 1547 | ||
1487 | This tries to determine if a card has a sensible CIS. It returns | 1548 | This tries to determine if a card has a sensible CIS. It returns |
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 698d75cda084..790af87a922f 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
@@ -61,17 +61,6 @@ INT_MODULE_PARM(unreset_limit, 30); /* unreset_check's */ | |||
61 | /* Access speed for attribute memory windows */ | 61 | /* Access speed for attribute memory windows */ |
62 | INT_MODULE_PARM(cis_speed, 300); /* ns */ | 62 | INT_MODULE_PARM(cis_speed, 300); /* ns */ |
63 | 63 | ||
64 | #ifdef CONFIG_PCMCIA_DEBUG | ||
65 | static int pc_debug; | ||
66 | |||
67 | module_param(pc_debug, int, 0644); | ||
68 | |||
69 | int cs_debug_level(int level) | ||
70 | { | ||
71 | return pc_debug > level; | ||
72 | } | ||
73 | #endif | ||
74 | |||
75 | 64 | ||
76 | socket_state_t dead_socket = { | 65 | socket_state_t dead_socket = { |
77 | .csc_mask = SS_DETECT, | 66 | .csc_mask = SS_DETECT, |
@@ -190,7 +179,7 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) | |||
190 | if (!socket || !socket->ops || !socket->dev.parent || !socket->resource_ops) | 179 | if (!socket || !socket->ops || !socket->dev.parent || !socket->resource_ops) |
191 | return -EINVAL; | 180 | return -EINVAL; |
192 | 181 | ||
193 | cs_dbg(socket, 0, "pcmcia_register_socket(0x%p)\n", socket->ops); | 182 | dev_dbg(&socket->dev, "pcmcia_register_socket(0x%p)\n", socket->ops); |
194 | 183 | ||
195 | spin_lock_init(&socket->lock); | 184 | spin_lock_init(&socket->lock); |
196 | 185 | ||
@@ -262,6 +251,13 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) | |||
262 | 251 | ||
263 | pcmcia_parse_events(socket, SS_DETECT); | 252 | pcmcia_parse_events(socket, SS_DETECT); |
264 | 253 | ||
254 | /* | ||
255 | * Let's try to get the PCMCIA module for 16-bit PCMCIA support. | ||
256 | * If it fails, it doesn't matter -- we still have 32-bit CardBus | ||
257 | * support to offer, so this is not a failure mode. | ||
258 | */ | ||
259 | request_module_nowait("pcmcia"); | ||
260 | |||
265 | return 0; | 261 | return 0; |
266 | 262 | ||
267 | err: | 263 | err: |
@@ -282,7 +278,7 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket) | |||
282 | if (!socket) | 278 | if (!socket) |
283 | return; | 279 | return; |
284 | 280 | ||
285 | cs_dbg(socket, 0, "pcmcia_unregister_socket(0x%p)\n", socket->ops); | 281 | dev_dbg(&socket->dev, "pcmcia_unregister_socket(0x%p)\n", socket->ops); |
286 | 282 | ||
287 | if (socket->thread) | 283 | if (socket->thread) |
288 | kthread_stop(socket->thread); | 284 | kthread_stop(socket->thread); |
@@ -335,7 +331,7 @@ static int send_event(struct pcmcia_socket *s, event_t event, int priority) | |||
335 | if (s->state & SOCKET_CARDBUS) | 331 | if (s->state & SOCKET_CARDBUS) |
336 | return 0; | 332 | return 0; |
337 | 333 | ||
338 | cs_dbg(s, 1, "send_event(event %d, pri %d, callback 0x%p)\n", | 334 | dev_dbg(&s->dev, "send_event(event %d, pri %d, callback 0x%p)\n", |
339 | event, priority, s->callback); | 335 | event, priority, s->callback); |
340 | 336 | ||
341 | if (!s->callback) | 337 | if (!s->callback) |
@@ -352,7 +348,7 @@ static int send_event(struct pcmcia_socket *s, event_t event, int priority) | |||
352 | 348 | ||
353 | static void socket_remove_drivers(struct pcmcia_socket *skt) | 349 | static void socket_remove_drivers(struct pcmcia_socket *skt) |
354 | { | 350 | { |
355 | cs_dbg(skt, 4, "remove_drivers\n"); | 351 | dev_dbg(&skt->dev, "remove_drivers\n"); |
356 | 352 | ||
357 | send_event(skt, CS_EVENT_CARD_REMOVAL, CS_EVENT_PRI_HIGH); | 353 | send_event(skt, CS_EVENT_CARD_REMOVAL, CS_EVENT_PRI_HIGH); |
358 | } | 354 | } |
@@ -361,7 +357,7 @@ static int socket_reset(struct pcmcia_socket *skt) | |||
361 | { | 357 | { |
362 | int status, i; | 358 | int status, i; |
363 | 359 | ||
364 | cs_dbg(skt, 4, "reset\n"); | 360 | dev_dbg(&skt->dev, "reset\n"); |
365 | 361 | ||
366 | skt->socket.flags |= SS_OUTPUT_ENA | SS_RESET; | 362 | skt->socket.flags |= SS_OUTPUT_ENA | SS_RESET; |
367 | skt->ops->set_socket(skt, &skt->socket); | 363 | skt->ops->set_socket(skt, &skt->socket); |
@@ -383,7 +379,7 @@ static int socket_reset(struct pcmcia_socket *skt) | |||
383 | msleep(unreset_check * 10); | 379 | msleep(unreset_check * 10); |
384 | } | 380 | } |
385 | 381 | ||
386 | cs_err(skt, "time out after reset.\n"); | 382 | dev_printk(KERN_ERR, &skt->dev, "time out after reset.\n"); |
387 | return -ETIMEDOUT; | 383 | return -ETIMEDOUT; |
388 | } | 384 | } |
389 | 385 | ||
@@ -397,7 +393,7 @@ static void socket_shutdown(struct pcmcia_socket *s) | |||
397 | { | 393 | { |
398 | int status; | 394 | int status; |
399 | 395 | ||
400 | cs_dbg(s, 4, "shutdown\n"); | 396 | dev_dbg(&s->dev, "shutdown\n"); |
401 | 397 | ||
402 | socket_remove_drivers(s); | 398 | socket_remove_drivers(s); |
403 | s->state &= SOCKET_INUSE | SOCKET_PRESENT; | 399 | s->state &= SOCKET_INUSE | SOCKET_PRESENT; |
@@ -432,7 +428,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay) | |||
432 | { | 428 | { |
433 | int status, i; | 429 | int status, i; |
434 | 430 | ||
435 | cs_dbg(skt, 4, "setup\n"); | 431 | dev_dbg(&skt->dev, "setup\n"); |
436 | 432 | ||
437 | skt->ops->get_status(skt, &status); | 433 | skt->ops->get_status(skt, &status); |
438 | if (!(status & SS_DETECT)) | 434 | if (!(status & SS_DETECT)) |
@@ -452,13 +448,15 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay) | |||
452 | } | 448 | } |
453 | 449 | ||
454 | if (status & SS_PENDING) { | 450 | if (status & SS_PENDING) { |
455 | cs_err(skt, "voltage interrogation timed out.\n"); | 451 | dev_printk(KERN_ERR, &skt->dev, |
452 | "voltage interrogation timed out.\n"); | ||
456 | return -ETIMEDOUT; | 453 | return -ETIMEDOUT; |
457 | } | 454 | } |
458 | 455 | ||
459 | if (status & SS_CARDBUS) { | 456 | if (status & SS_CARDBUS) { |
460 | if (!(skt->features & SS_CAP_CARDBUS)) { | 457 | if (!(skt->features & SS_CAP_CARDBUS)) { |
461 | cs_err(skt, "cardbus cards are not supported.\n"); | 458 | dev_printk(KERN_ERR, &skt->dev, |
459 | "cardbus cards are not supported.\n"); | ||
462 | return -EINVAL; | 460 | return -EINVAL; |
463 | } | 461 | } |
464 | skt->state |= SOCKET_CARDBUS; | 462 | skt->state |= SOCKET_CARDBUS; |
@@ -472,7 +470,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay) | |||
472 | else if (!(status & SS_XVCARD)) | 470 | else if (!(status & SS_XVCARD)) |
473 | skt->socket.Vcc = skt->socket.Vpp = 50; | 471 | skt->socket.Vcc = skt->socket.Vpp = 50; |
474 | else { | 472 | else { |
475 | cs_err(skt, "unsupported voltage key.\n"); | 473 | dev_printk(KERN_ERR, &skt->dev, "unsupported voltage key.\n"); |
476 | return -EIO; | 474 | return -EIO; |
477 | } | 475 | } |
478 | 476 | ||
@@ -489,7 +487,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay) | |||
489 | 487 | ||
490 | skt->ops->get_status(skt, &status); | 488 | skt->ops->get_status(skt, &status); |
491 | if (!(status & SS_POWERON)) { | 489 | if (!(status & SS_POWERON)) { |
492 | cs_err(skt, "unable to apply power.\n"); | 490 | dev_printk(KERN_ERR, &skt->dev, "unable to apply power.\n"); |
493 | return -EIO; | 491 | return -EIO; |
494 | } | 492 | } |
495 | 493 | ||
@@ -509,7 +507,7 @@ static int socket_insert(struct pcmcia_socket *skt) | |||
509 | { | 507 | { |
510 | int ret; | 508 | int ret; |
511 | 509 | ||
512 | cs_dbg(skt, 4, "insert\n"); | 510 | dev_dbg(&skt->dev, "insert\n"); |
513 | 511 | ||
514 | if (!cs_socket_get(skt)) | 512 | if (!cs_socket_get(skt)) |
515 | return -ENODEV; | 513 | return -ENODEV; |
@@ -529,7 +527,7 @@ static int socket_insert(struct pcmcia_socket *skt) | |||
529 | skt->state |= SOCKET_CARDBUS_CONFIG; | 527 | skt->state |= SOCKET_CARDBUS_CONFIG; |
530 | } | 528 | } |
531 | #endif | 529 | #endif |
532 | cs_dbg(skt, 4, "insert done\n"); | 530 | dev_dbg(&skt->dev, "insert done\n"); |
533 | 531 | ||
534 | send_event(skt, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW); | 532 | send_event(skt, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW); |
535 | } else { | 533 | } else { |
@@ -576,7 +574,7 @@ static int socket_late_resume(struct pcmcia_socket *skt) | |||
576 | * FIXME: need a better check here for cardbus cards. | 574 | * FIXME: need a better check here for cardbus cards. |
577 | */ | 575 | */ |
578 | if (verify_cis_cache(skt) != 0) { | 576 | if (verify_cis_cache(skt) != 0) { |
579 | cs_dbg(skt, 4, "cis mismatch - different card\n"); | 577 | dev_dbg(&skt->dev, "cis mismatch - different card\n"); |
580 | socket_remove_drivers(skt); | 578 | socket_remove_drivers(skt); |
581 | destroy_cis_cache(skt); | 579 | destroy_cis_cache(skt); |
582 | /* | 580 | /* |
@@ -587,7 +585,7 @@ static int socket_late_resume(struct pcmcia_socket *skt) | |||
587 | msleep(200); | 585 | msleep(200); |
588 | send_event(skt, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW); | 586 | send_event(skt, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW); |
589 | } else { | 587 | } else { |
590 | cs_dbg(skt, 4, "cis matches cache\n"); | 588 | dev_dbg(&skt->dev, "cis matches cache\n"); |
591 | send_event(skt, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW); | 589 | send_event(skt, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW); |
592 | } | 590 | } |
593 | } else { | 591 | } else { |
@@ -723,7 +721,7 @@ static int pccardd(void *__skt) | |||
723 | void pcmcia_parse_events(struct pcmcia_socket *s, u_int events) | 721 | void pcmcia_parse_events(struct pcmcia_socket *s, u_int events) |
724 | { | 722 | { |
725 | unsigned long flags; | 723 | unsigned long flags; |
726 | cs_dbg(s, 4, "parse_events: events %08x\n", events); | 724 | dev_dbg(&s->dev, "parse_events: events %08x\n", events); |
727 | if (s->thread) { | 725 | if (s->thread) { |
728 | spin_lock_irqsave(&s->thread_lock, flags); | 726 | spin_lock_irqsave(&s->thread_lock, flags); |
729 | s->thread_events |= events; | 727 | s->thread_events |= events; |
@@ -773,19 +771,22 @@ int pcmcia_reset_card(struct pcmcia_socket *skt) | |||
773 | { | 771 | { |
774 | int ret; | 772 | int ret; |
775 | 773 | ||
776 | cs_dbg(skt, 1, "resetting socket\n"); | 774 | dev_dbg(&skt->dev, "resetting socket\n"); |
777 | 775 | ||
778 | mutex_lock(&skt->skt_mutex); | 776 | mutex_lock(&skt->skt_mutex); |
779 | do { | 777 | do { |
780 | if (!(skt->state & SOCKET_PRESENT)) { | 778 | if (!(skt->state & SOCKET_PRESENT)) { |
779 | dev_dbg(&skt->dev, "can't reset, not present\n"); | ||
781 | ret = -ENODEV; | 780 | ret = -ENODEV; |
782 | break; | 781 | break; |
783 | } | 782 | } |
784 | if (skt->state & SOCKET_SUSPEND) { | 783 | if (skt->state & SOCKET_SUSPEND) { |
784 | dev_dbg(&skt->dev, "can't reset, suspended\n"); | ||
785 | ret = -EBUSY; | 785 | ret = -EBUSY; |
786 | break; | 786 | break; |
787 | } | 787 | } |
788 | if (skt->state & SOCKET_CARDBUS) { | 788 | if (skt->state & SOCKET_CARDBUS) { |
789 | dev_dbg(&skt->dev, "can't reset, is cardbus\n"); | ||
789 | ret = -EPERM; | 790 | ret = -EPERM; |
790 | break; | 791 | break; |
791 | } | 792 | } |
@@ -818,7 +819,7 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt) | |||
818 | { | 819 | { |
819 | int ret; | 820 | int ret; |
820 | 821 | ||
821 | cs_dbg(skt, 1, "suspending socket\n"); | 822 | dev_dbg(&skt->dev, "suspending socket\n"); |
822 | 823 | ||
823 | mutex_lock(&skt->skt_mutex); | 824 | mutex_lock(&skt->skt_mutex); |
824 | do { | 825 | do { |
@@ -848,7 +849,7 @@ int pcmcia_resume_card(struct pcmcia_socket *skt) | |||
848 | { | 849 | { |
849 | int ret; | 850 | int ret; |
850 | 851 | ||
851 | cs_dbg(skt, 1, "waking up socket\n"); | 852 | dev_dbg(&skt->dev, "waking up socket\n"); |
852 | 853 | ||
853 | mutex_lock(&skt->skt_mutex); | 854 | mutex_lock(&skt->skt_mutex); |
854 | do { | 855 | do { |
@@ -876,7 +877,7 @@ int pcmcia_eject_card(struct pcmcia_socket *skt) | |||
876 | { | 877 | { |
877 | int ret; | 878 | int ret; |
878 | 879 | ||
879 | cs_dbg(skt, 1, "user eject request\n"); | 880 | dev_dbg(&skt->dev, "user eject request\n"); |
880 | 881 | ||
881 | mutex_lock(&skt->skt_mutex); | 882 | mutex_lock(&skt->skt_mutex); |
882 | do { | 883 | do { |
@@ -905,7 +906,7 @@ int pcmcia_insert_card(struct pcmcia_socket *skt) | |||
905 | { | 906 | { |
906 | int ret; | 907 | int ret; |
907 | 908 | ||
908 | cs_dbg(skt, 1, "user insert request\n"); | 909 | dev_dbg(&skt->dev, "user insert request\n"); |
909 | 910 | ||
910 | mutex_lock(&skt->skt_mutex); | 911 | mutex_lock(&skt->skt_mutex); |
911 | do { | 912 | do { |
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 1f4098f1354d..3bc02d53a3a3 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h | |||
@@ -107,28 +107,6 @@ static inline void cs_socket_put(struct pcmcia_socket *skt) | |||
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | #ifdef CONFIG_PCMCIA_DEBUG | ||
111 | extern int cs_debug_level(int); | ||
112 | |||
113 | #define cs_dbg(skt, lvl, fmt, arg...) do { \ | ||
114 | if (cs_debug_level(lvl)) \ | ||
115 | dev_printk(KERN_DEBUG, &skt->dev, \ | ||
116 | "cs: " fmt, ## arg); \ | ||
117 | } while (0) | ||
118 | #define __cs_dbg(lvl, fmt, arg...) do { \ | ||
119 | if (cs_debug_level(lvl)) \ | ||
120 | printk(KERN_DEBUG \ | ||
121 | "cs: " fmt, ## arg); \ | ||
122 | } while (0) | ||
123 | |||
124 | #else | ||
125 | #define cs_dbg(skt, lvl, fmt, arg...) do { } while (0) | ||
126 | #define __cs_dbg(lvl, fmt, arg...) do { } while (0) | ||
127 | #endif | ||
128 | |||
129 | #define cs_err(skt, fmt, arg...) \ | ||
130 | dev_printk(KERN_ERR, &skt->dev, "cs: " fmt, ## arg) | ||
131 | |||
132 | 110 | ||
133 | /* | 111 | /* |
134 | * Stuff internal to module "pcmcia_core": | 112 | * Stuff internal to module "pcmcia_core": |
@@ -170,10 +148,6 @@ extern struct rw_semaphore pcmcia_socket_list_rwsem; | |||
170 | extern struct list_head pcmcia_socket_list; | 148 | extern struct list_head pcmcia_socket_list; |
171 | extern struct class pcmcia_socket_class; | 149 | extern struct class pcmcia_socket_class; |
172 | 150 | ||
173 | int pcmcia_get_window(struct pcmcia_socket *s, | ||
174 | window_handle_t *handle, | ||
175 | int idx, | ||
176 | win_req_t *req); | ||
177 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); | 151 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); |
178 | struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr); | 152 | struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr); |
179 | 153 | ||
@@ -199,6 +173,22 @@ int pcmcia_replace_cis(struct pcmcia_socket *s, | |||
199 | const u8 *data, const size_t len); | 173 | const u8 *data, const size_t len); |
200 | int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count); | 174 | int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count); |
201 | 175 | ||
176 | /* loop over CIS entries */ | ||
177 | int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function, | ||
178 | cisdata_t code, cisparse_t *parse, void *priv_data, | ||
179 | int (*loop_tuple) (tuple_t *tuple, | ||
180 | cisparse_t *parse, | ||
181 | void *priv_data)); | ||
182 | |||
183 | int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, | ||
184 | tuple_t *tuple); | ||
185 | |||
186 | int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, | ||
187 | tuple_t *tuple); | ||
188 | |||
189 | int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); | ||
190 | |||
191 | |||
202 | /* rsrc_mgr.c */ | 192 | /* rsrc_mgr.c */ |
203 | int pcmcia_validate_mem(struct pcmcia_socket *s); | 193 | int pcmcia_validate_mem(struct pcmcia_socket *s); |
204 | struct resource *pcmcia_find_io_region(unsigned long base, | 194 | struct resource *pcmcia_find_io_region(unsigned long base, |
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index f5b7079f13d3..05893d41dd41 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -41,129 +41,11 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>"); | |||
41 | MODULE_DESCRIPTION("PCMCIA Driver Services"); | 41 | MODULE_DESCRIPTION("PCMCIA Driver Services"); |
42 | MODULE_LICENSE("GPL"); | 42 | MODULE_LICENSE("GPL"); |
43 | 43 | ||
44 | #ifdef CONFIG_PCMCIA_DEBUG | ||
45 | int ds_pc_debug; | ||
46 | |||
47 | module_param_named(pc_debug, ds_pc_debug, int, 0644); | ||
48 | |||
49 | #define ds_dbg(lvl, fmt, arg...) do { \ | ||
50 | if (ds_pc_debug > (lvl)) \ | ||
51 | printk(KERN_DEBUG "ds: " fmt , ## arg); \ | ||
52 | } while (0) | ||
53 | #define ds_dev_dbg(lvl, dev, fmt, arg...) do { \ | ||
54 | if (ds_pc_debug > (lvl)) \ | ||
55 | dev_printk(KERN_DEBUG, dev, "ds: " fmt , ## arg); \ | ||
56 | } while (0) | ||
57 | #else | ||
58 | #define ds_dbg(lvl, fmt, arg...) do { } while (0) | ||
59 | #define ds_dev_dbg(lvl, dev, fmt, arg...) do { } while (0) | ||
60 | #endif | ||
61 | 44 | ||
62 | spinlock_t pcmcia_dev_list_lock; | 45 | spinlock_t pcmcia_dev_list_lock; |
63 | 46 | ||
64 | /*====================================================================*/ | 47 | /*====================================================================*/ |
65 | 48 | ||
66 | /* code which was in cs.c before */ | ||
67 | |||
68 | /* String tables for error messages */ | ||
69 | |||
70 | typedef struct lookup_t { | ||
71 | const int key; | ||
72 | const char *msg; | ||
73 | } lookup_t; | ||
74 | |||
75 | static const lookup_t error_table[] = { | ||
76 | { 0, "Operation succeeded" }, | ||
77 | { -EIO, "Input/Output error" }, | ||
78 | { -ENODEV, "No card present" }, | ||
79 | { -EINVAL, "Bad parameter" }, | ||
80 | { -EACCES, "Configuration locked" }, | ||
81 | { -EBUSY, "Resource in use" }, | ||
82 | { -ENOSPC, "No more items" }, | ||
83 | { -ENOMEM, "Out of resource" }, | ||
84 | }; | ||
85 | |||
86 | |||
87 | static const lookup_t service_table[] = { | ||
88 | { AccessConfigurationRegister, "AccessConfigurationRegister" }, | ||
89 | { AddSocketServices, "AddSocketServices" }, | ||
90 | { AdjustResourceInfo, "AdjustResourceInfo" }, | ||
91 | { CheckEraseQueue, "CheckEraseQueue" }, | ||
92 | { CloseMemory, "CloseMemory" }, | ||
93 | { DeregisterClient, "DeregisterClient" }, | ||
94 | { DeregisterEraseQueue, "DeregisterEraseQueue" }, | ||
95 | { GetCardServicesInfo, "GetCardServicesInfo" }, | ||
96 | { GetClientInfo, "GetClientInfo" }, | ||
97 | { GetConfigurationInfo, "GetConfigurationInfo" }, | ||
98 | { GetEventMask, "GetEventMask" }, | ||
99 | { GetFirstClient, "GetFirstClient" }, | ||
100 | { GetFirstRegion, "GetFirstRegion" }, | ||
101 | { GetFirstTuple, "GetFirstTuple" }, | ||
102 | { GetNextClient, "GetNextClient" }, | ||
103 | { GetNextRegion, "GetNextRegion" }, | ||
104 | { GetNextTuple, "GetNextTuple" }, | ||
105 | { GetStatus, "GetStatus" }, | ||
106 | { GetTupleData, "GetTupleData" }, | ||
107 | { MapMemPage, "MapMemPage" }, | ||
108 | { ModifyConfiguration, "ModifyConfiguration" }, | ||
109 | { ModifyWindow, "ModifyWindow" }, | ||
110 | { OpenMemory, "OpenMemory" }, | ||
111 | { ParseTuple, "ParseTuple" }, | ||
112 | { ReadMemory, "ReadMemory" }, | ||
113 | { RegisterClient, "RegisterClient" }, | ||
114 | { RegisterEraseQueue, "RegisterEraseQueue" }, | ||
115 | { RegisterMTD, "RegisterMTD" }, | ||
116 | { ReleaseConfiguration, "ReleaseConfiguration" }, | ||
117 | { ReleaseIO, "ReleaseIO" }, | ||
118 | { ReleaseIRQ, "ReleaseIRQ" }, | ||
119 | { ReleaseWindow, "ReleaseWindow" }, | ||
120 | { RequestConfiguration, "RequestConfiguration" }, | ||
121 | { RequestIO, "RequestIO" }, | ||
122 | { RequestIRQ, "RequestIRQ" }, | ||
123 | { RequestSocketMask, "RequestSocketMask" }, | ||
124 | { RequestWindow, "RequestWindow" }, | ||
125 | { ResetCard, "ResetCard" }, | ||
126 | { SetEventMask, "SetEventMask" }, | ||
127 | { ValidateCIS, "ValidateCIS" }, | ||
128 | { WriteMemory, "WriteMemory" }, | ||
129 | { BindDevice, "BindDevice" }, | ||
130 | { BindMTD, "BindMTD" }, | ||
131 | { ReportError, "ReportError" }, | ||
132 | { SuspendCard, "SuspendCard" }, | ||
133 | { ResumeCard, "ResumeCard" }, | ||
134 | { EjectCard, "EjectCard" }, | ||
135 | { InsertCard, "InsertCard" }, | ||
136 | { ReplaceCIS, "ReplaceCIS" } | ||
137 | }; | ||
138 | |||
139 | const char *pcmcia_error_func(int func) | ||
140 | { | ||
141 | int i; | ||
142 | |||
143 | for (i = 0; i < ARRAY_SIZE(service_table); i++) | ||
144 | if (service_table[i].key == func) | ||
145 | return service_table[i].msg; | ||
146 | |||
147 | return "Unknown service number"; | ||
148 | } | ||
149 | EXPORT_SYMBOL(pcmcia_error_func); | ||
150 | |||
151 | const char *pcmcia_error_ret(int ret) | ||
152 | { | ||
153 | int i; | ||
154 | |||
155 | for (i = 0; i < ARRAY_SIZE(error_table); i++) | ||
156 | if (error_table[i].key == ret) | ||
157 | return error_table[i].msg; | ||
158 | |||
159 | return "unknown"; | ||
160 | } | ||
161 | EXPORT_SYMBOL(pcmcia_error_ret); | ||
162 | |||
163 | /*======================================================================*/ | ||
164 | |||
165 | |||
166 | |||
167 | static void pcmcia_check_driver(struct pcmcia_driver *p_drv) | 49 | static void pcmcia_check_driver(struct pcmcia_driver *p_drv) |
168 | { | 50 | { |
169 | struct pcmcia_device_id *did = p_drv->id_table; | 51 | struct pcmcia_device_id *did = p_drv->id_table; |
@@ -303,7 +185,7 @@ int pcmcia_register_driver(struct pcmcia_driver *driver) | |||
303 | spin_lock_init(&driver->dynids.lock); | 185 | spin_lock_init(&driver->dynids.lock); |
304 | INIT_LIST_HEAD(&driver->dynids.list); | 186 | INIT_LIST_HEAD(&driver->dynids.list); |
305 | 187 | ||
306 | ds_dbg(3, "registering driver %s\n", driver->drv.name); | 188 | pr_debug("registering driver %s\n", driver->drv.name); |
307 | 189 | ||
308 | error = driver_register(&driver->drv); | 190 | error = driver_register(&driver->drv); |
309 | if (error < 0) | 191 | if (error < 0) |
@@ -323,7 +205,7 @@ EXPORT_SYMBOL(pcmcia_register_driver); | |||
323 | */ | 205 | */ |
324 | void pcmcia_unregister_driver(struct pcmcia_driver *driver) | 206 | void pcmcia_unregister_driver(struct pcmcia_driver *driver) |
325 | { | 207 | { |
326 | ds_dbg(3, "unregistering driver %s\n", driver->drv.name); | 208 | pr_debug("unregistering driver %s\n", driver->drv.name); |
327 | driver_unregister(&driver->drv); | 209 | driver_unregister(&driver->drv); |
328 | pcmcia_free_dynids(driver); | 210 | pcmcia_free_dynids(driver); |
329 | } | 211 | } |
@@ -350,14 +232,14 @@ void pcmcia_put_dev(struct pcmcia_device *p_dev) | |||
350 | static void pcmcia_release_function(struct kref *ref) | 232 | static void pcmcia_release_function(struct kref *ref) |
351 | { | 233 | { |
352 | struct config_t *c = container_of(ref, struct config_t, ref); | 234 | struct config_t *c = container_of(ref, struct config_t, ref); |
353 | ds_dbg(1, "releasing config_t\n"); | 235 | pr_debug("releasing config_t\n"); |
354 | kfree(c); | 236 | kfree(c); |
355 | } | 237 | } |
356 | 238 | ||
357 | static void pcmcia_release_dev(struct device *dev) | 239 | static void pcmcia_release_dev(struct device *dev) |
358 | { | 240 | { |
359 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); | 241 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); |
360 | ds_dev_dbg(1, dev, "releasing device\n"); | 242 | dev_dbg(dev, "releasing device\n"); |
361 | pcmcia_put_socket(p_dev->socket); | 243 | pcmcia_put_socket(p_dev->socket); |
362 | kfree(p_dev->devname); | 244 | kfree(p_dev->devname); |
363 | kref_put(&p_dev->function_config->ref, pcmcia_release_function); | 245 | kref_put(&p_dev->function_config->ref, pcmcia_release_function); |
@@ -367,7 +249,7 @@ static void pcmcia_release_dev(struct device *dev) | |||
367 | static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc) | 249 | static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc) |
368 | { | 250 | { |
369 | if (!s->pcmcia_state.device_add_pending) { | 251 | if (!s->pcmcia_state.device_add_pending) { |
370 | ds_dev_dbg(1, &s->dev, "scheduling to add %s secondary" | 252 | dev_dbg(&s->dev, "scheduling to add %s secondary" |
371 | " device to %d\n", mfc ? "mfc" : "pfc", s->sock); | 253 | " device to %d\n", mfc ? "mfc" : "pfc", s->sock); |
372 | s->pcmcia_state.device_add_pending = 1; | 254 | s->pcmcia_state.device_add_pending = 1; |
373 | s->pcmcia_state.mfc_pfc = mfc; | 255 | s->pcmcia_state.mfc_pfc = mfc; |
@@ -405,7 +287,7 @@ static int pcmcia_device_probe(struct device * dev) | |||
405 | */ | 287 | */ |
406 | did = dev_get_drvdata(&p_dev->dev); | 288 | did = dev_get_drvdata(&p_dev->dev); |
407 | 289 | ||
408 | ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name); | 290 | dev_dbg(dev, "trying to bind to %s\n", p_drv->drv.name); |
409 | 291 | ||
410 | if ((!p_drv->probe) || (!p_dev->function_config) || | 292 | if ((!p_drv->probe) || (!p_dev->function_config) || |
411 | (!try_module_get(p_drv->owner))) { | 293 | (!try_module_get(p_drv->owner))) { |
@@ -428,7 +310,7 @@ static int pcmcia_device_probe(struct device * dev) | |||
428 | 310 | ||
429 | ret = p_drv->probe(p_dev); | 311 | ret = p_drv->probe(p_dev); |
430 | if (ret) { | 312 | if (ret) { |
431 | ds_dev_dbg(1, dev, "binding to %s failed with %d\n", | 313 | dev_dbg(dev, "binding to %s failed with %d\n", |
432 | p_drv->drv.name, ret); | 314 | p_drv->drv.name, ret); |
433 | goto put_module; | 315 | goto put_module; |
434 | } | 316 | } |
@@ -456,7 +338,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le | |||
456 | struct pcmcia_device *tmp; | 338 | struct pcmcia_device *tmp; |
457 | unsigned long flags; | 339 | unsigned long flags; |
458 | 340 | ||
459 | ds_dev_dbg(2, leftover ? &leftover->dev : &s->dev, | 341 | dev_dbg(leftover ? &leftover->dev : &s->dev, |
460 | "pcmcia_card_remove(%d) %s\n", s->sock, | 342 | "pcmcia_card_remove(%d) %s\n", s->sock, |
461 | leftover ? leftover->devname : ""); | 343 | leftover ? leftover->devname : ""); |
462 | 344 | ||
@@ -475,7 +357,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le | |||
475 | p_dev->_removed=1; | 357 | p_dev->_removed=1; |
476 | spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); | 358 | spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); |
477 | 359 | ||
478 | ds_dev_dbg(2, &p_dev->dev, "unregistering device\n"); | 360 | dev_dbg(&p_dev->dev, "unregistering device\n"); |
479 | device_unregister(&p_dev->dev); | 361 | device_unregister(&p_dev->dev); |
480 | } | 362 | } |
481 | 363 | ||
@@ -492,7 +374,7 @@ static int pcmcia_device_remove(struct device * dev) | |||
492 | p_dev = to_pcmcia_dev(dev); | 374 | p_dev = to_pcmcia_dev(dev); |
493 | p_drv = to_pcmcia_drv(dev->driver); | 375 | p_drv = to_pcmcia_drv(dev->driver); |
494 | 376 | ||
495 | ds_dev_dbg(1, dev, "removing device\n"); | 377 | dev_dbg(dev, "removing device\n"); |
496 | 378 | ||
497 | /* If we're removing the primary module driving a | 379 | /* If we're removing the primary module driving a |
498 | * pseudo multi-function card, we need to unbind | 380 | * pseudo multi-function card, we need to unbind |
@@ -572,7 +454,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev) | |||
572 | } | 454 | } |
573 | if (!pccard_read_tuple(p_dev->socket, p_dev->func, | 455 | if (!pccard_read_tuple(p_dev->socket, p_dev->func, |
574 | CISTPL_DEVICE_GEO, devgeo)) { | 456 | CISTPL_DEVICE_GEO, devgeo)) { |
575 | ds_dev_dbg(0, &p_dev->dev, | 457 | dev_dbg(&p_dev->dev, |
576 | "mem device geometry probably means " | 458 | "mem device geometry probably means " |
577 | "FUNCID_MEMORY\n"); | 459 | "FUNCID_MEMORY\n"); |
578 | p_dev->func_id = CISTPL_FUNCID_MEMORY; | 460 | p_dev->func_id = CISTPL_FUNCID_MEMORY; |
@@ -628,7 +510,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f | |||
628 | 510 | ||
629 | mutex_lock(&device_add_lock); | 511 | mutex_lock(&device_add_lock); |
630 | 512 | ||
631 | ds_dbg(3, "adding device to %d, function %d\n", s->sock, function); | 513 | pr_debug("adding device to %d, function %d\n", s->sock, function); |
632 | 514 | ||
633 | /* max of 4 devices per card */ | 515 | /* max of 4 devices per card */ |
634 | if (s->device_count == 4) | 516 | if (s->device_count == 4) |
@@ -654,7 +536,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f | |||
654 | p_dev->devname = kasprintf(GFP_KERNEL, "pcmcia%s", dev_name(&p_dev->dev)); | 536 | p_dev->devname = kasprintf(GFP_KERNEL, "pcmcia%s", dev_name(&p_dev->dev)); |
655 | if (!p_dev->devname) | 537 | if (!p_dev->devname) |
656 | goto err_free; | 538 | goto err_free; |
657 | ds_dev_dbg(3, &p_dev->dev, "devname is %s\n", p_dev->devname); | 539 | dev_dbg(&p_dev->dev, "devname is %s\n", p_dev->devname); |
658 | 540 | ||
659 | spin_lock_irqsave(&pcmcia_dev_list_lock, flags); | 541 | spin_lock_irqsave(&pcmcia_dev_list_lock, flags); |
660 | 542 | ||
@@ -677,7 +559,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f | |||
677 | spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); | 559 | spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); |
678 | 560 | ||
679 | if (!p_dev->function_config) { | 561 | if (!p_dev->function_config) { |
680 | ds_dev_dbg(3, &p_dev->dev, "creating config_t\n"); | 562 | dev_dbg(&p_dev->dev, "creating config_t\n"); |
681 | p_dev->function_config = kzalloc(sizeof(struct config_t), | 563 | p_dev->function_config = kzalloc(sizeof(struct config_t), |
682 | GFP_KERNEL); | 564 | GFP_KERNEL); |
683 | if (!p_dev->function_config) | 565 | if (!p_dev->function_config) |
@@ -722,20 +604,20 @@ static int pcmcia_card_add(struct pcmcia_socket *s) | |||
722 | int ret = 0; | 604 | int ret = 0; |
723 | 605 | ||
724 | if (!(s->resource_setup_done)) { | 606 | if (!(s->resource_setup_done)) { |
725 | ds_dev_dbg(3, &s->dev, | 607 | dev_dbg(&s->dev, |
726 | "no resources available, delaying card_add\n"); | 608 | "no resources available, delaying card_add\n"); |
727 | return -EAGAIN; /* try again, but later... */ | 609 | return -EAGAIN; /* try again, but later... */ |
728 | } | 610 | } |
729 | 611 | ||
730 | if (pcmcia_validate_mem(s)) { | 612 | if (pcmcia_validate_mem(s)) { |
731 | ds_dev_dbg(3, &s->dev, "validating mem resources failed, " | 613 | dev_dbg(&s->dev, "validating mem resources failed, " |
732 | "delaying card_add\n"); | 614 | "delaying card_add\n"); |
733 | return -EAGAIN; /* try again, but later... */ | 615 | return -EAGAIN; /* try again, but later... */ |
734 | } | 616 | } |
735 | 617 | ||
736 | ret = pccard_validate_cis(s, &no_chains); | 618 | ret = pccard_validate_cis(s, &no_chains); |
737 | if (ret || !no_chains) { | 619 | if (ret || !no_chains) { |
738 | ds_dev_dbg(0, &s->dev, "invalid CIS or invalid resources\n"); | 620 | dev_dbg(&s->dev, "invalid CIS or invalid resources\n"); |
739 | return -ENODEV; | 621 | return -ENODEV; |
740 | } | 622 | } |
741 | 623 | ||
@@ -756,7 +638,7 @@ static void pcmcia_delayed_add_device(struct work_struct *work) | |||
756 | { | 638 | { |
757 | struct pcmcia_socket *s = | 639 | struct pcmcia_socket *s = |
758 | container_of(work, struct pcmcia_socket, device_add); | 640 | container_of(work, struct pcmcia_socket, device_add); |
759 | ds_dev_dbg(1, &s->dev, "adding additional device to %d\n", s->sock); | 641 | dev_dbg(&s->dev, "adding additional device to %d\n", s->sock); |
760 | pcmcia_device_add(s, s->pcmcia_state.mfc_pfc); | 642 | pcmcia_device_add(s, s->pcmcia_state.mfc_pfc); |
761 | s->pcmcia_state.device_add_pending = 0; | 643 | s->pcmcia_state.device_add_pending = 0; |
762 | s->pcmcia_state.mfc_pfc = 0; | 644 | s->pcmcia_state.mfc_pfc = 0; |
@@ -766,7 +648,7 @@ static int pcmcia_requery(struct device *dev, void * _data) | |||
766 | { | 648 | { |
767 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); | 649 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); |
768 | if (!p_dev->dev.driver) { | 650 | if (!p_dev->dev.driver) { |
769 | ds_dev_dbg(1, dev, "update device information\n"); | 651 | dev_dbg(dev, "update device information\n"); |
770 | pcmcia_device_query(p_dev); | 652 | pcmcia_device_query(p_dev); |
771 | } | 653 | } |
772 | 654 | ||
@@ -780,7 +662,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt, int new_cis) | |||
780 | unsigned long flags; | 662 | unsigned long flags; |
781 | 663 | ||
782 | /* must be called with skt_mutex held */ | 664 | /* must be called with skt_mutex held */ |
783 | ds_dev_dbg(0, &skt->dev, "re-scanning socket %d\n", skt->sock); | 665 | dev_dbg(&skt->dev, "re-scanning socket %d\n", skt->sock); |
784 | 666 | ||
785 | spin_lock_irqsave(&pcmcia_dev_list_lock, flags); | 667 | spin_lock_irqsave(&pcmcia_dev_list_lock, flags); |
786 | if (list_empty(&skt->devices_list)) | 668 | if (list_empty(&skt->devices_list)) |
@@ -835,7 +717,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) | |||
835 | if (!filename) | 717 | if (!filename) |
836 | return -EINVAL; | 718 | return -EINVAL; |
837 | 719 | ||
838 | ds_dev_dbg(1, &dev->dev, "trying to load CIS file %s\n", filename); | 720 | dev_dbg(&dev->dev, "trying to load CIS file %s\n", filename); |
839 | 721 | ||
840 | if (request_firmware(&fw, filename, &dev->dev) == 0) { | 722 | if (request_firmware(&fw, filename, &dev->dev) == 0) { |
841 | if (fw->size >= CISTPL_MAX_CIS_SIZE) { | 723 | if (fw->size >= CISTPL_MAX_CIS_SIZE) { |
@@ -953,14 +835,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev, | |||
953 | * after it has re-checked that there is no possible module | 835 | * after it has re-checked that there is no possible module |
954 | * with a prod_id/manf_id/card_id match. | 836 | * with a prod_id/manf_id/card_id match. |
955 | */ | 837 | */ |
956 | ds_dev_dbg(0, &dev->dev, | 838 | dev_dbg(&dev->dev, |
957 | "skipping FUNC_ID match until userspace interaction\n"); | 839 | "skipping FUNC_ID match until userspace interaction\n"); |
958 | if (!dev->allow_func_id_match) | 840 | if (!dev->allow_func_id_match) |
959 | return 0; | 841 | return 0; |
960 | } | 842 | } |
961 | 843 | ||
962 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) { | 844 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) { |
963 | ds_dev_dbg(0, &dev->dev, "device needs a fake CIS\n"); | 845 | dev_dbg(&dev->dev, "device needs a fake CIS\n"); |
964 | if (!dev->socket->fake_cis) | 846 | if (!dev->socket->fake_cis) |
965 | pcmcia_load_firmware(dev, did->cisfile); | 847 | pcmcia_load_firmware(dev, did->cisfile); |
966 | 848 | ||
@@ -992,9 +874,9 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) { | |||
992 | /* match dynamic devices first */ | 874 | /* match dynamic devices first */ |
993 | spin_lock(&p_drv->dynids.lock); | 875 | spin_lock(&p_drv->dynids.lock); |
994 | list_for_each_entry(dynid, &p_drv->dynids.list, node) { | 876 | list_for_each_entry(dynid, &p_drv->dynids.list, node) { |
995 | ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name); | 877 | dev_dbg(dev, "trying to match to %s\n", drv->name); |
996 | if (pcmcia_devmatch(p_dev, &dynid->id)) { | 878 | if (pcmcia_devmatch(p_dev, &dynid->id)) { |
997 | ds_dev_dbg(0, dev, "matched to %s\n", drv->name); | 879 | dev_dbg(dev, "matched to %s\n", drv->name); |
998 | spin_unlock(&p_drv->dynids.lock); | 880 | spin_unlock(&p_drv->dynids.lock); |
999 | return 1; | 881 | return 1; |
1000 | } | 882 | } |
@@ -1004,15 +886,15 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) { | |||
1004 | #ifdef CONFIG_PCMCIA_IOCTL | 886 | #ifdef CONFIG_PCMCIA_IOCTL |
1005 | /* matching by cardmgr */ | 887 | /* matching by cardmgr */ |
1006 | if (p_dev->cardmgr == p_drv) { | 888 | if (p_dev->cardmgr == p_drv) { |
1007 | ds_dev_dbg(0, dev, "cardmgr matched to %s\n", drv->name); | 889 | dev_dbg(dev, "cardmgr matched to %s\n", drv->name); |
1008 | return 1; | 890 | return 1; |
1009 | } | 891 | } |
1010 | #endif | 892 | #endif |
1011 | 893 | ||
1012 | while (did && did->match_flags) { | 894 | while (did && did->match_flags) { |
1013 | ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name); | 895 | dev_dbg(dev, "trying to match to %s\n", drv->name); |
1014 | if (pcmcia_devmatch(p_dev, did)) { | 896 | if (pcmcia_devmatch(p_dev, did)) { |
1015 | ds_dev_dbg(0, dev, "matched to %s\n", drv->name); | 897 | dev_dbg(dev, "matched to %s\n", drv->name); |
1016 | return 1; | 898 | return 1; |
1017 | } | 899 | } |
1018 | did++; | 900 | did++; |
@@ -1218,7 +1100,7 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state) | |||
1218 | if (p_dev->suspended) | 1100 | if (p_dev->suspended) |
1219 | return 0; | 1101 | return 0; |
1220 | 1102 | ||
1221 | ds_dev_dbg(2, dev, "suspending\n"); | 1103 | dev_dbg(dev, "suspending\n"); |
1222 | 1104 | ||
1223 | if (dev->driver) | 1105 | if (dev->driver) |
1224 | p_drv = to_pcmcia_drv(dev->driver); | 1106 | p_drv = to_pcmcia_drv(dev->driver); |
@@ -1238,7 +1120,7 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state) | |||
1238 | } | 1120 | } |
1239 | 1121 | ||
1240 | if (p_dev->device_no == p_dev->func) { | 1122 | if (p_dev->device_no == p_dev->func) { |
1241 | ds_dev_dbg(2, dev, "releasing configuration\n"); | 1123 | dev_dbg(dev, "releasing configuration\n"); |
1242 | pcmcia_release_configuration(p_dev); | 1124 | pcmcia_release_configuration(p_dev); |
1243 | } | 1125 | } |
1244 | 1126 | ||
@@ -1258,7 +1140,7 @@ static int pcmcia_dev_resume(struct device * dev) | |||
1258 | if (!p_dev->suspended) | 1140 | if (!p_dev->suspended) |
1259 | return 0; | 1141 | return 0; |
1260 | 1142 | ||
1261 | ds_dev_dbg(2, dev, "resuming\n"); | 1143 | dev_dbg(dev, "resuming\n"); |
1262 | 1144 | ||
1263 | if (dev->driver) | 1145 | if (dev->driver) |
1264 | p_drv = to_pcmcia_drv(dev->driver); | 1146 | p_drv = to_pcmcia_drv(dev->driver); |
@@ -1267,7 +1149,7 @@ static int pcmcia_dev_resume(struct device * dev) | |||
1267 | goto out; | 1149 | goto out; |
1268 | 1150 | ||
1269 | if (p_dev->device_no == p_dev->func) { | 1151 | if (p_dev->device_no == p_dev->func) { |
1270 | ds_dev_dbg(2, dev, "requesting configuration\n"); | 1152 | dev_dbg(dev, "requesting configuration\n"); |
1271 | ret = pcmcia_request_configuration(p_dev, &p_dev->conf); | 1153 | ret = pcmcia_request_configuration(p_dev, &p_dev->conf); |
1272 | if (ret) | 1154 | if (ret) |
1273 | goto out; | 1155 | goto out; |
@@ -1309,14 +1191,14 @@ static int pcmcia_bus_resume_callback(struct device *dev, void * _data) | |||
1309 | 1191 | ||
1310 | static int pcmcia_bus_resume(struct pcmcia_socket *skt) | 1192 | static int pcmcia_bus_resume(struct pcmcia_socket *skt) |
1311 | { | 1193 | { |
1312 | ds_dev_dbg(2, &skt->dev, "resuming socket %d\n", skt->sock); | 1194 | dev_dbg(&skt->dev, "resuming socket %d\n", skt->sock); |
1313 | bus_for_each_dev(&pcmcia_bus_type, NULL, skt, pcmcia_bus_resume_callback); | 1195 | bus_for_each_dev(&pcmcia_bus_type, NULL, skt, pcmcia_bus_resume_callback); |
1314 | return 0; | 1196 | return 0; |
1315 | } | 1197 | } |
1316 | 1198 | ||
1317 | static int pcmcia_bus_suspend(struct pcmcia_socket *skt) | 1199 | static int pcmcia_bus_suspend(struct pcmcia_socket *skt) |
1318 | { | 1200 | { |
1319 | ds_dev_dbg(2, &skt->dev, "suspending socket %d\n", skt->sock); | 1201 | dev_dbg(&skt->dev, "suspending socket %d\n", skt->sock); |
1320 | if (bus_for_each_dev(&pcmcia_bus_type, NULL, skt, | 1202 | if (bus_for_each_dev(&pcmcia_bus_type, NULL, skt, |
1321 | pcmcia_bus_suspend_callback)) { | 1203 | pcmcia_bus_suspend_callback)) { |
1322 | pcmcia_bus_resume(skt); | 1204 | pcmcia_bus_resume(skt); |
@@ -1348,7 +1230,7 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority) | |||
1348 | return -ENODEV; | 1230 | return -ENODEV; |
1349 | } | 1231 | } |
1350 | 1232 | ||
1351 | ds_dev_dbg(1, &skt->dev, "ds_event(0x%06x, %d, 0x%p)\n", | 1233 | dev_dbg(&skt->dev, "ds_event(0x%06x, %d, 0x%p)\n", |
1352 | event, priority, skt); | 1234 | event, priority, skt); |
1353 | 1235 | ||
1354 | switch (event) { | 1236 | switch (event) { |
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index a4aacb830b80..c13fd9360511 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c | |||
@@ -63,21 +63,6 @@ | |||
63 | #include "vg468.h" | 63 | #include "vg468.h" |
64 | #include "ricoh.h" | 64 | #include "ricoh.h" |
65 | 65 | ||
66 | #ifdef CONFIG_PCMCIA_DEBUG | ||
67 | static const char version[] = | ||
68 | "i82365.c 1.265 1999/11/10 18:36:21 (David Hinds)"; | ||
69 | |||
70 | static int pc_debug; | ||
71 | |||
72 | module_param(pc_debug, int, 0644); | ||
73 | |||
74 | #define debug(lvl, fmt, arg...) do { \ | ||
75 | if (pc_debug > (lvl)) \ | ||
76 | printk(KERN_DEBUG "i82365: " fmt , ## arg); \ | ||
77 | } while (0) | ||
78 | #else | ||
79 | #define debug(lvl, fmt, arg...) do { } while (0) | ||
80 | #endif | ||
81 | 66 | ||
82 | static irqreturn_t i365_count_irq(int, void *); | 67 | static irqreturn_t i365_count_irq(int, void *); |
83 | static inline int _check_irq(int irq, int flags) | 68 | static inline int _check_irq(int irq, int flags) |
@@ -501,13 +486,13 @@ static irqreturn_t i365_count_irq(int irq, void *dev) | |||
501 | { | 486 | { |
502 | i365_get(irq_sock, I365_CSC); | 487 | i365_get(irq_sock, I365_CSC); |
503 | irq_hits++; | 488 | irq_hits++; |
504 | debug(2, "-> hit on irq %d\n", irq); | 489 | pr_debug("i82365: -> hit on irq %d\n", irq); |
505 | return IRQ_HANDLED; | 490 | return IRQ_HANDLED; |
506 | } | 491 | } |
507 | 492 | ||
508 | static u_int __init test_irq(u_short sock, int irq) | 493 | static u_int __init test_irq(u_short sock, int irq) |
509 | { | 494 | { |
510 | debug(2, " testing ISA irq %d\n", irq); | 495 | pr_debug("i82365: testing ISA irq %d\n", irq); |
511 | if (request_irq(irq, i365_count_irq, IRQF_PROBE_SHARED, "scan", | 496 | if (request_irq(irq, i365_count_irq, IRQF_PROBE_SHARED, "scan", |
512 | i365_count_irq) != 0) | 497 | i365_count_irq) != 0) |
513 | return 1; | 498 | return 1; |
@@ -515,7 +500,7 @@ static u_int __init test_irq(u_short sock, int irq) | |||
515 | msleep(10); | 500 | msleep(10); |
516 | if (irq_hits) { | 501 | if (irq_hits) { |
517 | free_irq(irq, i365_count_irq); | 502 | free_irq(irq, i365_count_irq); |
518 | debug(2, " spurious hit!\n"); | 503 | pr_debug("i82365: spurious hit!\n"); |
519 | return 1; | 504 | return 1; |
520 | } | 505 | } |
521 | 506 | ||
@@ -528,7 +513,7 @@ static u_int __init test_irq(u_short sock, int irq) | |||
528 | 513 | ||
529 | /* mask all interrupts */ | 514 | /* mask all interrupts */ |
530 | i365_set(sock, I365_CSCINT, 0); | 515 | i365_set(sock, I365_CSCINT, 0); |
531 | debug(2, " hits = %d\n", irq_hits); | 516 | pr_debug("i82365: hits = %d\n", irq_hits); |
532 | 517 | ||
533 | return (irq_hits != 1); | 518 | return (irq_hits != 1); |
534 | } | 519 | } |
@@ -854,7 +839,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev) | |||
854 | u_long flags = 0; | 839 | u_long flags = 0; |
855 | int handled = 0; | 840 | int handled = 0; |
856 | 841 | ||
857 | debug(4, "pcic_interrupt(%d)\n", irq); | 842 | pr_debug("pcic_interrupt(%d)\n", irq); |
858 | 843 | ||
859 | for (j = 0; j < 20; j++) { | 844 | for (j = 0; j < 20; j++) { |
860 | active = 0; | 845 | active = 0; |
@@ -878,7 +863,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev) | |||
878 | events |= (csc & I365_CSC_READY) ? SS_READY : 0; | 863 | events |= (csc & I365_CSC_READY) ? SS_READY : 0; |
879 | } | 864 | } |
880 | ISA_UNLOCK(i, flags); | 865 | ISA_UNLOCK(i, flags); |
881 | debug(2, "socket %d event 0x%02x\n", i, events); | 866 | pr_debug("socket %d event 0x%02x\n", i, events); |
882 | 867 | ||
883 | if (events) | 868 | if (events) |
884 | pcmcia_parse_events(&socket[i].socket, events); | 869 | pcmcia_parse_events(&socket[i].socket, events); |
@@ -890,7 +875,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev) | |||
890 | if (j == 20) | 875 | if (j == 20) |
891 | printk(KERN_NOTICE "i82365: infinite loop in interrupt handler\n"); | 876 | printk(KERN_NOTICE "i82365: infinite loop in interrupt handler\n"); |
892 | 877 | ||
893 | debug(4, "interrupt done\n"); | 878 | pr_debug("pcic_interrupt done\n"); |
894 | return IRQ_RETVAL(handled); | 879 | return IRQ_RETVAL(handled); |
895 | } /* pcic_interrupt */ | 880 | } /* pcic_interrupt */ |
896 | 881 | ||
@@ -932,7 +917,7 @@ static int i365_get_status(u_short sock, u_int *value) | |||
932 | } | 917 | } |
933 | } | 918 | } |
934 | 919 | ||
935 | debug(1, "GetStatus(%d) = %#4.4x\n", sock, *value); | 920 | pr_debug("GetStatus(%d) = %#4.4x\n", sock, *value); |
936 | return 0; | 921 | return 0; |
937 | } /* i365_get_status */ | 922 | } /* i365_get_status */ |
938 | 923 | ||
@@ -943,7 +928,7 @@ static int i365_set_socket(u_short sock, socket_state_t *state) | |||
943 | struct i82365_socket *t = &socket[sock]; | 928 | struct i82365_socket *t = &socket[sock]; |
944 | u_char reg; | 929 | u_char reg; |
945 | 930 | ||
946 | debug(1, "SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " | 931 | pr_debug("SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " |
947 | "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags, | 932 | "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags, |
948 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | 933 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); |
949 | 934 | ||
@@ -1052,7 +1037,7 @@ static int i365_set_io_map(u_short sock, struct pccard_io_map *io) | |||
1052 | { | 1037 | { |
1053 | u_char map, ioctl; | 1038 | u_char map, ioctl; |
1054 | 1039 | ||
1055 | debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, " | 1040 | pr_debug("SetIOMap(%d, %d, %#2.2x, %d ns, " |
1056 | "%#llx-%#llx)\n", sock, io->map, io->flags, io->speed, | 1041 | "%#llx-%#llx)\n", sock, io->map, io->flags, io->speed, |
1057 | (unsigned long long)io->start, (unsigned long long)io->stop); | 1042 | (unsigned long long)io->start, (unsigned long long)io->stop); |
1058 | map = io->map; | 1043 | map = io->map; |
@@ -1082,7 +1067,7 @@ static int i365_set_mem_map(u_short sock, struct pccard_mem_map *mem) | |||
1082 | u_short base, i; | 1067 | u_short base, i; |
1083 | u_char map; | 1068 | u_char map; |
1084 | 1069 | ||
1085 | debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, %#llx-%#llx, " | 1070 | pr_debug("SetMemMap(%d, %d, %#2.2x, %d ns, %#llx-%#llx, " |
1086 | "%#x)\n", sock, mem->map, mem->flags, mem->speed, | 1071 | "%#x)\n", sock, mem->map, mem->flags, mem->speed, |
1087 | (unsigned long long)mem->res->start, | 1072 | (unsigned long long)mem->res->start, |
1088 | (unsigned long long)mem->res->end, mem->card_start); | 1073 | (unsigned long long)mem->res->end, mem->card_start); |
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index 7dfbee1dcd76..26a621c9e2fc 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
@@ -38,17 +38,6 @@ | |||
38 | 38 | ||
39 | #include "m32r_cfc.h" | 39 | #include "m32r_cfc.h" |
40 | 40 | ||
41 | #ifdef CONFIG_PCMCIA_DEBUG | ||
42 | static int m32r_cfc_debug; | ||
43 | module_param(m32r_cfc_debug, int, 0644); | ||
44 | #define debug(lvl, fmt, arg...) do { \ | ||
45 | if (m32r_cfc_debug > (lvl)) \ | ||
46 | printk(KERN_DEBUG "m32r_cfc: " fmt , ## arg); \ | ||
47 | } while (0) | ||
48 | #else | ||
49 | #define debug(n, args...) do { } while (0) | ||
50 | #endif | ||
51 | |||
52 | /* Poll status interval -- 0 means default to interrupt */ | 41 | /* Poll status interval -- 0 means default to interrupt */ |
53 | static int poll_interval = 0; | 42 | static int poll_interval = 0; |
54 | 43 | ||
@@ -123,7 +112,7 @@ void pcc_ioread_byte(int sock, unsigned long port, void *buf, size_t size, | |||
123 | unsigned char *bp = (unsigned char *)buf; | 112 | unsigned char *bp = (unsigned char *)buf; |
124 | unsigned long flags; | 113 | unsigned long flags; |
125 | 114 | ||
126 | debug(3, "m32r_cfc: pcc_ioread_byte: sock=%d, port=%#lx, buf=%p, " | 115 | pr_debug("m32r_cfc: pcc_ioread_byte: sock=%d, port=%#lx, buf=%p, " |
127 | "size=%u, nmemb=%d, flag=%d\n", | 116 | "size=%u, nmemb=%d, flag=%d\n", |
128 | sock, port, buf, size, nmemb, flag); | 117 | sock, port, buf, size, nmemb, flag); |
129 | 118 | ||
@@ -132,7 +121,7 @@ void pcc_ioread_byte(int sock, unsigned long port, void *buf, size_t size, | |||
132 | printk("m32r_cfc:ioread_byte null port :%#lx\n",port); | 121 | printk("m32r_cfc:ioread_byte null port :%#lx\n",port); |
133 | return; | 122 | return; |
134 | } | 123 | } |
135 | debug(3, "m32r_cfc: pcc_ioread_byte: addr=%#lx\n", addr); | 124 | pr_debug("m32r_cfc: pcc_ioread_byte: addr=%#lx\n", addr); |
136 | 125 | ||
137 | spin_lock_irqsave(&pcc_lock, flags); | 126 | spin_lock_irqsave(&pcc_lock, flags); |
138 | /* read Byte */ | 127 | /* read Byte */ |
@@ -148,7 +137,7 @@ void pcc_ioread_word(int sock, unsigned long port, void *buf, size_t size, | |||
148 | unsigned short *bp = (unsigned short *)buf; | 137 | unsigned short *bp = (unsigned short *)buf; |
149 | unsigned long flags; | 138 | unsigned long flags; |
150 | 139 | ||
151 | debug(3, "m32r_cfc: pcc_ioread_word: sock=%d, port=%#lx, " | 140 | pr_debug("m32r_cfc: pcc_ioread_word: sock=%d, port=%#lx, " |
152 | "buf=%p, size=%u, nmemb=%d, flag=%d\n", | 141 | "buf=%p, size=%u, nmemb=%d, flag=%d\n", |
153 | sock, port, buf, size, nmemb, flag); | 142 | sock, port, buf, size, nmemb, flag); |
154 | 143 | ||
@@ -163,7 +152,7 @@ void pcc_ioread_word(int sock, unsigned long port, void *buf, size_t size, | |||
163 | printk("m32r_cfc:ioread_word null port :%#lx\n",port); | 152 | printk("m32r_cfc:ioread_word null port :%#lx\n",port); |
164 | return; | 153 | return; |
165 | } | 154 | } |
166 | debug(3, "m32r_cfc: pcc_ioread_word: addr=%#lx\n", addr); | 155 | pr_debug("m32r_cfc: pcc_ioread_word: addr=%#lx\n", addr); |
167 | 156 | ||
168 | spin_lock_irqsave(&pcc_lock, flags); | 157 | spin_lock_irqsave(&pcc_lock, flags); |
169 | /* read Word */ | 158 | /* read Word */ |
@@ -179,7 +168,7 @@ void pcc_iowrite_byte(int sock, unsigned long port, void *buf, size_t size, | |||
179 | unsigned char *bp = (unsigned char *)buf; | 168 | unsigned char *bp = (unsigned char *)buf; |
180 | unsigned long flags; | 169 | unsigned long flags; |
181 | 170 | ||
182 | debug(3, "m32r_cfc: pcc_iowrite_byte: sock=%d, port=%#lx, " | 171 | pr_debug("m32r_cfc: pcc_iowrite_byte: sock=%d, port=%#lx, " |
183 | "buf=%p, size=%u, nmemb=%d, flag=%d\n", | 172 | "buf=%p, size=%u, nmemb=%d, flag=%d\n", |
184 | sock, port, buf, size, nmemb, flag); | 173 | sock, port, buf, size, nmemb, flag); |
185 | 174 | ||
@@ -189,7 +178,7 @@ void pcc_iowrite_byte(int sock, unsigned long port, void *buf, size_t size, | |||
189 | printk("m32r_cfc:iowrite_byte null port:%#lx\n",port); | 178 | printk("m32r_cfc:iowrite_byte null port:%#lx\n",port); |
190 | return; | 179 | return; |
191 | } | 180 | } |
192 | debug(3, "m32r_cfc: pcc_iowrite_byte: addr=%#lx\n", addr); | 181 | pr_debug("m32r_cfc: pcc_iowrite_byte: addr=%#lx\n", addr); |
193 | 182 | ||
194 | spin_lock_irqsave(&pcc_lock, flags); | 183 | spin_lock_irqsave(&pcc_lock, flags); |
195 | while (nmemb--) | 184 | while (nmemb--) |
@@ -204,7 +193,7 @@ void pcc_iowrite_word(int sock, unsigned long port, void *buf, size_t size, | |||
204 | unsigned short *bp = (unsigned short *)buf; | 193 | unsigned short *bp = (unsigned short *)buf; |
205 | unsigned long flags; | 194 | unsigned long flags; |
206 | 195 | ||
207 | debug(3, "m32r_cfc: pcc_iowrite_word: sock=%d, port=%#lx, " | 196 | pr_debug("m32r_cfc: pcc_iowrite_word: sock=%d, port=%#lx, " |
208 | "buf=%p, size=%u, nmemb=%d, flag=%d\n", | 197 | "buf=%p, size=%u, nmemb=%d, flag=%d\n", |
209 | sock, port, buf, size, nmemb, flag); | 198 | sock, port, buf, size, nmemb, flag); |
210 | 199 | ||
@@ -226,7 +215,7 @@ void pcc_iowrite_word(int sock, unsigned long port, void *buf, size_t size, | |||
226 | return; | 215 | return; |
227 | } | 216 | } |
228 | #endif | 217 | #endif |
229 | debug(3, "m32r_cfc: pcc_iowrite_word: addr=%#lx\n", addr); | 218 | pr_debug("m32r_cfc: pcc_iowrite_word: addr=%#lx\n", addr); |
230 | 219 | ||
231 | spin_lock_irqsave(&pcc_lock, flags); | 220 | spin_lock_irqsave(&pcc_lock, flags); |
232 | while (nmemb--) | 221 | while (nmemb--) |
@@ -262,7 +251,7 @@ static struct timer_list poll_timer; | |||
262 | static unsigned int pcc_get(u_short sock, unsigned int reg) | 251 | static unsigned int pcc_get(u_short sock, unsigned int reg) |
263 | { | 252 | { |
264 | unsigned int val = inw(reg); | 253 | unsigned int val = inw(reg); |
265 | debug(3, "m32r_cfc: pcc_get: reg(0x%08x)=0x%04x\n", reg, val); | 254 | pr_debug("m32r_cfc: pcc_get: reg(0x%08x)=0x%04x\n", reg, val); |
266 | return val; | 255 | return val; |
267 | } | 256 | } |
268 | 257 | ||
@@ -270,7 +259,7 @@ static unsigned int pcc_get(u_short sock, unsigned int reg) | |||
270 | static void pcc_set(u_short sock, unsigned int reg, unsigned int data) | 259 | static void pcc_set(u_short sock, unsigned int reg, unsigned int data) |
271 | { | 260 | { |
272 | outw(data, reg); | 261 | outw(data, reg); |
273 | debug(3, "m32r_cfc: pcc_set: reg(0x%08x)=0x%04x\n", reg, data); | 262 | pr_debug("m32r_cfc: pcc_set: reg(0x%08x)=0x%04x\n", reg, data); |
274 | } | 263 | } |
275 | 264 | ||
276 | /*====================================================================== | 265 | /*====================================================================== |
@@ -286,14 +275,14 @@ static int __init is_alive(u_short sock) | |||
286 | { | 275 | { |
287 | unsigned int stat; | 276 | unsigned int stat; |
288 | 277 | ||
289 | debug(3, "m32r_cfc: is_alive:\n"); | 278 | pr_debug("m32r_cfc: is_alive:\n"); |
290 | 279 | ||
291 | printk("CF: "); | 280 | printk("CF: "); |
292 | stat = pcc_get(sock, (unsigned int)PLD_CFSTS); | 281 | stat = pcc_get(sock, (unsigned int)PLD_CFSTS); |
293 | if (!stat) | 282 | if (!stat) |
294 | printk("No "); | 283 | printk("No "); |
295 | printk("Card is detected at socket %d : stat = 0x%08x\n", sock, stat); | 284 | printk("Card is detected at socket %d : stat = 0x%08x\n", sock, stat); |
296 | debug(3, "m32r_cfc: is_alive: sock stat is 0x%04x\n", stat); | 285 | pr_debug("m32r_cfc: is_alive: sock stat is 0x%04x\n", stat); |
297 | 286 | ||
298 | return 0; | 287 | return 0; |
299 | } | 288 | } |
@@ -303,7 +292,7 @@ static void add_pcc_socket(ulong base, int irq, ulong mapaddr, | |||
303 | { | 292 | { |
304 | pcc_socket_t *t = &socket[pcc_sockets]; | 293 | pcc_socket_t *t = &socket[pcc_sockets]; |
305 | 294 | ||
306 | debug(3, "m32r_cfc: add_pcc_socket: base=%#lx, irq=%d, " | 295 | pr_debug("m32r_cfc: add_pcc_socket: base=%#lx, irq=%d, " |
307 | "mapaddr=%#lx, ioaddr=%08x\n", | 296 | "mapaddr=%#lx, ioaddr=%08x\n", |
308 | base, irq, mapaddr, ioaddr); | 297 | base, irq, mapaddr, ioaddr); |
309 | 298 | ||
@@ -358,7 +347,7 @@ static void add_pcc_socket(ulong base, int irq, ulong mapaddr, | |||
358 | /* eject interrupt */ | 347 | /* eject interrupt */ |
359 | request_irq(irq+1, pcc_interrupt, 0, "m32r_cfc", pcc_interrupt); | 348 | request_irq(irq+1, pcc_interrupt, 0, "m32r_cfc", pcc_interrupt); |
360 | #endif | 349 | #endif |
361 | debug(3, "m32r_cfc: enable CFMSK, RDYSEL\n"); | 350 | pr_debug("m32r_cfc: enable CFMSK, RDYSEL\n"); |
362 | pcc_set(pcc_sockets, (unsigned int)PLD_CFIMASK, 0x01); | 351 | pcc_set(pcc_sockets, (unsigned int)PLD_CFIMASK, 0x01); |
363 | #endif /* CONFIG_PLAT_USRV */ | 352 | #endif /* CONFIG_PLAT_USRV */ |
364 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT) | 353 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT) |
@@ -378,26 +367,26 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) | |||
378 | u_int events = 0; | 367 | u_int events = 0; |
379 | int handled = 0; | 368 | int handled = 0; |
380 | 369 | ||
381 | debug(3, "m32r_cfc: pcc_interrupt: irq=%d, dev=%p\n", irq, dev); | 370 | pr_debug("m32r_cfc: pcc_interrupt: irq=%d, dev=%p\n", irq, dev); |
382 | for (i = 0; i < pcc_sockets; i++) { | 371 | for (i = 0; i < pcc_sockets; i++) { |
383 | if (socket[i].cs_irq1 != irq && socket[i].cs_irq2 != irq) | 372 | if (socket[i].cs_irq1 != irq && socket[i].cs_irq2 != irq) |
384 | continue; | 373 | continue; |
385 | 374 | ||
386 | handled = 1; | 375 | handled = 1; |
387 | debug(3, "m32r_cfc: pcc_interrupt: socket %d irq 0x%02x ", | 376 | pr_debug("m32r_cfc: pcc_interrupt: socket %d irq 0x%02x ", |
388 | i, irq); | 377 | i, irq); |
389 | events |= SS_DETECT; /* insert or eject */ | 378 | events |= SS_DETECT; /* insert or eject */ |
390 | if (events) | 379 | if (events) |
391 | pcmcia_parse_events(&socket[i].socket, events); | 380 | pcmcia_parse_events(&socket[i].socket, events); |
392 | } | 381 | } |
393 | debug(3, "m32r_cfc: pcc_interrupt: done\n"); | 382 | pr_debug("m32r_cfc: pcc_interrupt: done\n"); |
394 | 383 | ||
395 | return IRQ_RETVAL(handled); | 384 | return IRQ_RETVAL(handled); |
396 | } /* pcc_interrupt */ | 385 | } /* pcc_interrupt */ |
397 | 386 | ||
398 | static void pcc_interrupt_wrapper(u_long data) | 387 | static void pcc_interrupt_wrapper(u_long data) |
399 | { | 388 | { |
400 | debug(3, "m32r_cfc: pcc_interrupt_wrapper:\n"); | 389 | pr_debug("m32r_cfc: pcc_interrupt_wrapper:\n"); |
401 | pcc_interrupt(0, NULL); | 390 | pcc_interrupt(0, NULL); |
402 | init_timer(&poll_timer); | 391 | init_timer(&poll_timer); |
403 | poll_timer.expires = jiffies + poll_interval; | 392 | poll_timer.expires = jiffies + poll_interval; |
@@ -410,17 +399,17 @@ static int _pcc_get_status(u_short sock, u_int *value) | |||
410 | { | 399 | { |
411 | u_int status; | 400 | u_int status; |
412 | 401 | ||
413 | debug(3, "m32r_cfc: _pcc_get_status:\n"); | 402 | pr_debug("m32r_cfc: _pcc_get_status:\n"); |
414 | status = pcc_get(sock, (unsigned int)PLD_CFSTS); | 403 | status = pcc_get(sock, (unsigned int)PLD_CFSTS); |
415 | *value = (status) ? SS_DETECT : 0; | 404 | *value = (status) ? SS_DETECT : 0; |
416 | debug(3, "m32r_cfc: _pcc_get_status: status=0x%08x\n", status); | 405 | pr_debug("m32r_cfc: _pcc_get_status: status=0x%08x\n", status); |
417 | 406 | ||
418 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT) | 407 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT) |
419 | if ( status ) { | 408 | if ( status ) { |
420 | /* enable CF power */ | 409 | /* enable CF power */ |
421 | status = inw((unsigned int)PLD_CPCR); | 410 | status = inw((unsigned int)PLD_CPCR); |
422 | if (!(status & PLD_CPCR_CF)) { | 411 | if (!(status & PLD_CPCR_CF)) { |
423 | debug(3, "m32r_cfc: _pcc_get_status: " | 412 | pr_debug("m32r_cfc: _pcc_get_status: " |
424 | "power on (CPCR=0x%08x)\n", status); | 413 | "power on (CPCR=0x%08x)\n", status); |
425 | status |= PLD_CPCR_CF; | 414 | status |= PLD_CPCR_CF; |
426 | outw(status, (unsigned int)PLD_CPCR); | 415 | outw(status, (unsigned int)PLD_CPCR); |
@@ -439,7 +428,7 @@ static int _pcc_get_status(u_short sock, u_int *value) | |||
439 | status &= ~PLD_CPCR_CF; | 428 | status &= ~PLD_CPCR_CF; |
440 | outw(status, (unsigned int)PLD_CPCR); | 429 | outw(status, (unsigned int)PLD_CPCR); |
441 | udelay(100); | 430 | udelay(100); |
442 | debug(3, "m32r_cfc: _pcc_get_status: " | 431 | pr_debug("m32r_cfc: _pcc_get_status: " |
443 | "power off (CPCR=0x%08x)\n", status); | 432 | "power off (CPCR=0x%08x)\n", status); |
444 | } | 433 | } |
445 | #elif defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3) | 434 | #elif defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3) |
@@ -465,13 +454,13 @@ static int _pcc_get_status(u_short sock, u_int *value) | |||
465 | /* disable CF power */ | 454 | /* disable CF power */ |
466 | pcc_set(sock, (unsigned int)PLD_CPCR, 0); | 455 | pcc_set(sock, (unsigned int)PLD_CPCR, 0); |
467 | udelay(100); | 456 | udelay(100); |
468 | debug(3, "m32r_cfc: _pcc_get_status: " | 457 | pr_debug("m32r_cfc: _pcc_get_status: " |
469 | "power off (CPCR=0x%08x)\n", status); | 458 | "power off (CPCR=0x%08x)\n", status); |
470 | } | 459 | } |
471 | #else | 460 | #else |
472 | #error no platform configuration | 461 | #error no platform configuration |
473 | #endif | 462 | #endif |
474 | debug(3, "m32r_cfc: _pcc_get_status: GetStatus(%d) = %#4.4x\n", | 463 | pr_debug("m32r_cfc: _pcc_get_status: GetStatus(%d) = %#4.4x\n", |
475 | sock, *value); | 464 | sock, *value); |
476 | return 0; | 465 | return 0; |
477 | } /* _get_status */ | 466 | } /* _get_status */ |
@@ -480,7 +469,7 @@ static int _pcc_get_status(u_short sock, u_int *value) | |||
480 | 469 | ||
481 | static int _pcc_set_socket(u_short sock, socket_state_t *state) | 470 | static int _pcc_set_socket(u_short sock, socket_state_t *state) |
482 | { | 471 | { |
483 | debug(3, "m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " | 472 | pr_debug("m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " |
484 | "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags, | 473 | "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags, |
485 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | 474 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); |
486 | 475 | ||
@@ -492,41 +481,39 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state) | |||
492 | } | 481 | } |
493 | #endif | 482 | #endif |
494 | if (state->flags & SS_RESET) { | 483 | if (state->flags & SS_RESET) { |
495 | debug(3, ":RESET\n"); | 484 | pr_debug(":RESET\n"); |
496 | pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x101); | 485 | pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x101); |
497 | }else{ | 486 | }else{ |
498 | pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x100); | 487 | pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x100); |
499 | } | 488 | } |
500 | if (state->flags & SS_OUTPUT_ENA){ | 489 | if (state->flags & SS_OUTPUT_ENA){ |
501 | debug(3, ":OUTPUT_ENA\n"); | 490 | pr_debug(":OUTPUT_ENA\n"); |
502 | /* bit clear */ | 491 | /* bit clear */ |
503 | pcc_set(sock,(unsigned int)PLD_CFBUFCR,0); | 492 | pcc_set(sock,(unsigned int)PLD_CFBUFCR,0); |
504 | } else { | 493 | } else { |
505 | pcc_set(sock,(unsigned int)PLD_CFBUFCR,1); | 494 | pcc_set(sock,(unsigned int)PLD_CFBUFCR,1); |
506 | } | 495 | } |
507 | 496 | ||
508 | #ifdef CONFIG_PCMCIA_DEBUG | ||
509 | if(state->flags & SS_IOCARD){ | 497 | if(state->flags & SS_IOCARD){ |
510 | debug(3, ":IOCARD"); | 498 | pr_debug(":IOCARD"); |
511 | } | 499 | } |
512 | if (state->flags & SS_PWR_AUTO) { | 500 | if (state->flags & SS_PWR_AUTO) { |
513 | debug(3, ":PWR_AUTO"); | 501 | pr_debug(":PWR_AUTO"); |
514 | } | 502 | } |
515 | if (state->csc_mask & SS_DETECT) | 503 | if (state->csc_mask & SS_DETECT) |
516 | debug(3, ":csc-SS_DETECT"); | 504 | pr_debug(":csc-SS_DETECT"); |
517 | if (state->flags & SS_IOCARD) { | 505 | if (state->flags & SS_IOCARD) { |
518 | if (state->csc_mask & SS_STSCHG) | 506 | if (state->csc_mask & SS_STSCHG) |
519 | debug(3, ":STSCHG"); | 507 | pr_debug(":STSCHG"); |
520 | } else { | 508 | } else { |
521 | if (state->csc_mask & SS_BATDEAD) | 509 | if (state->csc_mask & SS_BATDEAD) |
522 | debug(3, ":BATDEAD"); | 510 | pr_debug(":BATDEAD"); |
523 | if (state->csc_mask & SS_BATWARN) | 511 | if (state->csc_mask & SS_BATWARN) |
524 | debug(3, ":BATWARN"); | 512 | pr_debug(":BATWARN"); |
525 | if (state->csc_mask & SS_READY) | 513 | if (state->csc_mask & SS_READY) |
526 | debug(3, ":READY"); | 514 | pr_debug(":READY"); |
527 | } | 515 | } |
528 | debug(3, "\n"); | 516 | pr_debug("\n"); |
529 | #endif | ||
530 | return 0; | 517 | return 0; |
531 | } /* _set_socket */ | 518 | } /* _set_socket */ |
532 | 519 | ||
@@ -536,7 +523,7 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) | |||
536 | { | 523 | { |
537 | u_char map; | 524 | u_char map; |
538 | 525 | ||
539 | debug(3, "m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, " | 526 | pr_debug("m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, " |
540 | "%#llx-%#llx)\n", sock, io->map, io->flags, | 527 | "%#llx-%#llx)\n", sock, io->map, io->flags, |
541 | io->speed, (unsigned long long)io->start, | 528 | io->speed, (unsigned long long)io->start, |
542 | (unsigned long long)io->stop); | 529 | (unsigned long long)io->stop); |
@@ -554,7 +541,7 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) | |||
554 | u_long addr; | 541 | u_long addr; |
555 | pcc_socket_t *t = &socket[sock]; | 542 | pcc_socket_t *t = &socket[sock]; |
556 | 543 | ||
557 | debug(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, " | 544 | pr_debug("m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, " |
558 | "%#llx, %#x)\n", sock, map, mem->flags, | 545 | "%#llx, %#x)\n", sock, map, mem->flags, |
559 | mem->speed, (unsigned long long)mem->static_start, | 546 | mem->speed, (unsigned long long)mem->static_start, |
560 | mem->card_start); | 547 | mem->card_start); |
@@ -640,11 +627,11 @@ static int pcc_get_status(struct pcmcia_socket *s, u_int *value) | |||
640 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | 627 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; |
641 | 628 | ||
642 | if (socket[sock].flags & IS_ALIVE) { | 629 | if (socket[sock].flags & IS_ALIVE) { |
643 | debug(3, "m32r_cfc: pcc_get_status: sock(%d) -EINVAL\n", sock); | 630 | dev_dbg(&s->dev, "pcc_get_status: sock(%d) -EINVAL\n", sock); |
644 | *value = 0; | 631 | *value = 0; |
645 | return -EINVAL; | 632 | return -EINVAL; |
646 | } | 633 | } |
647 | debug(3, "m32r_cfc: pcc_get_status: sock(%d)\n", sock); | 634 | dev_dbg(&s->dev, "pcc_get_status: sock(%d)\n", sock); |
648 | LOCKED(_pcc_get_status(sock, value)); | 635 | LOCKED(_pcc_get_status(sock, value)); |
649 | } | 636 | } |
650 | 637 | ||
@@ -653,10 +640,10 @@ static int pcc_set_socket(struct pcmcia_socket *s, socket_state_t *state) | |||
653 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | 640 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; |
654 | 641 | ||
655 | if (socket[sock].flags & IS_ALIVE) { | 642 | if (socket[sock].flags & IS_ALIVE) { |
656 | debug(3, "m32r_cfc: pcc_set_socket: sock(%d) -EINVAL\n", sock); | 643 | dev_dbg(&s->dev, "pcc_set_socket: sock(%d) -EINVAL\n", sock); |
657 | return -EINVAL; | 644 | return -EINVAL; |
658 | } | 645 | } |
659 | debug(3, "m32r_cfc: pcc_set_socket: sock(%d)\n", sock); | 646 | dev_dbg(&s->dev, "pcc_set_socket: sock(%d)\n", sock); |
660 | LOCKED(_pcc_set_socket(sock, state)); | 647 | LOCKED(_pcc_set_socket(sock, state)); |
661 | } | 648 | } |
662 | 649 | ||
@@ -665,10 +652,10 @@ static int pcc_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io) | |||
665 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | 652 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; |
666 | 653 | ||
667 | if (socket[sock].flags & IS_ALIVE) { | 654 | if (socket[sock].flags & IS_ALIVE) { |
668 | debug(3, "m32r_cfc: pcc_set_io_map: sock(%d) -EINVAL\n", sock); | 655 | dev_dbg(&s->dev, "pcc_set_io_map: sock(%d) -EINVAL\n", sock); |
669 | return -EINVAL; | 656 | return -EINVAL; |
670 | } | 657 | } |
671 | debug(3, "m32r_cfc: pcc_set_io_map: sock(%d)\n", sock); | 658 | dev_dbg(&s->dev, "pcc_set_io_map: sock(%d)\n", sock); |
672 | LOCKED(_pcc_set_io_map(sock, io)); | 659 | LOCKED(_pcc_set_io_map(sock, io)); |
673 | } | 660 | } |
674 | 661 | ||
@@ -677,16 +664,16 @@ static int pcc_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem) | |||
677 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | 664 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; |
678 | 665 | ||
679 | if (socket[sock].flags & IS_ALIVE) { | 666 | if (socket[sock].flags & IS_ALIVE) { |
680 | debug(3, "m32r_cfc: pcc_set_mem_map: sock(%d) -EINVAL\n", sock); | 667 | dev_dbg(&s->dev, "pcc_set_mem_map: sock(%d) -EINVAL\n", sock); |
681 | return -EINVAL; | 668 | return -EINVAL; |
682 | } | 669 | } |
683 | debug(3, "m32r_cfc: pcc_set_mem_map: sock(%d)\n", sock); | 670 | dev_dbg(&s->dev, "pcc_set_mem_map: sock(%d)\n", sock); |
684 | LOCKED(_pcc_set_mem_map(sock, mem)); | 671 | LOCKED(_pcc_set_mem_map(sock, mem)); |
685 | } | 672 | } |
686 | 673 | ||
687 | static int pcc_init(struct pcmcia_socket *s) | 674 | static int pcc_init(struct pcmcia_socket *s) |
688 | { | 675 | { |
689 | debug(3, "m32r_cfc: pcc_init()\n"); | 676 | dev_dbg(&s->dev, "pcc_init()\n"); |
690 | return 0; | 677 | return 0; |
691 | } | 678 | } |
692 | 679 | ||
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index c6524f99ccc3..72844c5a6d05 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c | |||
@@ -45,16 +45,6 @@ | |||
45 | 45 | ||
46 | #define PCC_DEBUG_DBEX | 46 | #define PCC_DEBUG_DBEX |
47 | 47 | ||
48 | #ifdef CONFIG_PCMCIA_DEBUG | ||
49 | static int m32r_pcc_debug; | ||
50 | module_param(m32r_pcc_debug, int, 0644); | ||
51 | #define debug(lvl, fmt, arg...) do { \ | ||
52 | if (m32r_pcc_debug > (lvl)) \ | ||
53 | printk(KERN_DEBUG "m32r_pcc: " fmt , ## arg); \ | ||
54 | } while (0) | ||
55 | #else | ||
56 | #define debug(n, args...) do { } while (0) | ||
57 | #endif | ||
58 | 48 | ||
59 | /* Poll status interval -- 0 means default to interrupt */ | 49 | /* Poll status interval -- 0 means default to interrupt */ |
60 | static int poll_interval = 0; | 50 | static int poll_interval = 0; |
@@ -358,7 +348,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) | |||
358 | u_int events, active; | 348 | u_int events, active; |
359 | int handled = 0; | 349 | int handled = 0; |
360 | 350 | ||
361 | debug(4, "m32r: pcc_interrupt(%d)\n", irq); | 351 | pr_debug("m32r_pcc: pcc_interrupt(%d)\n", irq); |
362 | 352 | ||
363 | for (j = 0; j < 20; j++) { | 353 | for (j = 0; j < 20; j++) { |
364 | active = 0; | 354 | active = 0; |
@@ -369,13 +359,14 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) | |||
369 | handled = 1; | 359 | handled = 1; |
370 | irc = pcc_get(i, PCIRC); | 360 | irc = pcc_get(i, PCIRC); |
371 | irc >>=16; | 361 | irc >>=16; |
372 | debug(2, "m32r-pcc:interrupt: socket %d pcirc 0x%02x ", i, irc); | 362 | pr_debug("m32r_pcc: interrupt: socket %d pcirc 0x%02x ", |
363 | i, irc); | ||
373 | if (!irc) | 364 | if (!irc) |
374 | continue; | 365 | continue; |
375 | 366 | ||
376 | events = (irc) ? SS_DETECT : 0; | 367 | events = (irc) ? SS_DETECT : 0; |
377 | events |= (pcc_get(i,PCCR) & PCCR_PCEN) ? SS_READY : 0; | 368 | events |= (pcc_get(i,PCCR) & PCCR_PCEN) ? SS_READY : 0; |
378 | debug(2, " event 0x%02x\n", events); | 369 | pr_debug("m32r_pcc: event 0x%02x\n", events); |
379 | 370 | ||
380 | if (events) | 371 | if (events) |
381 | pcmcia_parse_events(&socket[i].socket, events); | 372 | pcmcia_parse_events(&socket[i].socket, events); |
@@ -388,7 +379,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) | |||
388 | if (j == 20) | 379 | if (j == 20) |
389 | printk(KERN_NOTICE "m32r-pcc: infinite loop in interrupt handler\n"); | 380 | printk(KERN_NOTICE "m32r-pcc: infinite loop in interrupt handler\n"); |
390 | 381 | ||
391 | debug(4, "m32r-pcc: interrupt done\n"); | 382 | pr_debug("m32r_pcc: interrupt done\n"); |
392 | 383 | ||
393 | return IRQ_RETVAL(handled); | 384 | return IRQ_RETVAL(handled); |
394 | } /* pcc_interrupt */ | 385 | } /* pcc_interrupt */ |
@@ -422,7 +413,7 @@ static int _pcc_get_status(u_short sock, u_int *value) | |||
422 | status = pcc_get(sock,PCCSIGCR); | 413 | status = pcc_get(sock,PCCSIGCR); |
423 | *value |= (status & PCCSIGCR_VEN) ? SS_POWERON : 0; | 414 | *value |= (status & PCCSIGCR_VEN) ? SS_POWERON : 0; |
424 | 415 | ||
425 | debug(3, "m32r-pcc: GetStatus(%d) = %#4.4x\n", sock, *value); | 416 | pr_debug("m32r_pcc: GetStatus(%d) = %#4.4x\n", sock, *value); |
426 | return 0; | 417 | return 0; |
427 | } /* _get_status */ | 418 | } /* _get_status */ |
428 | 419 | ||
@@ -432,7 +423,7 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state) | |||
432 | { | 423 | { |
433 | u_long reg = 0; | 424 | u_long reg = 0; |
434 | 425 | ||
435 | debug(3, "m32r-pcc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " | 426 | pr_debug("m32r_pcc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " |
436 | "io_irq %d, csc_mask %#2.2x)", sock, state->flags, | 427 | "io_irq %d, csc_mask %#2.2x)", sock, state->flags, |
437 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | 428 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); |
438 | 429 | ||
@@ -448,11 +439,11 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state) | |||
448 | } | 439 | } |
449 | 440 | ||
450 | if (state->flags & SS_RESET) { | 441 | if (state->flags & SS_RESET) { |
451 | debug(3, ":RESET\n"); | 442 | pr_debug("m32r_pcc: :RESET\n"); |
452 | reg |= PCCSIGCR_CRST; | 443 | reg |= PCCSIGCR_CRST; |
453 | } | 444 | } |
454 | if (state->flags & SS_OUTPUT_ENA){ | 445 | if (state->flags & SS_OUTPUT_ENA){ |
455 | debug(3, ":OUTPUT_ENA\n"); | 446 | pr_debug("m32r_pcc: :OUTPUT_ENA\n"); |
456 | /* bit clear */ | 447 | /* bit clear */ |
457 | } else { | 448 | } else { |
458 | reg |= PCCSIGCR_SEN; | 449 | reg |= PCCSIGCR_SEN; |
@@ -460,28 +451,26 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state) | |||
460 | 451 | ||
461 | pcc_set(sock,PCCSIGCR,reg); | 452 | pcc_set(sock,PCCSIGCR,reg); |
462 | 453 | ||
463 | #ifdef CONFIG_PCMCIA_DEBUG | ||
464 | if(state->flags & SS_IOCARD){ | 454 | if(state->flags & SS_IOCARD){ |
465 | debug(3, ":IOCARD"); | 455 | pr_debug("m32r_pcc: :IOCARD"); |
466 | } | 456 | } |
467 | if (state->flags & SS_PWR_AUTO) { | 457 | if (state->flags & SS_PWR_AUTO) { |
468 | debug(3, ":PWR_AUTO"); | 458 | pr_debug("m32r_pcc: :PWR_AUTO"); |
469 | } | 459 | } |
470 | if (state->csc_mask & SS_DETECT) | 460 | if (state->csc_mask & SS_DETECT) |
471 | debug(3, ":csc-SS_DETECT"); | 461 | pr_debug("m32r_pcc: :csc-SS_DETECT"); |
472 | if (state->flags & SS_IOCARD) { | 462 | if (state->flags & SS_IOCARD) { |
473 | if (state->csc_mask & SS_STSCHG) | 463 | if (state->csc_mask & SS_STSCHG) |
474 | debug(3, ":STSCHG"); | 464 | pr_debug("m32r_pcc: :STSCHG"); |
475 | } else { | 465 | } else { |
476 | if (state->csc_mask & SS_BATDEAD) | 466 | if (state->csc_mask & SS_BATDEAD) |
477 | debug(3, ":BATDEAD"); | 467 | pr_debug("m32r_pcc: :BATDEAD"); |
478 | if (state->csc_mask & SS_BATWARN) | 468 | if (state->csc_mask & SS_BATWARN) |
479 | debug(3, ":BATWARN"); | 469 | pr_debug("m32r_pcc: :BATWARN"); |
480 | if (state->csc_mask & SS_READY) | 470 | if (state->csc_mask & SS_READY) |
481 | debug(3, ":READY"); | 471 | pr_debug("m32r_pcc: :READY"); |
482 | } | 472 | } |
483 | debug(3, "\n"); | 473 | pr_debug("m32r_pcc: \n"); |
484 | #endif | ||
485 | return 0; | 474 | return 0; |
486 | } /* _set_socket */ | 475 | } /* _set_socket */ |
487 | 476 | ||
@@ -491,7 +480,7 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) | |||
491 | { | 480 | { |
492 | u_char map; | 481 | u_char map; |
493 | 482 | ||
494 | debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, " | 483 | pr_debug("m32r_pcc: SetIOMap(%d, %d, %#2.2x, %d ns, " |
495 | "%#llx-%#llx)\n", sock, io->map, io->flags, | 484 | "%#llx-%#llx)\n", sock, io->map, io->flags, |
496 | io->speed, (unsigned long long)io->start, | 485 | io->speed, (unsigned long long)io->start, |
497 | (unsigned long long)io->stop); | 486 | (unsigned long long)io->stop); |
@@ -515,7 +504,7 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) | |||
515 | #endif | 504 | #endif |
516 | #endif | 505 | #endif |
517 | 506 | ||
518 | debug(3, "m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, " | 507 | pr_debug("m32r_pcc: SetMemMap(%d, %d, %#2.2x, %d ns, " |
519 | "%#llx, %#x)\n", sock, map, mem->flags, | 508 | "%#llx, %#x)\n", sock, map, mem->flags, |
520 | mem->speed, (unsigned long long)mem->static_start, | 509 | mem->speed, (unsigned long long)mem->static_start, |
521 | mem->card_start); | 510 | mem->card_start); |
@@ -662,7 +651,7 @@ static int pcc_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem) | |||
662 | 651 | ||
663 | static int pcc_init(struct pcmcia_socket *s) | 652 | static int pcc_init(struct pcmcia_socket *s) |
664 | { | 653 | { |
665 | debug(4, "m32r-pcc: init call\n"); | 654 | pr_debug("m32r_pcc: init call\n"); |
666 | return 0; | 655 | return 0; |
667 | } | 656 | } |
668 | 657 | ||
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 403559ba49dd..7f79c4e169ae 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -64,14 +64,6 @@ | |||
64 | #include <pcmcia/cs.h> | 64 | #include <pcmcia/cs.h> |
65 | #include <pcmcia/ss.h> | 65 | #include <pcmcia/ss.h> |
66 | 66 | ||
67 | #ifdef CONFIG_PCMCIA_DEBUG | ||
68 | static int pc_debug; | ||
69 | module_param(pc_debug, int, 0); | ||
70 | #define dprintk(args...) printk(KERN_DEBUG "m8xx_pcmcia: " args); | ||
71 | #else | ||
72 | #define dprintk(args...) | ||
73 | #endif | ||
74 | |||
75 | #define pcmcia_info(args...) printk(KERN_INFO "m8xx_pcmcia: "args) | 67 | #define pcmcia_info(args...) printk(KERN_INFO "m8xx_pcmcia: "args) |
76 | #define pcmcia_error(args...) printk(KERN_ERR "m8xx_pcmcia: "args) | 68 | #define pcmcia_error(args...) printk(KERN_ERR "m8xx_pcmcia: "args) |
77 | 69 | ||
@@ -565,7 +557,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) | |||
565 | unsigned int i, events, pscr, pipr, per; | 557 | unsigned int i, events, pscr, pipr, per; |
566 | pcmconf8xx_t *pcmcia = socket[0].pcmcia; | 558 | pcmconf8xx_t *pcmcia = socket[0].pcmcia; |
567 | 559 | ||
568 | dprintk("Interrupt!\n"); | 560 | pr_debug("m8xx_pcmcia: Interrupt!\n"); |
569 | /* get interrupt sources */ | 561 | /* get interrupt sources */ |
570 | 562 | ||
571 | pscr = in_be32(&pcmcia->pcmc_pscr); | 563 | pscr = in_be32(&pcmcia->pcmc_pscr); |
@@ -614,7 +606,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) | |||
614 | 606 | ||
615 | /* call the handler */ | 607 | /* call the handler */ |
616 | 608 | ||
617 | dprintk("slot %u: events = 0x%02x, pscr = 0x%08x, " | 609 | pr_debug("m8xx_pcmcia: slot %u: events = 0x%02x, pscr = 0x%08x, " |
618 | "pipr = 0x%08x\n", i, events, pscr, pipr); | 610 | "pipr = 0x%08x\n", i, events, pscr, pipr); |
619 | 611 | ||
620 | if (events) { | 612 | if (events) { |
@@ -641,7 +633,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) | |||
641 | /* clear the interrupt sources */ | 633 | /* clear the interrupt sources */ |
642 | out_be32(&pcmcia->pcmc_pscr, pscr); | 634 | out_be32(&pcmcia->pcmc_pscr, pscr); |
643 | 635 | ||
644 | dprintk("Interrupt done.\n"); | 636 | pr_debug("m8xx_pcmcia: Interrupt done.\n"); |
645 | 637 | ||
646 | return IRQ_HANDLED; | 638 | return IRQ_HANDLED; |
647 | } | 639 | } |
@@ -815,7 +807,7 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value) | |||
815 | }; | 807 | }; |
816 | } | 808 | } |
817 | 809 | ||
818 | dprintk("GetStatus(%d) = %#2.2x\n", lsock, *value); | 810 | pr_debug("m8xx_pcmcia: GetStatus(%d) = %#2.2x\n", lsock, *value); |
819 | return 0; | 811 | return 0; |
820 | } | 812 | } |
821 | 813 | ||
@@ -828,7 +820,7 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t * state) | |||
828 | unsigned long flags; | 820 | unsigned long flags; |
829 | pcmconf8xx_t *pcmcia = socket[0].pcmcia; | 821 | pcmconf8xx_t *pcmcia = socket[0].pcmcia; |
830 | 822 | ||
831 | dprintk("SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " | 823 | pr_debug("m8xx_pcmcia: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " |
832 | "io_irq %d, csc_mask %#2.2x)\n", lsock, state->flags, | 824 | "io_irq %d, csc_mask %#2.2x)\n", lsock, state->flags, |
833 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | 825 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); |
834 | 826 | ||
@@ -974,7 +966,7 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) | |||
974 | #define M8XX_SIZE (io->stop - io->start + 1) | 966 | #define M8XX_SIZE (io->stop - io->start + 1) |
975 | #define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start) | 967 | #define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start) |
976 | 968 | ||
977 | dprintk("SetIOMap(%d, %d, %#2.2x, %d ns, " | 969 | pr_debug("m8xx_pcmcia: SetIOMap(%d, %d, %#2.2x, %d ns, " |
978 | "%#4.4llx-%#4.4llx)\n", lsock, io->map, io->flags, | 970 | "%#4.4llx-%#4.4llx)\n", lsock, io->map, io->flags, |
979 | io->speed, (unsigned long long)io->start, | 971 | io->speed, (unsigned long long)io->start, |
980 | (unsigned long long)io->stop); | 972 | (unsigned long long)io->stop); |
@@ -988,7 +980,7 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) | |||
988 | 980 | ||
989 | if (io->flags & MAP_ACTIVE) { | 981 | if (io->flags & MAP_ACTIVE) { |
990 | 982 | ||
991 | dprintk("io->flags & MAP_ACTIVE\n"); | 983 | pr_debug("m8xx_pcmcia: io->flags & MAP_ACTIVE\n"); |
992 | 984 | ||
993 | winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO) | 985 | winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO) |
994 | + (lsock * PCMCIA_IO_WIN_NO) + io->map; | 986 | + (lsock * PCMCIA_IO_WIN_NO) + io->map; |
@@ -1018,8 +1010,8 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) | |||
1018 | 1010 | ||
1019 | out_be32(&w->or, reg); | 1011 | out_be32(&w->or, reg); |
1020 | 1012 | ||
1021 | dprintk("Socket %u: Mapped io window %u at %#8.8x, " | 1013 | pr_debug("m8xx_pcmcia: Socket %u: Mapped io window %u at " |
1022 | "OR = %#8.8x.\n", lsock, io->map, w->br, w->or); | 1014 | "%#8.8x, OR = %#8.8x.\n", lsock, io->map, w->br, w->or); |
1023 | } else { | 1015 | } else { |
1024 | /* shutdown IO window */ | 1016 | /* shutdown IO window */ |
1025 | winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO) | 1017 | winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO) |
@@ -1033,14 +1025,14 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) | |||
1033 | out_be32(&w->or, 0); /* turn off window */ | 1025 | out_be32(&w->or, 0); /* turn off window */ |
1034 | out_be32(&w->br, 0); /* turn off base address */ | 1026 | out_be32(&w->br, 0); /* turn off base address */ |
1035 | 1027 | ||
1036 | dprintk("Socket %u: Unmapped io window %u at %#8.8x, " | 1028 | pr_debug("m8xx_pcmcia: Socket %u: Unmapped io window %u at " |
1037 | "OR = %#8.8x.\n", lsock, io->map, w->br, w->or); | 1029 | "%#8.8x, OR = %#8.8x.\n", lsock, io->map, w->br, w->or); |
1038 | } | 1030 | } |
1039 | 1031 | ||
1040 | /* copy the struct and modify the copy */ | 1032 | /* copy the struct and modify the copy */ |
1041 | s->io_win[io->map] = *io; | 1033 | s->io_win[io->map] = *io; |
1042 | s->io_win[io->map].flags &= (MAP_WRPROT | MAP_16BIT | MAP_ACTIVE); | 1034 | s->io_win[io->map].flags &= (MAP_WRPROT | MAP_16BIT | MAP_ACTIVE); |
1043 | dprintk("SetIOMap exit\n"); | 1035 | pr_debug("m8xx_pcmcia: SetIOMap exit\n"); |
1044 | 1036 | ||
1045 | return 0; | 1037 | return 0; |
1046 | } | 1038 | } |
@@ -1055,7 +1047,7 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, | |||
1055 | unsigned int reg, winnr; | 1047 | unsigned int reg, winnr; |
1056 | pcmconf8xx_t *pcmcia = s->pcmcia; | 1048 | pcmconf8xx_t *pcmcia = s->pcmcia; |
1057 | 1049 | ||
1058 | dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, " | 1050 | pr_debug("m8xx_pcmcia: SetMemMap(%d, %d, %#2.2x, %d ns, " |
1059 | "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags, | 1051 | "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags, |
1060 | mem->speed, (unsigned long long)mem->static_start, | 1052 | mem->speed, (unsigned long long)mem->static_start, |
1061 | mem->card_start); | 1053 | mem->card_start); |
@@ -1098,7 +1090,7 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, | |||
1098 | 1090 | ||
1099 | out_be32(&w->or, reg); | 1091 | out_be32(&w->or, reg); |
1100 | 1092 | ||
1101 | dprintk("Socket %u: Mapped memory window %u at %#8.8x, " | 1093 | pr_debug("m8xx_pcmcia: Socket %u: Mapped memory window %u at %#8.8x, " |
1102 | "OR = %#8.8x.\n", lsock, mem->map, w->br, w->or); | 1094 | "OR = %#8.8x.\n", lsock, mem->map, w->br, w->or); |
1103 | 1095 | ||
1104 | if (mem->flags & MAP_ACTIVE) { | 1096 | if (mem->flags & MAP_ACTIVE) { |
@@ -1108,7 +1100,7 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, | |||
1108 | + mem->card_start; | 1100 | + mem->card_start; |
1109 | } | 1101 | } |
1110 | 1102 | ||
1111 | dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, " | 1103 | pr_debug("m8xx_pcmcia: SetMemMap(%d, %d, %#2.2x, %d ns, " |
1112 | "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags, | 1104 | "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags, |
1113 | mem->speed, (unsigned long long)mem->static_start, | 1105 | mem->speed, (unsigned long long)mem->static_start, |
1114 | mem->card_start); | 1106 | mem->card_start); |
@@ -1129,7 +1121,7 @@ static int m8xx_sock_init(struct pcmcia_socket *sock) | |||
1129 | pccard_io_map io = { 0, 0, 0, 0, 1 }; | 1121 | pccard_io_map io = { 0, 0, 0, 0, 1 }; |
1130 | pccard_mem_map mem = { 0, 0, 0, 0, 0, 0 }; | 1122 | pccard_mem_map mem = { 0, 0, 0, 0, 0, 0 }; |
1131 | 1123 | ||
1132 | dprintk("sock_init(%d)\n", s); | 1124 | pr_debug("m8xx_pcmcia: sock_init(%d)\n", s); |
1133 | 1125 | ||
1134 | m8xx_set_socket(sock, &dead_socket); | 1126 | m8xx_set_socket(sock, &dead_socket); |
1135 | for (i = 0; i < PCMCIA_IO_WIN_NO; i++) { | 1127 | for (i = 0; i < PCMCIA_IO_WIN_NO; i++) { |
diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index 72188c462c9c..624442fc0d35 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h | |||
@@ -30,28 +30,6 @@ | |||
30 | #ifndef _LINUX_O2MICRO_H | 30 | #ifndef _LINUX_O2MICRO_H |
31 | #define _LINUX_O2MICRO_H | 31 | #define _LINUX_O2MICRO_H |
32 | 32 | ||
33 | #ifndef PCI_VENDOR_ID_O2 | ||
34 | #define PCI_VENDOR_ID_O2 0x1217 | ||
35 | #endif | ||
36 | #ifndef PCI_DEVICE_ID_O2_6729 | ||
37 | #define PCI_DEVICE_ID_O2_6729 0x6729 | ||
38 | #endif | ||
39 | #ifndef PCI_DEVICE_ID_O2_6730 | ||
40 | #define PCI_DEVICE_ID_O2_6730 0x673a | ||
41 | #endif | ||
42 | #ifndef PCI_DEVICE_ID_O2_6832 | ||
43 | #define PCI_DEVICE_ID_O2_6832 0x6832 | ||
44 | #endif | ||
45 | #ifndef PCI_DEVICE_ID_O2_6836 | ||
46 | #define PCI_DEVICE_ID_O2_6836 0x6836 | ||
47 | #endif | ||
48 | #ifndef PCI_DEVICE_ID_O2_6812 | ||
49 | #define PCI_DEVICE_ID_O2_6812 0x6872 | ||
50 | #endif | ||
51 | #ifndef PCI_DEVICE_ID_O2_6933 | ||
52 | #define PCI_DEVICE_ID_O2_6933 0x6933 | ||
53 | #endif | ||
54 | |||
55 | /* Additional PCI configuration registers */ | 33 | /* Additional PCI configuration registers */ |
56 | 34 | ||
57 | #define O2_MUX_CONTROL 0x90 /* 32 bit */ | 35 | #define O2_MUX_CONTROL 0x90 /* 32 bit */ |
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 30cf71d2ee23..c4d7908fa37f 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c | |||
@@ -58,17 +58,6 @@ typedef struct user_info_t { | |||
58 | } user_info_t; | 58 | } user_info_t; |
59 | 59 | ||
60 | 60 | ||
61 | #ifdef CONFIG_PCMCIA_DEBUG | ||
62 | extern int ds_pc_debug; | ||
63 | |||
64 | #define ds_dbg(lvl, fmt, arg...) do { \ | ||
65 | if (ds_pc_debug >= lvl) \ | ||
66 | printk(KERN_DEBUG "ds: " fmt , ## arg); \ | ||
67 | } while (0) | ||
68 | #else | ||
69 | #define ds_dbg(lvl, fmt, arg...) do { } while (0) | ||
70 | #endif | ||
71 | |||
72 | static struct pcmcia_device *get_pcmcia_device(struct pcmcia_socket *s, | 61 | static struct pcmcia_device *get_pcmcia_device(struct pcmcia_socket *s, |
73 | unsigned int function) | 62 | unsigned int function) |
74 | { | 63 | { |
@@ -229,6 +218,61 @@ static int pcmcia_adjust_resource_info(adjust_t *adj) | |||
229 | return (ret); | 218 | return (ret); |
230 | } | 219 | } |
231 | 220 | ||
221 | |||
222 | /** pcmcia_get_window | ||
223 | */ | ||
224 | static int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *wh_out, | ||
225 | window_handle_t wh, win_req_t *req) | ||
226 | { | ||
227 | pccard_mem_map *win; | ||
228 | window_handle_t w; | ||
229 | |||
230 | wh--; | ||
231 | if (!s || !(s->state & SOCKET_PRESENT)) | ||
232 | return -ENODEV; | ||
233 | if (wh >= MAX_WIN) | ||
234 | return -EINVAL; | ||
235 | for (w = wh; w < MAX_WIN; w++) | ||
236 | if (s->state & SOCKET_WIN_REQ(w)) | ||
237 | break; | ||
238 | if (w == MAX_WIN) | ||
239 | return -EINVAL; | ||
240 | win = &s->win[w]; | ||
241 | req->Base = win->res->start; | ||
242 | req->Size = win->res->end - win->res->start + 1; | ||
243 | req->AccessSpeed = win->speed; | ||
244 | req->Attributes = 0; | ||
245 | if (win->flags & MAP_ATTRIB) | ||
246 | req->Attributes |= WIN_MEMORY_TYPE_AM; | ||
247 | if (win->flags & MAP_ACTIVE) | ||
248 | req->Attributes |= WIN_ENABLE; | ||
249 | if (win->flags & MAP_16BIT) | ||
250 | req->Attributes |= WIN_DATA_WIDTH_16; | ||
251 | if (win->flags & MAP_USE_WAIT) | ||
252 | req->Attributes |= WIN_USE_WAIT; | ||
253 | |||
254 | *wh_out = w + 1; | ||
255 | return 0; | ||
256 | } /* pcmcia_get_window */ | ||
257 | |||
258 | |||
259 | /** pcmcia_get_mem_page | ||
260 | * | ||
261 | * Change the card address of an already open memory window. | ||
262 | */ | ||
263 | static int pcmcia_get_mem_page(struct pcmcia_socket *skt, window_handle_t wh, | ||
264 | memreq_t *req) | ||
265 | { | ||
266 | wh--; | ||
267 | if (wh >= MAX_WIN) | ||
268 | return -EINVAL; | ||
269 | |||
270 | req->Page = 0; | ||
271 | req->CardOffset = skt->win[wh].card_start; | ||
272 | return 0; | ||
273 | } /* pcmcia_get_mem_page */ | ||
274 | |||
275 | |||
232 | /** pccard_get_status | 276 | /** pccard_get_status |
233 | * | 277 | * |
234 | * Get the current socket state bits. We don't support the latched | 278 | * Get the current socket state bits. We don't support the latched |
@@ -431,7 +475,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info) | |||
431 | if (!s) | 475 | if (!s) |
432 | return -EINVAL; | 476 | return -EINVAL; |
433 | 477 | ||
434 | ds_dbg(2, "bind_request(%d, '%s')\n", s->sock, | 478 | pr_debug("bind_request(%d, '%s')\n", s->sock, |
435 | (char *)bind_info->dev_info); | 479 | (char *)bind_info->dev_info); |
436 | 480 | ||
437 | p_drv = get_pcmcia_driver(&bind_info->dev_info); | 481 | p_drv = get_pcmcia_driver(&bind_info->dev_info); |
@@ -623,7 +667,7 @@ static int ds_open(struct inode *inode, struct file *file) | |||
623 | static int warning_printed = 0; | 667 | static int warning_printed = 0; |
624 | int ret = 0; | 668 | int ret = 0; |
625 | 669 | ||
626 | ds_dbg(0, "ds_open(socket %d)\n", i); | 670 | pr_debug("ds_open(socket %d)\n", i); |
627 | 671 | ||
628 | lock_kernel(); | 672 | lock_kernel(); |
629 | s = pcmcia_get_socket_by_nr(i); | 673 | s = pcmcia_get_socket_by_nr(i); |
@@ -685,7 +729,7 @@ static int ds_release(struct inode *inode, struct file *file) | |||
685 | struct pcmcia_socket *s; | 729 | struct pcmcia_socket *s; |
686 | user_info_t *user, **link; | 730 | user_info_t *user, **link; |
687 | 731 | ||
688 | ds_dbg(0, "ds_release(socket %d)\n", iminor(inode)); | 732 | pr_debug("ds_release(socket %d)\n", iminor(inode)); |
689 | 733 | ||
690 | user = file->private_data; | 734 | user = file->private_data; |
691 | if (CHECK_USER(user)) | 735 | if (CHECK_USER(user)) |
@@ -719,7 +763,7 @@ static ssize_t ds_read(struct file *file, char __user *buf, | |||
719 | user_info_t *user; | 763 | user_info_t *user; |
720 | int ret; | 764 | int ret; |
721 | 765 | ||
722 | ds_dbg(2, "ds_read(socket %d)\n", iminor(file->f_path.dentry->d_inode)); | 766 | pr_debug("ds_read(socket %d)\n", iminor(file->f_path.dentry->d_inode)); |
723 | 767 | ||
724 | if (count < 4) | 768 | if (count < 4) |
725 | return -EINVAL; | 769 | return -EINVAL; |
@@ -744,7 +788,7 @@ static ssize_t ds_read(struct file *file, char __user *buf, | |||
744 | static ssize_t ds_write(struct file *file, const char __user *buf, | 788 | static ssize_t ds_write(struct file *file, const char __user *buf, |
745 | size_t count, loff_t *ppos) | 789 | size_t count, loff_t *ppos) |
746 | { | 790 | { |
747 | ds_dbg(2, "ds_write(socket %d)\n", iminor(file->f_path.dentry->d_inode)); | 791 | pr_debug("ds_write(socket %d)\n", iminor(file->f_path.dentry->d_inode)); |
748 | 792 | ||
749 | if (count != 4) | 793 | if (count != 4) |
750 | return -EINVAL; | 794 | return -EINVAL; |
@@ -762,7 +806,7 @@ static u_int ds_poll(struct file *file, poll_table *wait) | |||
762 | struct pcmcia_socket *s; | 806 | struct pcmcia_socket *s; |
763 | user_info_t *user; | 807 | user_info_t *user; |
764 | 808 | ||
765 | ds_dbg(2, "ds_poll(socket %d)\n", iminor(file->f_path.dentry->d_inode)); | 809 | pr_debug("ds_poll(socket %d)\n", iminor(file->f_path.dentry->d_inode)); |
766 | 810 | ||
767 | user = file->private_data; | 811 | user = file->private_data; |
768 | if (CHECK_USER(user)) | 812 | if (CHECK_USER(user)) |
@@ -790,7 +834,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, | |||
790 | ds_ioctl_arg_t *buf; | 834 | ds_ioctl_arg_t *buf; |
791 | user_info_t *user; | 835 | user_info_t *user; |
792 | 836 | ||
793 | ds_dbg(2, "ds_ioctl(socket %d, %#x, %#lx)\n", iminor(inode), cmd, arg); | 837 | pr_debug("ds_ioctl(socket %d, %#x, %#lx)\n", iminor(inode), cmd, arg); |
794 | 838 | ||
795 | user = file->private_data; | 839 | user = file->private_data; |
796 | if (CHECK_USER(user)) | 840 | if (CHECK_USER(user)) |
@@ -809,13 +853,13 @@ static int ds_ioctl(struct inode * inode, struct file * file, | |||
809 | 853 | ||
810 | if (cmd & IOC_IN) { | 854 | if (cmd & IOC_IN) { |
811 | if (!access_ok(VERIFY_READ, uarg, size)) { | 855 | if (!access_ok(VERIFY_READ, uarg, size)) { |
812 | ds_dbg(3, "ds_ioctl(): verify_read = %d\n", -EFAULT); | 856 | pr_debug("ds_ioctl(): verify_read = %d\n", -EFAULT); |
813 | return -EFAULT; | 857 | return -EFAULT; |
814 | } | 858 | } |
815 | } | 859 | } |
816 | if (cmd & IOC_OUT) { | 860 | if (cmd & IOC_OUT) { |
817 | if (!access_ok(VERIFY_WRITE, uarg, size)) { | 861 | if (!access_ok(VERIFY_WRITE, uarg, size)) { |
818 | ds_dbg(3, "ds_ioctl(): verify_write = %d\n", -EFAULT); | 862 | pr_debug("ds_ioctl(): verify_write = %d\n", -EFAULT); |
819 | return -EFAULT; | 863 | return -EFAULT; |
820 | } | 864 | } |
821 | } | 865 | } |
@@ -927,15 +971,15 @@ static int ds_ioctl(struct inode * inode, struct file * file, | |||
927 | goto free_out; | 971 | goto free_out; |
928 | break; | 972 | break; |
929 | case DS_GET_FIRST_WINDOW: | 973 | case DS_GET_FIRST_WINDOW: |
930 | ret = pcmcia_get_window(s, &buf->win_info.handle, 0, | 974 | ret = pcmcia_get_window(s, &buf->win_info.handle, 1, |
931 | &buf->win_info.window); | 975 | &buf->win_info.window); |
932 | break; | 976 | break; |
933 | case DS_GET_NEXT_WINDOW: | 977 | case DS_GET_NEXT_WINDOW: |
934 | ret = pcmcia_get_window(s, &buf->win_info.handle, | 978 | ret = pcmcia_get_window(s, &buf->win_info.handle, |
935 | buf->win_info.handle->index + 1, &buf->win_info.window); | 979 | buf->win_info.handle + 1, &buf->win_info.window); |
936 | break; | 980 | break; |
937 | case DS_GET_MEM_PAGE: | 981 | case DS_GET_MEM_PAGE: |
938 | ret = pcmcia_get_mem_page(buf->win_info.handle, | 982 | ret = pcmcia_get_mem_page(s, buf->win_info.handle, |
939 | &buf->win_info.map); | 983 | &buf->win_info.map); |
940 | break; | 984 | break; |
941 | case DS_REPLACE_CIS: | 985 | case DS_REPLACE_CIS: |
@@ -962,7 +1006,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, | |||
962 | } | 1006 | } |
963 | 1007 | ||
964 | if ((err == 0) && (ret != 0)) { | 1008 | if ((err == 0) && (ret != 0)) { |
965 | ds_dbg(2, "ds_ioctl: ret = %d\n", ret); | 1009 | pr_debug("ds_ioctl: ret = %d\n", ret); |
966 | switch (ret) { | 1010 | switch (ret) { |
967 | case -ENODEV: | 1011 | case -ENODEV: |
968 | case -EINVAL: | 1012 | case -EINVAL: |
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index d919e96c0afd..a8bf8c1b45ed 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
23 | #include <linux/netdevice.h> | ||
23 | 24 | ||
24 | #include <pcmcia/cs_types.h> | 25 | #include <pcmcia/cs_types.h> |
25 | #include <pcmcia/ss.h> | 26 | #include <pcmcia/ss.h> |
@@ -43,21 +44,6 @@ static u8 pcmcia_used_irq[NR_IRQS]; | |||
43 | #endif | 44 | #endif |
44 | 45 | ||
45 | 46 | ||
46 | #ifdef CONFIG_PCMCIA_DEBUG | ||
47 | extern int ds_pc_debug; | ||
48 | |||
49 | #define ds_dbg(skt, lvl, fmt, arg...) do { \ | ||
50 | if (ds_pc_debug >= lvl) \ | ||
51 | dev_printk(KERN_DEBUG, &skt->dev, \ | ||
52 | "pcmcia_resource: " fmt, \ | ||
53 | ## arg); \ | ||
54 | } while (0) | ||
55 | #else | ||
56 | #define ds_dbg(skt, lvl, fmt, arg...) do { } while (0) | ||
57 | #endif | ||
58 | |||
59 | |||
60 | |||
61 | /** alloc_io_space | 47 | /** alloc_io_space |
62 | * | 48 | * |
63 | * Special stuff for managing IO windows, because they are scarce | 49 | * Special stuff for managing IO windows, because they are scarce |
@@ -72,14 +58,14 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr, | |||
72 | align = (*base) ? (lines ? 1<<lines : 0) : 1; | 58 | align = (*base) ? (lines ? 1<<lines : 0) : 1; |
73 | if (align && (align < num)) { | 59 | if (align && (align < num)) { |
74 | if (*base) { | 60 | if (*base) { |
75 | ds_dbg(s, 0, "odd IO request: num %#x align %#x\n", | 61 | dev_dbg(&s->dev, "odd IO request: num %#x align %#x\n", |
76 | num, align); | 62 | num, align); |
77 | align = 0; | 63 | align = 0; |
78 | } else | 64 | } else |
79 | while (align && (align < num)) align <<= 1; | 65 | while (align && (align < num)) align <<= 1; |
80 | } | 66 | } |
81 | if (*base & ~(align-1)) { | 67 | if (*base & ~(align-1)) { |
82 | ds_dbg(s, 0, "odd IO request: base %#x align %#x\n", | 68 | dev_dbg(&s->dev, "odd IO request: base %#x align %#x\n", |
83 | *base, align); | 69 | *base, align); |
84 | align = 0; | 70 | align = 0; |
85 | } | 71 | } |
@@ -173,8 +159,10 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, | |||
173 | s = p_dev->socket; | 159 | s = p_dev->socket; |
174 | c = p_dev->function_config; | 160 | c = p_dev->function_config; |
175 | 161 | ||
176 | if (!(c->state & CONFIG_LOCKED)) | 162 | if (!(c->state & CONFIG_LOCKED)) { |
163 | dev_dbg(&s->dev, "Configuration isnt't locked\n"); | ||
177 | return -EACCES; | 164 | return -EACCES; |
165 | } | ||
178 | 166 | ||
179 | addr = (c->ConfigBase + reg->Offset) >> 1; | 167 | addr = (c->ConfigBase + reg->Offset) >> 1; |
180 | 168 | ||
@@ -188,6 +176,7 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, | |||
188 | pcmcia_write_cis_mem(s, 1, addr, 1, &val); | 176 | pcmcia_write_cis_mem(s, 1, addr, 1, &val); |
189 | break; | 177 | break; |
190 | default: | 178 | default: |
179 | dev_dbg(&s->dev, "Invalid conf register request\n"); | ||
191 | return -EINVAL; | 180 | return -EINVAL; |
192 | break; | 181 | break; |
193 | } | 182 | } |
@@ -196,68 +185,21 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, | |||
196 | EXPORT_SYMBOL(pcmcia_access_configuration_register); | 185 | EXPORT_SYMBOL(pcmcia_access_configuration_register); |
197 | 186 | ||
198 | 187 | ||
199 | /** pcmcia_get_window | 188 | int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh, |
200 | */ | 189 | memreq_t *req) |
201 | int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle, | ||
202 | int idx, win_req_t *req) | ||
203 | { | ||
204 | window_t *win; | ||
205 | int w; | ||
206 | |||
207 | if (!s || !(s->state & SOCKET_PRESENT)) | ||
208 | return -ENODEV; | ||
209 | for (w = idx; w < MAX_WIN; w++) | ||
210 | if (s->state & SOCKET_WIN_REQ(w)) | ||
211 | break; | ||
212 | if (w == MAX_WIN) | ||
213 | return -EINVAL; | ||
214 | win = &s->win[w]; | ||
215 | req->Base = win->ctl.res->start; | ||
216 | req->Size = win->ctl.res->end - win->ctl.res->start + 1; | ||
217 | req->AccessSpeed = win->ctl.speed; | ||
218 | req->Attributes = 0; | ||
219 | if (win->ctl.flags & MAP_ATTRIB) | ||
220 | req->Attributes |= WIN_MEMORY_TYPE_AM; | ||
221 | if (win->ctl.flags & MAP_ACTIVE) | ||
222 | req->Attributes |= WIN_ENABLE; | ||
223 | if (win->ctl.flags & MAP_16BIT) | ||
224 | req->Attributes |= WIN_DATA_WIDTH_16; | ||
225 | if (win->ctl.flags & MAP_USE_WAIT) | ||
226 | req->Attributes |= WIN_USE_WAIT; | ||
227 | *handle = win; | ||
228 | return 0; | ||
229 | } /* pcmcia_get_window */ | ||
230 | EXPORT_SYMBOL(pcmcia_get_window); | ||
231 | |||
232 | |||
233 | /** pcmcia_get_mem_page | ||
234 | * | ||
235 | * Change the card address of an already open memory window. | ||
236 | */ | ||
237 | int pcmcia_get_mem_page(window_handle_t win, memreq_t *req) | ||
238 | { | 190 | { |
239 | if ((win == NULL) || (win->magic != WINDOW_MAGIC)) | 191 | struct pcmcia_socket *s = p_dev->socket; |
240 | return -EINVAL; | ||
241 | req->Page = 0; | ||
242 | req->CardOffset = win->ctl.card_start; | ||
243 | return 0; | ||
244 | } /* pcmcia_get_mem_page */ | ||
245 | EXPORT_SYMBOL(pcmcia_get_mem_page); | ||
246 | |||
247 | 192 | ||
248 | int pcmcia_map_mem_page(window_handle_t win, memreq_t *req) | 193 | wh--; |
249 | { | 194 | if (wh >= MAX_WIN) |
250 | struct pcmcia_socket *s; | ||
251 | if ((win == NULL) || (win->magic != WINDOW_MAGIC)) | ||
252 | return -EINVAL; | 195 | return -EINVAL; |
253 | s = win->sock; | ||
254 | if (req->Page != 0) { | 196 | if (req->Page != 0) { |
255 | ds_dbg(s, 0, "failure: requested page is zero\n"); | 197 | dev_dbg(&s->dev, "failure: requested page is zero\n"); |
256 | return -EINVAL; | 198 | return -EINVAL; |
257 | } | 199 | } |
258 | win->ctl.card_start = req->CardOffset; | 200 | s->win[wh].card_start = req->CardOffset; |
259 | if (s->ops->set_mem_map(s, &win->ctl) != 0) { | 201 | if (s->ops->set_mem_map(s, &s->win[wh]) != 0) { |
260 | ds_dbg(s, 0, "failed to set_mem_map\n"); | 202 | dev_dbg(&s->dev, "failed to set_mem_map\n"); |
261 | return -EIO; | 203 | return -EIO; |
262 | } | 204 | } |
263 | return 0; | 205 | return 0; |
@@ -278,10 +220,14 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev, | |||
278 | s = p_dev->socket; | 220 | s = p_dev->socket; |
279 | c = p_dev->function_config; | 221 | c = p_dev->function_config; |
280 | 222 | ||
281 | if (!(s->state & SOCKET_PRESENT)) | 223 | if (!(s->state & SOCKET_PRESENT)) { |
224 | dev_dbg(&s->dev, "No card present\n"); | ||
282 | return -ENODEV; | 225 | return -ENODEV; |
283 | if (!(c->state & CONFIG_LOCKED)) | 226 | } |
227 | if (!(c->state & CONFIG_LOCKED)) { | ||
228 | dev_dbg(&s->dev, "Configuration isnt't locked\n"); | ||
284 | return -EACCES; | 229 | return -EACCES; |
230 | } | ||
285 | 231 | ||
286 | if (mod->Attributes & CONF_IRQ_CHANGE_VALID) { | 232 | if (mod->Attributes & CONF_IRQ_CHANGE_VALID) { |
287 | if (mod->Attributes & CONF_ENABLE_IRQ) { | 233 | if (mod->Attributes & CONF_ENABLE_IRQ) { |
@@ -295,7 +241,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev, | |||
295 | } | 241 | } |
296 | 242 | ||
297 | if (mod->Attributes & CONF_VCC_CHANGE_VALID) { | 243 | if (mod->Attributes & CONF_VCC_CHANGE_VALID) { |
298 | ds_dbg(s, 0, "changing Vcc is not allowed at this time\n"); | 244 | dev_dbg(&s->dev, "changing Vcc is not allowed at this time\n"); |
299 | return -EINVAL; | 245 | return -EINVAL; |
300 | } | 246 | } |
301 | 247 | ||
@@ -303,7 +249,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev, | |||
303 | if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) && | 249 | if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) && |
304 | (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { | 250 | (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { |
305 | if (mod->Vpp1 != mod->Vpp2) { | 251 | if (mod->Vpp1 != mod->Vpp2) { |
306 | ds_dbg(s, 0, "Vpp1 and Vpp2 must be the same\n"); | 252 | dev_dbg(&s->dev, "Vpp1 and Vpp2 must be the same\n"); |
307 | return -EINVAL; | 253 | return -EINVAL; |
308 | } | 254 | } |
309 | s->socket.Vpp = mod->Vpp1; | 255 | s->socket.Vpp = mod->Vpp1; |
@@ -314,7 +260,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev, | |||
314 | } | 260 | } |
315 | } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) || | 261 | } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) || |
316 | (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { | 262 | (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { |
317 | ds_dbg(s, 0, "changing Vcc is not allowed at this time\n"); | 263 | dev_dbg(&s->dev, "changing Vcc is not allowed at this time\n"); |
318 | return -EINVAL; | 264 | return -EINVAL; |
319 | } | 265 | } |
320 | 266 | ||
@@ -425,11 +371,11 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
425 | if (c->state & CONFIG_LOCKED) | 371 | if (c->state & CONFIG_LOCKED) |
426 | return -EACCES; | 372 | return -EACCES; |
427 | if (c->irq.Attributes != req->Attributes) { | 373 | if (c->irq.Attributes != req->Attributes) { |
428 | ds_dbg(s, 0, "IRQ attributes must match assigned ones\n"); | 374 | dev_dbg(&s->dev, "IRQ attributes must match assigned ones\n"); |
429 | return -EINVAL; | 375 | return -EINVAL; |
430 | } | 376 | } |
431 | if (s->irq.AssignedIRQ != req->AssignedIRQ) { | 377 | if (s->irq.AssignedIRQ != req->AssignedIRQ) { |
432 | ds_dbg(s, 0, "IRQ must match assigned one\n"); | 378 | dev_dbg(&s->dev, "IRQ must match assigned one\n"); |
433 | return -EINVAL; | 379 | return -EINVAL; |
434 | } | 380 | } |
435 | if (--s->irq.Config == 0) { | 381 | if (--s->irq.Config == 0) { |
@@ -437,8 +383,8 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
437 | s->irq.AssignedIRQ = 0; | 383 | s->irq.AssignedIRQ = 0; |
438 | } | 384 | } |
439 | 385 | ||
440 | if (req->Attributes & IRQ_HANDLE_PRESENT) { | 386 | if (req->Handler) { |
441 | free_irq(req->AssignedIRQ, req->Instance); | 387 | free_irq(req->AssignedIRQ, p_dev->priv); |
442 | } | 388 | } |
443 | 389 | ||
444 | #ifdef CONFIG_PCMCIA_PROBE | 390 | #ifdef CONFIG_PCMCIA_PROBE |
@@ -449,30 +395,34 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
449 | } /* pcmcia_release_irq */ | 395 | } /* pcmcia_release_irq */ |
450 | 396 | ||
451 | 397 | ||
452 | int pcmcia_release_window(window_handle_t win) | 398 | int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh) |
453 | { | 399 | { |
454 | struct pcmcia_socket *s; | 400 | struct pcmcia_socket *s = p_dev->socket; |
401 | pccard_mem_map *win; | ||
455 | 402 | ||
456 | if ((win == NULL) || (win->magic != WINDOW_MAGIC)) | 403 | wh--; |
404 | if (wh >= MAX_WIN) | ||
457 | return -EINVAL; | 405 | return -EINVAL; |
458 | s = win->sock; | 406 | |
459 | if (!(win->handle->_win & CLIENT_WIN_REQ(win->index))) | 407 | win = &s->win[wh]; |
408 | |||
409 | if (!(p_dev->_win & CLIENT_WIN_REQ(wh))) { | ||
410 | dev_dbg(&s->dev, "not releasing unknown window\n"); | ||
460 | return -EINVAL; | 411 | return -EINVAL; |
412 | } | ||
461 | 413 | ||
462 | /* Shut down memory window */ | 414 | /* Shut down memory window */ |
463 | win->ctl.flags &= ~MAP_ACTIVE; | 415 | win->flags &= ~MAP_ACTIVE; |
464 | s->ops->set_mem_map(s, &win->ctl); | 416 | s->ops->set_mem_map(s, win); |
465 | s->state &= ~SOCKET_WIN_REQ(win->index); | 417 | s->state &= ~SOCKET_WIN_REQ(wh); |
466 | 418 | ||
467 | /* Release system memory */ | 419 | /* Release system memory */ |
468 | if (win->ctl.res) { | 420 | if (win->res) { |
469 | release_resource(win->ctl.res); | 421 | release_resource(win->res); |
470 | kfree(win->ctl.res); | 422 | kfree(win->res); |
471 | win->ctl.res = NULL; | 423 | win->res = NULL; |
472 | } | 424 | } |
473 | win->handle->_win &= ~CLIENT_WIN_REQ(win->index); | 425 | p_dev->_win &= ~CLIENT_WIN_REQ(wh); |
474 | |||
475 | win->magic = 0; | ||
476 | 426 | ||
477 | return 0; | 427 | return 0; |
478 | } /* pcmcia_release_window */ | 428 | } /* pcmcia_release_window */ |
@@ -492,12 +442,14 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev, | |||
492 | return -ENODEV; | 442 | return -ENODEV; |
493 | 443 | ||
494 | if (req->IntType & INT_CARDBUS) { | 444 | if (req->IntType & INT_CARDBUS) { |
495 | ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n"); | 445 | dev_dbg(&s->dev, "IntType may not be INT_CARDBUS\n"); |
496 | return -EINVAL; | 446 | return -EINVAL; |
497 | } | 447 | } |
498 | c = p_dev->function_config; | 448 | c = p_dev->function_config; |
499 | if (c->state & CONFIG_LOCKED) | 449 | if (c->state & CONFIG_LOCKED) { |
450 | dev_dbg(&s->dev, "Configuration is locked\n"); | ||
500 | return -EACCES; | 451 | return -EACCES; |
452 | } | ||
501 | 453 | ||
502 | /* Do power control. We don't allow changes in Vcc. */ | 454 | /* Do power control. We don't allow changes in Vcc. */ |
503 | s->socket.Vpp = req->Vpp; | 455 | s->socket.Vpp = req->Vpp; |
@@ -609,40 +561,44 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req) | |||
609 | struct pcmcia_socket *s = p_dev->socket; | 561 | struct pcmcia_socket *s = p_dev->socket; |
610 | config_t *c; | 562 | config_t *c; |
611 | 563 | ||
612 | if (!(s->state & SOCKET_PRESENT)) | 564 | if (!(s->state & SOCKET_PRESENT)) { |
565 | dev_dbg(&s->dev, "No card present\n"); | ||
613 | return -ENODEV; | 566 | return -ENODEV; |
567 | } | ||
614 | 568 | ||
615 | if (!req) | 569 | if (!req) |
616 | return -EINVAL; | 570 | return -EINVAL; |
617 | c = p_dev->function_config; | 571 | c = p_dev->function_config; |
618 | if (c->state & CONFIG_LOCKED) | 572 | if (c->state & CONFIG_LOCKED) { |
573 | dev_dbg(&s->dev, "Configuration is locked\n"); | ||
619 | return -EACCES; | 574 | return -EACCES; |
575 | } | ||
620 | if (c->state & CONFIG_IO_REQ) { | 576 | if (c->state & CONFIG_IO_REQ) { |
621 | ds_dbg(s, 0, "IO already configured\n"); | 577 | dev_dbg(&s->dev, "IO already configured\n"); |
622 | return -EBUSY; | 578 | return -EBUSY; |
623 | } | 579 | } |
624 | if (req->Attributes1 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS)) { | 580 | if (req->Attributes1 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS)) { |
625 | ds_dbg(s, 0, "bad attribute setting for IO region 1\n"); | 581 | dev_dbg(&s->dev, "bad attribute setting for IO region 1\n"); |
626 | return -EINVAL; | 582 | return -EINVAL; |
627 | } | 583 | } |
628 | if ((req->NumPorts2 > 0) && | 584 | if ((req->NumPorts2 > 0) && |
629 | (req->Attributes2 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS))) { | 585 | (req->Attributes2 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS))) { |
630 | ds_dbg(s, 0, "bad attribute setting for IO region 2\n"); | 586 | dev_dbg(&s->dev, "bad attribute setting for IO region 2\n"); |
631 | return -EINVAL; | 587 | return -EINVAL; |
632 | } | 588 | } |
633 | 589 | ||
634 | ds_dbg(s, 1, "trying to allocate resource 1\n"); | 590 | dev_dbg(&s->dev, "trying to allocate resource 1\n"); |
635 | if (alloc_io_space(s, req->Attributes1, &req->BasePort1, | 591 | if (alloc_io_space(s, req->Attributes1, &req->BasePort1, |
636 | req->NumPorts1, req->IOAddrLines)) { | 592 | req->NumPorts1, req->IOAddrLines)) { |
637 | ds_dbg(s, 0, "allocation of resource 1 failed\n"); | 593 | dev_dbg(&s->dev, "allocation of resource 1 failed\n"); |
638 | return -EBUSY; | 594 | return -EBUSY; |
639 | } | 595 | } |
640 | 596 | ||
641 | if (req->NumPorts2) { | 597 | if (req->NumPorts2) { |
642 | ds_dbg(s, 1, "trying to allocate resource 2\n"); | 598 | dev_dbg(&s->dev, "trying to allocate resource 2\n"); |
643 | if (alloc_io_space(s, req->Attributes2, &req->BasePort2, | 599 | if (alloc_io_space(s, req->Attributes2, &req->BasePort2, |
644 | req->NumPorts2, req->IOAddrLines)) { | 600 | req->NumPorts2, req->IOAddrLines)) { |
645 | ds_dbg(s, 0, "allocation of resource 2 failed\n"); | 601 | dev_dbg(&s->dev, "allocation of resource 2 failed\n"); |
646 | release_io_space(s, req->BasePort1, req->NumPorts1); | 602 | release_io_space(s, req->BasePort1, req->NumPorts1); |
647 | return -EBUSY; | 603 | return -EBUSY; |
648 | } | 604 | } |
@@ -680,13 +636,17 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
680 | int ret = -EINVAL, irq = 0; | 636 | int ret = -EINVAL, irq = 0; |
681 | int type; | 637 | int type; |
682 | 638 | ||
683 | if (!(s->state & SOCKET_PRESENT)) | 639 | if (!(s->state & SOCKET_PRESENT)) { |
640 | dev_dbg(&s->dev, "No card present\n"); | ||
684 | return -ENODEV; | 641 | return -ENODEV; |
642 | } | ||
685 | c = p_dev->function_config; | 643 | c = p_dev->function_config; |
686 | if (c->state & CONFIG_LOCKED) | 644 | if (c->state & CONFIG_LOCKED) { |
645 | dev_dbg(&s->dev, "Configuration is locked\n"); | ||
687 | return -EACCES; | 646 | return -EACCES; |
647 | } | ||
688 | if (c->state & CONFIG_IRQ_REQ) { | 648 | if (c->state & CONFIG_IRQ_REQ) { |
689 | ds_dbg(s, 0, "IRQ already configured\n"); | 649 | dev_dbg(&s->dev, "IRQ already configured\n"); |
690 | return -EBUSY; | 650 | return -EBUSY; |
691 | } | 651 | } |
692 | 652 | ||
@@ -704,7 +664,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
704 | /* if the underlying IRQ infrastructure allows for it, only allocate | 664 | /* if the underlying IRQ infrastructure allows for it, only allocate |
705 | * the IRQ, but do not enable it | 665 | * the IRQ, but do not enable it |
706 | */ | 666 | */ |
707 | if (!(req->Attributes & IRQ_HANDLE_PRESENT)) | 667 | if (!(req->Handler)) |
708 | type |= IRQ_NOAUTOEN; | 668 | type |= IRQ_NOAUTOEN; |
709 | #endif /* IRQ_NOAUTOEN */ | 669 | #endif /* IRQ_NOAUTOEN */ |
710 | 670 | ||
@@ -714,7 +674,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
714 | } else { | 674 | } else { |
715 | int try; | 675 | int try; |
716 | u32 mask = s->irq_mask; | 676 | u32 mask = s->irq_mask; |
717 | void *data = &p_dev->dev.driver; /* something unique to this device */ | 677 | void *data = p_dev; /* something unique to this device */ |
718 | 678 | ||
719 | for (try = 0; try < 64; try++) { | 679 | for (try = 0; try < 64; try++) { |
720 | irq = try % 32; | 680 | irq = try % 32; |
@@ -731,12 +691,12 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
731 | * registering a dummy handle works, i.e. if the IRQ isn't | 691 | * registering a dummy handle works, i.e. if the IRQ isn't |
732 | * marked as used by the kernel resource management core */ | 692 | * marked as used by the kernel resource management core */ |
733 | ret = request_irq(irq, | 693 | ret = request_irq(irq, |
734 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Handler : test_action, | 694 | (req->Handler) ? req->Handler : test_action, |
735 | type, | 695 | type, |
736 | p_dev->devname, | 696 | p_dev->devname, |
737 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data); | 697 | (req->Handler) ? p_dev->priv : data); |
738 | if (!ret) { | 698 | if (!ret) { |
739 | if (!(req->Attributes & IRQ_HANDLE_PRESENT)) | 699 | if (!req->Handler) |
740 | free_irq(irq, data); | 700 | free_irq(irq, data); |
741 | break; | 701 | break; |
742 | } | 702 | } |
@@ -745,17 +705,22 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
745 | #endif | 705 | #endif |
746 | /* only assign PCI irq if no IRQ already assigned */ | 706 | /* only assign PCI irq if no IRQ already assigned */ |
747 | if (ret && !s->irq.AssignedIRQ) { | 707 | if (ret && !s->irq.AssignedIRQ) { |
748 | if (!s->pci_irq) | 708 | if (!s->pci_irq) { |
709 | dev_printk(KERN_INFO, &s->dev, "no IRQ found\n"); | ||
749 | return ret; | 710 | return ret; |
711 | } | ||
750 | type = IRQF_SHARED; | 712 | type = IRQF_SHARED; |
751 | irq = s->pci_irq; | 713 | irq = s->pci_irq; |
752 | } | 714 | } |
753 | 715 | ||
754 | if (ret && (req->Attributes & IRQ_HANDLE_PRESENT)) { | 716 | if (ret && req->Handler) { |
755 | ret = request_irq(irq, req->Handler, type, | 717 | ret = request_irq(irq, req->Handler, type, |
756 | p_dev->devname, req->Instance); | 718 | p_dev->devname, p_dev->priv); |
757 | if (ret) | 719 | if (ret) { |
720 | dev_printk(KERN_INFO, &s->dev, | ||
721 | "request_irq() failed\n"); | ||
758 | return ret; | 722 | return ret; |
723 | } | ||
759 | } | 724 | } |
760 | 725 | ||
761 | /* Make sure the fact the request type was overridden is passed back */ | 726 | /* Make sure the fact the request type was overridden is passed back */ |
@@ -787,17 +752,19 @@ EXPORT_SYMBOL(pcmcia_request_irq); | |||
787 | * Request_window() establishes a mapping between card memory space | 752 | * Request_window() establishes a mapping between card memory space |
788 | * and system memory space. | 753 | * and system memory space. |
789 | */ | 754 | */ |
790 | int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_handle_t *wh) | 755 | int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req, window_handle_t *wh) |
791 | { | 756 | { |
792 | struct pcmcia_socket *s = (*p_dev)->socket; | 757 | struct pcmcia_socket *s = p_dev->socket; |
793 | window_t *win; | 758 | pccard_mem_map *win; |
794 | u_long align; | 759 | u_long align; |
795 | int w; | 760 | int w; |
796 | 761 | ||
797 | if (!(s->state & SOCKET_PRESENT)) | 762 | if (!(s->state & SOCKET_PRESENT)) { |
763 | dev_dbg(&s->dev, "No card present\n"); | ||
798 | return -ENODEV; | 764 | return -ENODEV; |
765 | } | ||
799 | if (req->Attributes & (WIN_PAGED | WIN_SHARED)) { | 766 | if (req->Attributes & (WIN_PAGED | WIN_SHARED)) { |
800 | ds_dbg(s, 0, "bad attribute setting for iomem region\n"); | 767 | dev_dbg(&s->dev, "bad attribute setting for iomem region\n"); |
801 | return -EINVAL; | 768 | return -EINVAL; |
802 | } | 769 | } |
803 | 770 | ||
@@ -808,12 +775,12 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h | |||
808 | (req->Attributes & WIN_STRICT_ALIGN)) ? | 775 | (req->Attributes & WIN_STRICT_ALIGN)) ? |
809 | req->Size : s->map_size); | 776 | req->Size : s->map_size); |
810 | if (req->Size & (s->map_size-1)) { | 777 | if (req->Size & (s->map_size-1)) { |
811 | ds_dbg(s, 0, "invalid map size\n"); | 778 | dev_dbg(&s->dev, "invalid map size\n"); |
812 | return -EINVAL; | 779 | return -EINVAL; |
813 | } | 780 | } |
814 | if ((req->Base && (s->features & SS_CAP_STATIC_MAP)) || | 781 | if ((req->Base && (s->features & SS_CAP_STATIC_MAP)) || |
815 | (req->Base & (align-1))) { | 782 | (req->Base & (align-1))) { |
816 | ds_dbg(s, 0, "invalid base address\n"); | 783 | dev_dbg(&s->dev, "invalid base address\n"); |
817 | return -EINVAL; | 784 | return -EINVAL; |
818 | } | 785 | } |
819 | if (req->Base) | 786 | if (req->Base) |
@@ -823,52 +790,48 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h | |||
823 | for (w = 0; w < MAX_WIN; w++) | 790 | for (w = 0; w < MAX_WIN; w++) |
824 | if (!(s->state & SOCKET_WIN_REQ(w))) break; | 791 | if (!(s->state & SOCKET_WIN_REQ(w))) break; |
825 | if (w == MAX_WIN) { | 792 | if (w == MAX_WIN) { |
826 | ds_dbg(s, 0, "all windows are used already\n"); | 793 | dev_dbg(&s->dev, "all windows are used already\n"); |
827 | return -EINVAL; | 794 | return -EINVAL; |
828 | } | 795 | } |
829 | 796 | ||
830 | win = &s->win[w]; | 797 | win = &s->win[w]; |
831 | win->magic = WINDOW_MAGIC; | ||
832 | win->index = w; | ||
833 | win->handle = *p_dev; | ||
834 | win->sock = s; | ||
835 | 798 | ||
836 | if (!(s->features & SS_CAP_STATIC_MAP)) { | 799 | if (!(s->features & SS_CAP_STATIC_MAP)) { |
837 | win->ctl.res = pcmcia_find_mem_region(req->Base, req->Size, align, | 800 | win->res = pcmcia_find_mem_region(req->Base, req->Size, align, |
838 | (req->Attributes & WIN_MAP_BELOW_1MB), s); | 801 | (req->Attributes & WIN_MAP_BELOW_1MB), s); |
839 | if (!win->ctl.res) { | 802 | if (!win->res) { |
840 | ds_dbg(s, 0, "allocating mem region failed\n"); | 803 | dev_dbg(&s->dev, "allocating mem region failed\n"); |
841 | return -EINVAL; | 804 | return -EINVAL; |
842 | } | 805 | } |
843 | } | 806 | } |
844 | (*p_dev)->_win |= CLIENT_WIN_REQ(w); | 807 | p_dev->_win |= CLIENT_WIN_REQ(w); |
845 | 808 | ||
846 | /* Configure the socket controller */ | 809 | /* Configure the socket controller */ |
847 | win->ctl.map = w+1; | 810 | win->map = w+1; |
848 | win->ctl.flags = 0; | 811 | win->flags = 0; |
849 | win->ctl.speed = req->AccessSpeed; | 812 | win->speed = req->AccessSpeed; |
850 | if (req->Attributes & WIN_MEMORY_TYPE) | 813 | if (req->Attributes & WIN_MEMORY_TYPE) |
851 | win->ctl.flags |= MAP_ATTRIB; | 814 | win->flags |= MAP_ATTRIB; |
852 | if (req->Attributes & WIN_ENABLE) | 815 | if (req->Attributes & WIN_ENABLE) |
853 | win->ctl.flags |= MAP_ACTIVE; | 816 | win->flags |= MAP_ACTIVE; |
854 | if (req->Attributes & WIN_DATA_WIDTH_16) | 817 | if (req->Attributes & WIN_DATA_WIDTH_16) |
855 | win->ctl.flags |= MAP_16BIT; | 818 | win->flags |= MAP_16BIT; |
856 | if (req->Attributes & WIN_USE_WAIT) | 819 | if (req->Attributes & WIN_USE_WAIT) |
857 | win->ctl.flags |= MAP_USE_WAIT; | 820 | win->flags |= MAP_USE_WAIT; |
858 | win->ctl.card_start = 0; | 821 | win->card_start = 0; |
859 | if (s->ops->set_mem_map(s, &win->ctl) != 0) { | 822 | if (s->ops->set_mem_map(s, win) != 0) { |
860 | ds_dbg(s, 0, "failed to set memory mapping\n"); | 823 | dev_dbg(&s->dev, "failed to set memory mapping\n"); |
861 | return -EIO; | 824 | return -EIO; |
862 | } | 825 | } |
863 | s->state |= SOCKET_WIN_REQ(w); | 826 | s->state |= SOCKET_WIN_REQ(w); |
864 | 827 | ||
865 | /* Return window handle */ | 828 | /* Return window handle */ |
866 | if (s->features & SS_CAP_STATIC_MAP) { | 829 | if (s->features & SS_CAP_STATIC_MAP) { |
867 | req->Base = win->ctl.static_start; | 830 | req->Base = win->static_start; |
868 | } else { | 831 | } else { |
869 | req->Base = win->ctl.res->start; | 832 | req->Base = win->res->start; |
870 | } | 833 | } |
871 | *wh = win; | 834 | *wh = w + 1; |
872 | 835 | ||
873 | return 0; | 836 | return 0; |
874 | } /* pcmcia_request_window */ | 837 | } /* pcmcia_request_window */ |
@@ -879,19 +842,46 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) { | |||
879 | pcmcia_release_io(p_dev, &p_dev->io); | 842 | pcmcia_release_io(p_dev, &p_dev->io); |
880 | pcmcia_release_irq(p_dev, &p_dev->irq); | 843 | pcmcia_release_irq(p_dev, &p_dev->irq); |
881 | if (p_dev->win) | 844 | if (p_dev->win) |
882 | pcmcia_release_window(p_dev->win); | 845 | pcmcia_release_window(p_dev, p_dev->win); |
883 | } | 846 | } |
884 | EXPORT_SYMBOL(pcmcia_disable_device); | 847 | EXPORT_SYMBOL(pcmcia_disable_device); |
885 | 848 | ||
886 | 849 | ||
887 | struct pcmcia_cfg_mem { | 850 | struct pcmcia_cfg_mem { |
888 | tuple_t tuple; | 851 | struct pcmcia_device *p_dev; |
852 | void *priv_data; | ||
853 | int (*conf_check) (struct pcmcia_device *p_dev, | ||
854 | cistpl_cftable_entry_t *cfg, | ||
855 | cistpl_cftable_entry_t *dflt, | ||
856 | unsigned int vcc, | ||
857 | void *priv_data); | ||
889 | cisparse_t parse; | 858 | cisparse_t parse; |
890 | u8 buf[256]; | ||
891 | cistpl_cftable_entry_t dflt; | 859 | cistpl_cftable_entry_t dflt; |
892 | }; | 860 | }; |
893 | 861 | ||
894 | /** | 862 | /** |
863 | * pcmcia_do_loop_config() - internal helper for pcmcia_loop_config() | ||
864 | * | ||
865 | * pcmcia_do_loop_config() is the internal callback for the call from | ||
866 | * pcmcia_loop_config() to pccard_loop_tuple(). Data is transferred | ||
867 | * by a struct pcmcia_cfg_mem. | ||
868 | */ | ||
869 | static int pcmcia_do_loop_config(tuple_t *tuple, cisparse_t *parse, void *priv) | ||
870 | { | ||
871 | cistpl_cftable_entry_t *cfg = &parse->cftable_entry; | ||
872 | struct pcmcia_cfg_mem *cfg_mem = priv; | ||
873 | |||
874 | /* default values */ | ||
875 | cfg_mem->p_dev->conf.ConfigIndex = cfg->index; | ||
876 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | ||
877 | cfg_mem->dflt = *cfg; | ||
878 | |||
879 | return cfg_mem->conf_check(cfg_mem->p_dev, cfg, &cfg_mem->dflt, | ||
880 | cfg_mem->p_dev->socket->socket.Vcc, | ||
881 | cfg_mem->priv_data); | ||
882 | } | ||
883 | |||
884 | /** | ||
895 | * pcmcia_loop_config() - loop over configuration options | 885 | * pcmcia_loop_config() - loop over configuration options |
896 | * @p_dev: the struct pcmcia_device which we need to loop for. | 886 | * @p_dev: the struct pcmcia_device which we need to loop for. |
897 | * @conf_check: function to call for each configuration option. | 887 | * @conf_check: function to call for each configuration option. |
@@ -913,48 +903,174 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev, | |||
913 | void *priv_data) | 903 | void *priv_data) |
914 | { | 904 | { |
915 | struct pcmcia_cfg_mem *cfg_mem; | 905 | struct pcmcia_cfg_mem *cfg_mem; |
916 | |||
917 | tuple_t *tuple; | ||
918 | int ret; | 906 | int ret; |
919 | unsigned int vcc; | ||
920 | 907 | ||
921 | cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL); | 908 | cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL); |
922 | if (cfg_mem == NULL) | 909 | if (cfg_mem == NULL) |
923 | return -ENOMEM; | 910 | return -ENOMEM; |
924 | 911 | ||
925 | /* get the current Vcc setting */ | 912 | cfg_mem->p_dev = p_dev; |
926 | vcc = p_dev->socket->socket.Vcc; | 913 | cfg_mem->conf_check = conf_check; |
914 | cfg_mem->priv_data = priv_data; | ||
927 | 915 | ||
928 | tuple = &cfg_mem->tuple; | 916 | ret = pccard_loop_tuple(p_dev->socket, p_dev->func, |
929 | tuple->TupleData = cfg_mem->buf; | 917 | CISTPL_CFTABLE_ENTRY, &cfg_mem->parse, |
930 | tuple->TupleDataMax = 255; | 918 | cfg_mem, pcmcia_do_loop_config); |
931 | tuple->TupleOffset = 0; | ||
932 | tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
933 | tuple->Attributes = 0; | ||
934 | 919 | ||
935 | ret = pcmcia_get_first_tuple(p_dev, tuple); | 920 | kfree(cfg_mem); |
936 | while (!ret) { | 921 | return ret; |
937 | cistpl_cftable_entry_t *cfg = &cfg_mem->parse.cftable_entry; | 922 | } |
923 | EXPORT_SYMBOL(pcmcia_loop_config); | ||
924 | |||
925 | |||
926 | struct pcmcia_loop_mem { | ||
927 | struct pcmcia_device *p_dev; | ||
928 | void *priv_data; | ||
929 | int (*loop_tuple) (struct pcmcia_device *p_dev, | ||
930 | tuple_t *tuple, | ||
931 | void *priv_data); | ||
932 | }; | ||
933 | |||
934 | /** | ||
935 | * pcmcia_do_loop_tuple() - internal helper for pcmcia_loop_config() | ||
936 | * | ||
937 | * pcmcia_do_loop_tuple() is the internal callback for the call from | ||
938 | * pcmcia_loop_tuple() to pccard_loop_tuple(). Data is transferred | ||
939 | * by a struct pcmcia_cfg_mem. | ||
940 | */ | ||
941 | static int pcmcia_do_loop_tuple(tuple_t *tuple, cisparse_t *parse, void *priv) | ||
942 | { | ||
943 | struct pcmcia_loop_mem *loop = priv; | ||
944 | |||
945 | return loop->loop_tuple(loop->p_dev, tuple, loop->priv_data); | ||
946 | }; | ||
947 | |||
948 | /** | ||
949 | * pcmcia_loop_tuple() - loop over tuples in the CIS | ||
950 | * @p_dev: the struct pcmcia_device which we need to loop for. | ||
951 | * @code: which CIS code shall we look for? | ||
952 | * @priv_data: private data to be passed to the loop_tuple function. | ||
953 | * @loop_tuple: function to call for each CIS entry of type @function. IT | ||
954 | * gets passed the raw tuple and @priv_data. | ||
955 | * | ||
956 | * pcmcia_loop_tuple() loops over all CIS entries of type @function, and | ||
957 | * calls the @loop_tuple function for each entry. If the call to @loop_tuple | ||
958 | * returns 0, the loop exits. Returns 0 on success or errorcode otherwise. | ||
959 | */ | ||
960 | int pcmcia_loop_tuple(struct pcmcia_device *p_dev, cisdata_t code, | ||
961 | int (*loop_tuple) (struct pcmcia_device *p_dev, | ||
962 | tuple_t *tuple, | ||
963 | void *priv_data), | ||
964 | void *priv_data) | ||
965 | { | ||
966 | struct pcmcia_loop_mem loop = { | ||
967 | .p_dev = p_dev, | ||
968 | .loop_tuple = loop_tuple, | ||
969 | .priv_data = priv_data}; | ||
938 | 970 | ||
939 | if (pcmcia_get_tuple_data(p_dev, tuple)) | 971 | return pccard_loop_tuple(p_dev->socket, p_dev->func, code, NULL, |
940 | goto next_entry; | 972 | &loop, pcmcia_do_loop_tuple); |
973 | }; | ||
974 | EXPORT_SYMBOL(pcmcia_loop_tuple); | ||
941 | 975 | ||
942 | if (pcmcia_parse_tuple(tuple, &cfg_mem->parse)) | ||
943 | goto next_entry; | ||
944 | 976 | ||
945 | /* default values */ | 977 | struct pcmcia_loop_get { |
946 | p_dev->conf.ConfigIndex = cfg->index; | 978 | size_t len; |
947 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | 979 | cisdata_t **buf; |
948 | cfg_mem->dflt = *cfg; | 980 | }; |
949 | 981 | ||
950 | ret = conf_check(p_dev, cfg, &cfg_mem->dflt, vcc, priv_data); | 982 | /** |
951 | if (!ret) | 983 | * pcmcia_do_get_tuple() - internal helper for pcmcia_get_tuple() |
952 | break; | 984 | * |
985 | * pcmcia_do_get_tuple() is the internal callback for the call from | ||
986 | * pcmcia_get_tuple() to pcmcia_loop_tuple(). As we're only interested in | ||
987 | * the first tuple, return 0 unconditionally. Create a memory buffer large | ||
988 | * enough to hold the content of the tuple, and fill it with the tuple data. | ||
989 | * The caller is responsible to free the buffer. | ||
990 | */ | ||
991 | static int pcmcia_do_get_tuple(struct pcmcia_device *p_dev, tuple_t *tuple, | ||
992 | void *priv) | ||
993 | { | ||
994 | struct pcmcia_loop_get *get = priv; | ||
995 | |||
996 | *get->buf = kzalloc(tuple->TupleDataLen, GFP_KERNEL); | ||
997 | if (*get->buf) { | ||
998 | get->len = tuple->TupleDataLen; | ||
999 | memcpy(*get->buf, tuple->TupleData, tuple->TupleDataLen); | ||
1000 | } else | ||
1001 | dev_dbg(&p_dev->dev, "do_get_tuple: out of memory\n"); | ||
1002 | return 0; | ||
1003 | }; | ||
953 | 1004 | ||
954 | next_entry: | 1005 | /** |
955 | ret = pcmcia_get_next_tuple(p_dev, tuple); | 1006 | * pcmcia_get_tuple() - get first tuple from CIS |
1007 | * @p_dev: the struct pcmcia_device which we need to loop for. | ||
1008 | * @code: which CIS code shall we look for? | ||
1009 | * @buf: pointer to store the buffer to. | ||
1010 | * | ||
1011 | * pcmcia_get_tuple() gets the content of the first CIS entry of type @code. | ||
1012 | * It returns the buffer length (or zero). The caller is responsible to free | ||
1013 | * the buffer passed in @buf. | ||
1014 | */ | ||
1015 | size_t pcmcia_get_tuple(struct pcmcia_device *p_dev, cisdata_t code, | ||
1016 | unsigned char **buf) | ||
1017 | { | ||
1018 | struct pcmcia_loop_get get = { | ||
1019 | .len = 0, | ||
1020 | .buf = buf, | ||
1021 | }; | ||
1022 | |||
1023 | *get.buf = NULL; | ||
1024 | pcmcia_loop_tuple(p_dev, code, pcmcia_do_get_tuple, &get); | ||
1025 | |||
1026 | return get.len; | ||
1027 | }; | ||
1028 | EXPORT_SYMBOL(pcmcia_get_tuple); | ||
1029 | |||
1030 | |||
1031 | /** | ||
1032 | * pcmcia_do_get_mac() - internal helper for pcmcia_get_mac_from_cis() | ||
1033 | * | ||
1034 | * pcmcia_do_get_mac() is the internal callback for the call from | ||
1035 | * pcmcia_get_mac_from_cis() to pcmcia_loop_tuple(). We check whether the | ||
1036 | * tuple contains a proper LAN_NODE_ID of length 6, and copy the data | ||
1037 | * to struct net_device->dev_addr[i]. | ||
1038 | */ | ||
1039 | static int pcmcia_do_get_mac(struct pcmcia_device *p_dev, tuple_t *tuple, | ||
1040 | void *priv) | ||
1041 | { | ||
1042 | struct net_device *dev = priv; | ||
1043 | int i; | ||
1044 | |||
1045 | if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID) | ||
1046 | return -EINVAL; | ||
1047 | if (tuple->TupleDataLen < ETH_ALEN + 2) { | ||
1048 | dev_warn(&p_dev->dev, "Invalid CIS tuple length for " | ||
1049 | "LAN_NODE_ID\n"); | ||
1050 | return -EINVAL; | ||
956 | } | 1051 | } |
957 | 1052 | ||
958 | return ret; | 1053 | if (tuple->TupleData[1] != ETH_ALEN) { |
959 | } | 1054 | dev_warn(&p_dev->dev, "Invalid header for LAN_NODE_ID\n"); |
960 | EXPORT_SYMBOL(pcmcia_loop_config); | 1055 | return -EINVAL; |
1056 | } | ||
1057 | for (i = 0; i < 6; i++) | ||
1058 | dev->dev_addr[i] = tuple->TupleData[i+2]; | ||
1059 | return 0; | ||
1060 | }; | ||
1061 | |||
1062 | /** | ||
1063 | * pcmcia_get_mac_from_cis() - read out MAC address from CISTPL_FUNCE | ||
1064 | * @p_dev: the struct pcmcia_device for which we want the address. | ||
1065 | * @dev: a properly prepared struct net_device to store the info to. | ||
1066 | * | ||
1067 | * pcmcia_get_mac_from_cis() reads out the hardware MAC address from | ||
1068 | * CISTPL_FUNCE and stores it into struct net_device *dev->dev_addr which | ||
1069 | * must be set up properly by the driver (see examples!). | ||
1070 | */ | ||
1071 | int pcmcia_get_mac_from_cis(struct pcmcia_device *p_dev, struct net_device *dev) | ||
1072 | { | ||
1073 | return pcmcia_loop_tuple(p_dev, CISTPL_FUNCE, pcmcia_do_get_mac, dev); | ||
1074 | }; | ||
1075 | EXPORT_SYMBOL(pcmcia_get_mac_from_cis); | ||
1076 | |||
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 70a33468bcd0..e1741cd875aa 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
@@ -213,7 +213,8 @@ static irqreturn_t pd6729_interrupt(int irq, void *dev) | |||
213 | 213 | ||
214 | if (csc & I365_CSC_DETECT) { | 214 | if (csc & I365_CSC_DETECT) { |
215 | events |= SS_DETECT; | 215 | events |= SS_DETECT; |
216 | dprintk("Card detected in socket %i!\n", i); | 216 | dev_vdbg(&socket[i].socket.dev, |
217 | "Card detected in socket %i!\n", i); | ||
217 | } | 218 | } |
218 | 219 | ||
219 | if (indirect_read(&socket[i], I365_INTCTL) | 220 | if (indirect_read(&socket[i], I365_INTCTL) |
@@ -331,11 +332,11 @@ static int pd6729_set_socket(struct pcmcia_socket *sock, socket_state_t *state) | |||
331 | reg = I365_PWR_NORESET; /* default: disable resetdrv on resume */ | 332 | reg = I365_PWR_NORESET; /* default: disable resetdrv on resume */ |
332 | 333 | ||
333 | if (state->flags & SS_PWR_AUTO) { | 334 | if (state->flags & SS_PWR_AUTO) { |
334 | dprintk("Auto power\n"); | 335 | dev_dbg(&sock->dev, "Auto power\n"); |
335 | reg |= I365_PWR_AUTO; /* automatic power mngmnt */ | 336 | reg |= I365_PWR_AUTO; /* automatic power mngmnt */ |
336 | } | 337 | } |
337 | if (state->flags & SS_OUTPUT_ENA) { | 338 | if (state->flags & SS_OUTPUT_ENA) { |
338 | dprintk("Power Enabled\n"); | 339 | dev_dbg(&sock->dev, "Power Enabled\n"); |
339 | reg |= I365_PWR_OUT; /* enable power */ | 340 | reg |= I365_PWR_OUT; /* enable power */ |
340 | } | 341 | } |
341 | 342 | ||
@@ -343,40 +344,44 @@ static int pd6729_set_socket(struct pcmcia_socket *sock, socket_state_t *state) | |||
343 | case 0: | 344 | case 0: |
344 | break; | 345 | break; |
345 | case 33: | 346 | case 33: |
346 | dprintk("setting voltage to Vcc to 3.3V on socket %i\n", | 347 | dev_dbg(&sock->dev, |
348 | "setting voltage to Vcc to 3.3V on socket %i\n", | ||
347 | socket->number); | 349 | socket->number); |
348 | reg |= I365_VCC_5V; | 350 | reg |= I365_VCC_5V; |
349 | indirect_setbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V); | 351 | indirect_setbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V); |
350 | break; | 352 | break; |
351 | case 50: | 353 | case 50: |
352 | dprintk("setting voltage to Vcc to 5V on socket %i\n", | 354 | dev_dbg(&sock->dev, |
355 | "setting voltage to Vcc to 5V on socket %i\n", | ||
353 | socket->number); | 356 | socket->number); |
354 | reg |= I365_VCC_5V; | 357 | reg |= I365_VCC_5V; |
355 | indirect_resetbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V); | 358 | indirect_resetbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V); |
356 | break; | 359 | break; |
357 | default: | 360 | default: |
358 | dprintk("pd6729: pd6729_set_socket called with " | 361 | dev_dbg(&sock->dev, |
359 | "invalid VCC power value: %i\n", | 362 | "pd6729_set_socket called with invalid VCC power " |
360 | state->Vcc); | 363 | "value: %i\n", state->Vcc); |
361 | return -EINVAL; | 364 | return -EINVAL; |
362 | } | 365 | } |
363 | 366 | ||
364 | switch (state->Vpp) { | 367 | switch (state->Vpp) { |
365 | case 0: | 368 | case 0: |
366 | dprintk("not setting Vpp on socket %i\n", socket->number); | 369 | dev_dbg(&sock->dev, "not setting Vpp on socket %i\n", |
370 | socket->number); | ||
367 | break; | 371 | break; |
368 | case 33: | 372 | case 33: |
369 | case 50: | 373 | case 50: |
370 | dprintk("setting Vpp to Vcc for socket %i\n", socket->number); | 374 | dev_dbg(&sock->dev, "setting Vpp to Vcc for socket %i\n", |
375 | socket->number); | ||
371 | reg |= I365_VPP1_5V; | 376 | reg |= I365_VPP1_5V; |
372 | break; | 377 | break; |
373 | case 120: | 378 | case 120: |
374 | dprintk("setting Vpp to 12.0\n"); | 379 | dev_dbg(&sock->dev, "setting Vpp to 12.0\n"); |
375 | reg |= I365_VPP1_12V; | 380 | reg |= I365_VPP1_12V; |
376 | break; | 381 | break; |
377 | default: | 382 | default: |
378 | dprintk("pd6729: pd6729_set_socket called with invalid VPP power value: %i\n", | 383 | dev_dbg(&sock->dev, "pd6729: pd6729_set_socket called with " |
379 | state->Vpp); | 384 | "invalid VPP power value: %i\n", state->Vpp); |
380 | return -EINVAL; | 385 | return -EINVAL; |
381 | } | 386 | } |
382 | 387 | ||
@@ -438,7 +443,7 @@ static int pd6729_set_io_map(struct pcmcia_socket *sock, | |||
438 | 443 | ||
439 | /* Check error conditions */ | 444 | /* Check error conditions */ |
440 | if (map > 1) { | 445 | if (map > 1) { |
441 | dprintk("pd6729_set_io_map with invalid map"); | 446 | dev_dbg(&sock->dev, "pd6729_set_io_map with invalid map\n"); |
442 | return -EINVAL; | 447 | return -EINVAL; |
443 | } | 448 | } |
444 | 449 | ||
@@ -446,7 +451,7 @@ static int pd6729_set_io_map(struct pcmcia_socket *sock, | |||
446 | if (indirect_read(socket, I365_ADDRWIN) & I365_ENA_IO(map)) | 451 | if (indirect_read(socket, I365_ADDRWIN) & I365_ENA_IO(map)) |
447 | indirect_resetbit(socket, I365_ADDRWIN, I365_ENA_IO(map)); | 452 | indirect_resetbit(socket, I365_ADDRWIN, I365_ENA_IO(map)); |
448 | 453 | ||
449 | /* dprintk("set_io_map: Setting range to %x - %x\n", | 454 | /* dev_dbg(&sock->dev, "set_io_map: Setting range to %x - %x\n", |
450 | io->start, io->stop);*/ | 455 | io->start, io->stop);*/ |
451 | 456 | ||
452 | /* write the new values */ | 457 | /* write the new values */ |
@@ -478,12 +483,12 @@ static int pd6729_set_mem_map(struct pcmcia_socket *sock, | |||
478 | 483 | ||
479 | map = mem->map; | 484 | map = mem->map; |
480 | if (map > 4) { | 485 | if (map > 4) { |
481 | printk("pd6729_set_mem_map: invalid map"); | 486 | dev_warn(&sock->dev, "invalid map requested\n"); |
482 | return -EINVAL; | 487 | return -EINVAL; |
483 | } | 488 | } |
484 | 489 | ||
485 | if ((mem->res->start > mem->res->end) || (mem->speed > 1000)) { | 490 | if ((mem->res->start > mem->res->end) || (mem->speed > 1000)) { |
486 | printk("pd6729_set_mem_map: invalid address / speed"); | 491 | dev_warn(&sock->dev, "invalid invalid address / speed\n"); |
487 | return -EINVAL; | 492 | return -EINVAL; |
488 | } | 493 | } |
489 | 494 | ||
@@ -529,12 +534,12 @@ static int pd6729_set_mem_map(struct pcmcia_socket *sock, | |||
529 | if (mem->flags & MAP_WRPROT) | 534 | if (mem->flags & MAP_WRPROT) |
530 | i |= I365_MEM_WRPROT; | 535 | i |= I365_MEM_WRPROT; |
531 | if (mem->flags & MAP_ATTRIB) { | 536 | if (mem->flags & MAP_ATTRIB) { |
532 | /* dprintk("requesting attribute memory for socket %i\n", | 537 | /* dev_dbg(&sock->dev, "requesting attribute memory for " |
533 | socket->number);*/ | 538 | "socket %i\n", socket->number);*/ |
534 | i |= I365_MEM_REG; | 539 | i |= I365_MEM_REG; |
535 | } else { | 540 | } else { |
536 | /* dprintk("requesting normal memory for socket %i\n", | 541 | /* dev_dbg(&sock->dev, "requesting normal memory for " |
537 | socket->number);*/ | 542 | "socket %i\n", socket->number);*/ |
538 | } | 543 | } |
539 | indirect_write16(socket, base + I365_W_OFF, i); | 544 | indirect_write16(socket, base + I365_W_OFF, i); |
540 | 545 | ||
@@ -577,7 +582,7 @@ static struct pccard_operations pd6729_operations = { | |||
577 | 582 | ||
578 | static irqreturn_t pd6729_test(int irq, void *dev) | 583 | static irqreturn_t pd6729_test(int irq, void *dev) |
579 | { | 584 | { |
580 | dprintk("-> hit on irq %d\n", irq); | 585 | pr_devel("-> hit on irq %d\n", irq); |
581 | return IRQ_HANDLED; | 586 | return IRQ_HANDLED; |
582 | } | 587 | } |
583 | 588 | ||
@@ -642,13 +647,13 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, | |||
642 | goto err_out_free_mem; | 647 | goto err_out_free_mem; |
643 | 648 | ||
644 | if (!pci_resource_start(dev, 0)) { | 649 | if (!pci_resource_start(dev, 0)) { |
645 | printk(KERN_INFO "pd6729: refusing to load the driver " | 650 | dev_warn(&dev->dev, "refusing to load the driver as the " |
646 | "as the io_base is 0.\n"); | 651 | "io_base is NULL.\n"); |
647 | goto err_out_free_mem; | 652 | goto err_out_free_mem; |
648 | } | 653 | } |
649 | 654 | ||
650 | printk(KERN_INFO "pd6729: Cirrus PD6729 PCI to PCMCIA Bridge " | 655 | dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx " |
651 | "at 0x%llx on irq %d\n", | 656 | "on irq %d\n", |
652 | (unsigned long long)pci_resource_start(dev, 0), dev->irq); | 657 | (unsigned long long)pci_resource_start(dev, 0), dev->irq); |
653 | /* | 658 | /* |
654 | * Since we have no memory BARs some firmware may not | 659 | * Since we have no memory BARs some firmware may not |
@@ -656,14 +661,14 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, | |||
656 | */ | 661 | */ |
657 | pci_read_config_byte(dev, PCI_COMMAND, &configbyte); | 662 | pci_read_config_byte(dev, PCI_COMMAND, &configbyte); |
658 | if (!(configbyte & PCI_COMMAND_MEMORY)) { | 663 | if (!(configbyte & PCI_COMMAND_MEMORY)) { |
659 | printk(KERN_DEBUG "pd6729: Enabling PCI_COMMAND_MEMORY.\n"); | 664 | dev_dbg(&dev->dev, "pd6729: Enabling PCI_COMMAND_MEMORY.\n"); |
660 | configbyte |= PCI_COMMAND_MEMORY; | 665 | configbyte |= PCI_COMMAND_MEMORY; |
661 | pci_write_config_byte(dev, PCI_COMMAND, configbyte); | 666 | pci_write_config_byte(dev, PCI_COMMAND, configbyte); |
662 | } | 667 | } |
663 | 668 | ||
664 | ret = pci_request_regions(dev, "pd6729"); | 669 | ret = pci_request_regions(dev, "pd6729"); |
665 | if (ret) { | 670 | if (ret) { |
666 | printk(KERN_INFO "pd6729: pci request region failed.\n"); | 671 | dev_warn(&dev->dev, "pci request region failed.\n"); |
667 | goto err_out_disable; | 672 | goto err_out_disable; |
668 | } | 673 | } |
669 | 674 | ||
@@ -672,7 +677,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, | |||
672 | 677 | ||
673 | mask = pd6729_isa_scan(); | 678 | mask = pd6729_isa_scan(); |
674 | if (irq_mode == 0 && mask == 0) { | 679 | if (irq_mode == 0 && mask == 0) { |
675 | printk(KERN_INFO "pd6729: no ISA interrupt is available.\n"); | 680 | dev_warn(&dev->dev, "no ISA interrupt is available.\n"); |
676 | goto err_out_free_res; | 681 | goto err_out_free_res; |
677 | } | 682 | } |
678 | 683 | ||
@@ -697,8 +702,8 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, | |||
697 | /* Register the interrupt handler */ | 702 | /* Register the interrupt handler */ |
698 | if ((ret = request_irq(dev->irq, pd6729_interrupt, IRQF_SHARED, | 703 | if ((ret = request_irq(dev->irq, pd6729_interrupt, IRQF_SHARED, |
699 | "pd6729", socket))) { | 704 | "pd6729", socket))) { |
700 | printk(KERN_ERR "pd6729: Failed to register irq %d, " | 705 | dev_err(&dev->dev, "Failed to register irq %d\n", |
701 | "aborting\n", dev->irq); | 706 | dev->irq); |
702 | goto err_out_free_res; | 707 | goto err_out_free_res; |
703 | } | 708 | } |
704 | } else { | 709 | } else { |
@@ -713,8 +718,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, | |||
713 | for (i = 0; i < MAX_SOCKETS; i++) { | 718 | for (i = 0; i < MAX_SOCKETS; i++) { |
714 | ret = pcmcia_register_socket(&socket[i].socket); | 719 | ret = pcmcia_register_socket(&socket[i].socket); |
715 | if (ret) { | 720 | if (ret) { |
716 | printk(KERN_INFO "pd6729: pcmcia_register_socket " | 721 | dev_warn(&dev->dev, "pcmcia_register_socket failed.\n"); |
717 | "failed.\n"); | ||
718 | for (j = 0; j < i ; j++) | 722 | for (j = 0; j < i ; j++) |
719 | pcmcia_unregister_socket(&socket[j].socket); | 723 | pcmcia_unregister_socket(&socket[j].socket); |
720 | goto err_out_free_res2; | 724 | goto err_out_free_res2; |
diff --git a/drivers/pcmcia/pd6729.h b/drivers/pcmcia/pd6729.h index f392e458cdfd..41418d394c55 100644 --- a/drivers/pcmcia/pd6729.h +++ b/drivers/pcmcia/pd6729.h | |||
@@ -1,13 +1,6 @@ | |||
1 | #ifndef _INCLUDE_GUARD_PD6729_H_ | 1 | #ifndef _INCLUDE_GUARD_PD6729_H_ |
2 | #define _INCLUDE_GUARD_PD6729_H_ | 2 | #define _INCLUDE_GUARD_PD6729_H_ |
3 | 3 | ||
4 | /* Debuging defines */ | ||
5 | #ifdef NOTRACE | ||
6 | #define dprintk(fmt, args...) printk(fmt , ## args) | ||
7 | #else | ||
8 | #define dprintk(fmt, args...) do {} while (0) | ||
9 | #endif | ||
10 | |||
11 | /* Flags for I365_GENCTL */ | 4 | /* Flags for I365_GENCTL */ |
12 | #define I365_DF_VS1 0x40 /* DF-step Voltage Sense */ | 5 | #define I365_DF_VS1 0x40 /* DF-step Voltage Sense */ |
13 | #define I365_DF_VS2 0x80 | 6 | #define I365_DF_VS2 0x80 |
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 0e35acb1366b..84dde7768ad5 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
@@ -228,9 +228,43 @@ static const char *skt_names[] = { | |||
228 | #define SKT_DEV_INFO_SIZE(n) \ | 228 | #define SKT_DEV_INFO_SIZE(n) \ |
229 | (sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket)) | 229 | (sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket)) |
230 | 230 | ||
231 | int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt) | ||
232 | { | ||
233 | skt->res_skt.start = _PCMCIA(skt->nr); | ||
234 | skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1; | ||
235 | skt->res_skt.name = skt_names[skt->nr]; | ||
236 | skt->res_skt.flags = IORESOURCE_MEM; | ||
237 | |||
238 | skt->res_io.start = _PCMCIAIO(skt->nr); | ||
239 | skt->res_io.end = _PCMCIAIO(skt->nr) + PCMCIAIOSp - 1; | ||
240 | skt->res_io.name = "io"; | ||
241 | skt->res_io.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
242 | |||
243 | skt->res_mem.start = _PCMCIAMem(skt->nr); | ||
244 | skt->res_mem.end = _PCMCIAMem(skt->nr) + PCMCIAMemSp - 1; | ||
245 | skt->res_mem.name = "memory"; | ||
246 | skt->res_mem.flags = IORESOURCE_MEM; | ||
247 | |||
248 | skt->res_attr.start = _PCMCIAAttr(skt->nr); | ||
249 | skt->res_attr.end = _PCMCIAAttr(skt->nr) + PCMCIAAttrSp - 1; | ||
250 | skt->res_attr.name = "attribute"; | ||
251 | skt->res_attr.flags = IORESOURCE_MEM; | ||
252 | |||
253 | return soc_pcmcia_add_one(skt); | ||
254 | } | ||
255 | |||
256 | void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops) | ||
257 | { | ||
258 | /* Provide our PXA2xx specific timing routines. */ | ||
259 | ops->set_timing = pxa2xx_pcmcia_set_timing; | ||
260 | #ifdef CONFIG_CPU_FREQ | ||
261 | ops->frequency_change = pxa2xx_pcmcia_frequency_change; | ||
262 | #endif | ||
263 | } | ||
264 | |||
231 | int __pxa2xx_drv_pcmcia_probe(struct device *dev) | 265 | int __pxa2xx_drv_pcmcia_probe(struct device *dev) |
232 | { | 266 | { |
233 | int i, ret; | 267 | int i, ret = 0; |
234 | struct pcmcia_low_level *ops; | 268 | struct pcmcia_low_level *ops; |
235 | struct skt_dev_info *sinfo; | 269 | struct skt_dev_info *sinfo; |
236 | struct soc_pcmcia_socket *skt; | 270 | struct soc_pcmcia_socket *skt; |
@@ -240,6 +274,8 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) | |||
240 | 274 | ||
241 | ops = (struct pcmcia_low_level *)dev->platform_data; | 275 | ops = (struct pcmcia_low_level *)dev->platform_data; |
242 | 276 | ||
277 | pxa2xx_drv_pcmcia_ops(ops); | ||
278 | |||
243 | sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL); | 279 | sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL); |
244 | if (!sinfo) | 280 | if (!sinfo) |
245 | return -ENOMEM; | 281 | return -ENOMEM; |
@@ -250,40 +286,25 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) | |||
250 | for (i = 0; i < ops->nr; i++) { | 286 | for (i = 0; i < ops->nr; i++) { |
251 | skt = &sinfo->skt[i]; | 287 | skt = &sinfo->skt[i]; |
252 | 288 | ||
253 | skt->nr = ops->first + i; | 289 | skt->nr = ops->first + i; |
254 | skt->irq = NO_IRQ; | 290 | skt->ops = ops; |
255 | 291 | skt->socket.owner = ops->owner; | |
256 | skt->res_skt.start = _PCMCIA(skt->nr); | 292 | skt->socket.dev.parent = dev; |
257 | skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1; | 293 | skt->socket.pci_irq = NO_IRQ; |
258 | skt->res_skt.name = skt_names[skt->nr]; | ||
259 | skt->res_skt.flags = IORESOURCE_MEM; | ||
260 | |||
261 | skt->res_io.start = _PCMCIAIO(skt->nr); | ||
262 | skt->res_io.end = _PCMCIAIO(skt->nr) + PCMCIAIOSp - 1; | ||
263 | skt->res_io.name = "io"; | ||
264 | skt->res_io.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
265 | 294 | ||
266 | skt->res_mem.start = _PCMCIAMem(skt->nr); | 295 | ret = pxa2xx_drv_pcmcia_add_one(skt); |
267 | skt->res_mem.end = _PCMCIAMem(skt->nr) + PCMCIAMemSp - 1; | 296 | if (ret) |
268 | skt->res_mem.name = "memory"; | 297 | break; |
269 | skt->res_mem.flags = IORESOURCE_MEM; | ||
270 | |||
271 | skt->res_attr.start = _PCMCIAAttr(skt->nr); | ||
272 | skt->res_attr.end = _PCMCIAAttr(skt->nr) + PCMCIAAttrSp - 1; | ||
273 | skt->res_attr.name = "attribute"; | ||
274 | skt->res_attr.flags = IORESOURCE_MEM; | ||
275 | } | 298 | } |
276 | 299 | ||
277 | /* Provide our PXA2xx specific timing routines. */ | 300 | if (ret) { |
278 | ops->set_timing = pxa2xx_pcmcia_set_timing; | 301 | while (--i >= 0) |
279 | #ifdef CONFIG_CPU_FREQ | 302 | soc_pcmcia_remove_one(&sinfo->skt[i]); |
280 | ops->frequency_change = pxa2xx_pcmcia_frequency_change; | 303 | kfree(sinfo); |
281 | #endif | 304 | } else { |
282 | |||
283 | ret = soc_common_drv_pcmcia_probe(dev, ops, sinfo); | ||
284 | |||
285 | if (!ret) | ||
286 | pxa2xx_configure_sockets(dev); | 305 | pxa2xx_configure_sockets(dev); |
306 | dev_set_drvdata(dev, sinfo); | ||
307 | } | ||
287 | 308 | ||
288 | return ret; | 309 | return ret; |
289 | } | 310 | } |
@@ -297,7 +318,16 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) | |||
297 | 318 | ||
298 | static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev) | 319 | static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev) |
299 | { | 320 | { |
300 | return soc_common_drv_pcmcia_remove(&dev->dev); | 321 | struct skt_dev_info *sinfo = platform_get_drvdata(dev); |
322 | int i; | ||
323 | |||
324 | platform_set_drvdata(dev, NULL); | ||
325 | |||
326 | for (i = 0; i < sinfo->nskt; i++) | ||
327 | soc_pcmcia_remove_one(&sinfo->skt[i]); | ||
328 | |||
329 | kfree(sinfo); | ||
330 | return 0; | ||
301 | } | 331 | } |
302 | 332 | ||
303 | static int pxa2xx_drv_pcmcia_suspend(struct device *dev) | 333 | static int pxa2xx_drv_pcmcia_suspend(struct device *dev) |
diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h index 235d681652c3..cb5efaec886f 100644 --- a/drivers/pcmcia/pxa2xx_base.h +++ b/drivers/pcmcia/pxa2xx_base.h | |||
@@ -1,3 +1,6 @@ | |||
1 | /* temporary measure */ | 1 | /* temporary measure */ |
2 | extern int __pxa2xx_drv_pcmcia_probe(struct device *); | 2 | extern int __pxa2xx_drv_pcmcia_probe(struct device *); |
3 | 3 | ||
4 | int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt); | ||
5 | void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops); | ||
6 | |||
diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c index 5143a760153b..05913d0bbdbe 100644 --- a/drivers/pcmcia/pxa2xx_cm_x255.c +++ b/drivers/pcmcia/pxa2xx_cm_x255.c | |||
@@ -44,7 +44,7 @@ static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
44 | return ret; | 44 | return ret; |
45 | gpio_direction_output(GPIO_PCMCIA_RESET, 0); | 45 | gpio_direction_output(GPIO_PCMCIA_RESET, 0); |
46 | 46 | ||
47 | skt->irq = skt->nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT; | 47 | skt->socket.pci_irq = skt->nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT; |
48 | ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 48 | ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
49 | if (!ret) | 49 | if (!ret) |
50 | gpio_free(GPIO_PCMCIA_RESET); | 50 | gpio_free(GPIO_PCMCIA_RESET); |
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c index a7b943d01e34..5662646b84da 100644 --- a/drivers/pcmcia/pxa2xx_cm_x270.c +++ b/drivers/pcmcia/pxa2xx_cm_x270.c | |||
@@ -38,7 +38,7 @@ static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
38 | return ret; | 38 | return ret; |
39 | gpio_direction_output(GPIO_PCMCIA_RESET, 0); | 39 | gpio_direction_output(GPIO_PCMCIA_RESET, 0); |
40 | 40 | ||
41 | skt->irq = PCMCIA_S0_RDYINT; | 41 | skt->socket.pci_irq = PCMCIA_S0_RDYINT; |
42 | ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 42 | ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
43 | if (!ret) | 43 | if (!ret) |
44 | gpio_free(GPIO_PCMCIA_RESET); | 44 | gpio_free(GPIO_PCMCIA_RESET); |
diff --git a/drivers/pcmcia/pxa2xx_e740.c b/drivers/pcmcia/pxa2xx_e740.c index d09c0dc4a31a..8bfbd4dca131 100644 --- a/drivers/pcmcia/pxa2xx_e740.c +++ b/drivers/pcmcia/pxa2xx_e740.c | |||
@@ -38,7 +38,7 @@ static struct pcmcia_irqs cd_irqs[] = { | |||
38 | 38 | ||
39 | static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | 39 | static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt) |
40 | { | 40 | { |
41 | skt->irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) : | 41 | skt->socket.pci_irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) : |
42 | IRQ_GPIO(GPIO_E740_PCMCIA_RDY1); | 42 | IRQ_GPIO(GPIO_E740_PCMCIA_RDY1); |
43 | 43 | ||
44 | return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1); | 44 | return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1); |
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c index 6cbb1b1f7cfd..b9f8c8fb42bd 100644 --- a/drivers/pcmcia/pxa2xx_lubbock.c +++ b/drivers/pcmcia/pxa2xx_lubbock.c | |||
@@ -32,6 +32,7 @@ static int | |||
32 | lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, | 32 | lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, |
33 | const socket_state_t *state) | 33 | const socket_state_t *state) |
34 | { | 34 | { |
35 | struct sa1111_pcmcia_socket *s = to_skt(skt); | ||
35 | unsigned int pa_dwr_mask, pa_dwr_set, misc_mask, misc_set; | 36 | unsigned int pa_dwr_mask, pa_dwr_set, misc_mask, misc_set; |
36 | int ret = 0; | 37 | int ret = 0; |
37 | 38 | ||
@@ -149,7 +150,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, | |||
149 | 150 | ||
150 | if (ret == 0) { | 151 | if (ret == 0) { |
151 | lubbock_set_misc_wr(misc_mask, misc_set); | 152 | lubbock_set_misc_wr(misc_mask, misc_set); |
152 | sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set); | 153 | sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set); |
153 | } | 154 | } |
154 | 155 | ||
155 | #if 1 | 156 | #if 1 |
@@ -175,7 +176,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, | |||
175 | * Switch to 5V, Configure socket with 5V voltage | 176 | * Switch to 5V, Configure socket with 5V voltage |
176 | */ | 177 | */ |
177 | lubbock_set_misc_wr(misc_mask, 0); | 178 | lubbock_set_misc_wr(misc_mask, 0); |
178 | sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, 0); | 179 | sa1111_set_io(s->dev, pa_dwr_mask, 0); |
179 | 180 | ||
180 | /* | 181 | /* |
181 | * It takes about 100ms to turn off Vcc. | 182 | * It takes about 100ms to turn off Vcc. |
@@ -200,12 +201,8 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, | |||
200 | 201 | ||
201 | static struct pcmcia_low_level lubbock_pcmcia_ops = { | 202 | static struct pcmcia_low_level lubbock_pcmcia_ops = { |
202 | .owner = THIS_MODULE, | 203 | .owner = THIS_MODULE, |
203 | .hw_init = sa1111_pcmcia_hw_init, | ||
204 | .hw_shutdown = sa1111_pcmcia_hw_shutdown, | ||
205 | .socket_state = sa1111_pcmcia_socket_state, | ||
206 | .configure_socket = lubbock_pcmcia_configure_socket, | 204 | .configure_socket = lubbock_pcmcia_configure_socket, |
207 | .socket_init = sa1111_pcmcia_socket_init, | 205 | .socket_init = sa1111_pcmcia_socket_init, |
208 | .socket_suspend = sa1111_pcmcia_socket_suspend, | ||
209 | .first = 0, | 206 | .first = 0, |
210 | .nr = 2, | 207 | .nr = 2, |
211 | }; | 208 | }; |
@@ -228,8 +225,9 @@ int pcmcia_lubbock_init(struct sa1111_dev *sadev) | |||
228 | /* Set CF Socket 1 power to standby mode. */ | 225 | /* Set CF Socket 1 power to standby mode. */ |
229 | lubbock_set_misc_wr((1 << 15) | (1 << 14), 0); | 226 | lubbock_set_misc_wr((1 << 15) | (1 << 14), 0); |
230 | 227 | ||
231 | sadev->dev.platform_data = &lubbock_pcmcia_ops; | 228 | pxa2xx_drv_pcmcia_ops(&lubbock_pcmcia_ops); |
232 | ret = __pxa2xx_drv_pcmcia_probe(&sadev->dev); | 229 | ret = sa1111_pcmcia_add(sadev, &lubbock_pcmcia_ops, |
230 | pxa2xx_drv_pcmcia_add_one); | ||
233 | } | 231 | } |
234 | 232 | ||
235 | return ret; | 233 | return ret; |
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c index 1138551ba8f6..92016fe932b4 100644 --- a/drivers/pcmcia/pxa2xx_mainstone.c +++ b/drivers/pcmcia/pxa2xx_mainstone.c | |||
@@ -44,7 +44,7 @@ static int mst_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
44 | * before we enable them as outputs. | 44 | * before we enable them as outputs. |
45 | */ | 45 | */ |
46 | 46 | ||
47 | skt->irq = (skt->nr == 0) ? MAINSTONE_S0_IRQ : MAINSTONE_S1_IRQ; | 47 | skt->socket.pci_irq = (skt->nr == 0) ? MAINSTONE_S0_IRQ : MAINSTONE_S1_IRQ; |
48 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 48 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
49 | } | 49 | } |
50 | 50 | ||
diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c index 5ba9b3664a00..6fb6f7f0672e 100644 --- a/drivers/pcmcia/pxa2xx_palmld.c +++ b/drivers/pcmcia/pxa2xx_palmld.c | |||
@@ -45,7 +45,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
45 | if (ret) | 45 | if (ret) |
46 | goto err4; | 46 | goto err4; |
47 | 47 | ||
48 | skt->irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY); | 48 | skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY); |
49 | return 0; | 49 | return 0; |
50 | 50 | ||
51 | err4: | 51 | err4: |
diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c index e07b5c51ec5b..b07b247a399f 100644 --- a/drivers/pcmcia/pxa2xx_palmtx.c +++ b/drivers/pcmcia/pxa2xx_palmtx.c | |||
@@ -53,7 +53,7 @@ static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
53 | if (ret) | 53 | if (ret) |
54 | goto err5; | 54 | goto err5; |
55 | 55 | ||
56 | skt->irq = gpio_to_irq(GPIO_NR_PALMTX_PCMCIA_READY); | 56 | skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTX_PCMCIA_READY); |
57 | return 0; | 57 | return 0; |
58 | 58 | ||
59 | err5: | 59 | err5: |
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index bc43f78f6f0b..0ea3b29440e6 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c | |||
@@ -66,7 +66,7 @@ static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | skt->irq = SCOOP_DEV[skt->nr].irq; | 69 | skt->socket.pci_irq = SCOOP_DEV[skt->nr].irq; |
70 | 70 | ||
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c index e0e5cb339b4a..b7e596620db1 100644 --- a/drivers/pcmcia/pxa2xx_trizeps4.c +++ b/drivers/pcmcia/pxa2xx_trizeps4.c | |||
@@ -53,7 +53,7 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
53 | gpio_free(GPIO_PRDY); | 53 | gpio_free(GPIO_PRDY); |
54 | return -EINVAL; | 54 | return -EINVAL; |
55 | } | 55 | } |
56 | skt->irq = IRQ_GPIO(GPIO_PRDY); | 56 | skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY); |
57 | break; | 57 | break; |
58 | 58 | ||
59 | #ifndef CONFIG_MACH_TRIZEPS_CONXS | 59 | #ifndef CONFIG_MACH_TRIZEPS_CONXS |
@@ -63,7 +63,7 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
63 | break; | 63 | break; |
64 | } | 64 | } |
65 | /* release the reset of this card */ | 65 | /* release the reset of this card */ |
66 | pr_debug("%s: sock %d irq %d\n", __func__, skt->nr, skt->irq); | 66 | pr_debug("%s: sock %d irq %d\n", __func__, skt->nr, skt->socket.pci_irq); |
67 | 67 | ||
68 | /* supplementory irqs for the socket */ | 68 | /* supplementory irqs for the socket */ |
69 | for (i = 0; i < ARRAY_SIZE(irqs); i++) { | 69 | for (i = 0; i < ARRAY_SIZE(irqs); i++) { |
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c index 17871360fe99..27be2e154df2 100644 --- a/drivers/pcmcia/pxa2xx_viper.c +++ b/drivers/pcmcia/pxa2xx_viper.c | |||
@@ -40,7 +40,7 @@ static int viper_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
40 | { | 40 | { |
41 | unsigned long flags; | 41 | unsigned long flags; |
42 | 42 | ||
43 | skt->irq = gpio_to_irq(VIPER_CF_RDY_GPIO); | 43 | skt->socket.pci_irq = gpio_to_irq(VIPER_CF_RDY_GPIO); |
44 | 44 | ||
45 | if (gpio_request(VIPER_CF_CD_GPIO, "CF detect")) | 45 | if (gpio_request(VIPER_CF_CD_GPIO, "CF detect")) |
46 | goto err_request_cd; | 46 | goto err_request_cd; |
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index e592e0e0d7ed..de0e770ce6a3 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <pcmcia/cs_types.h> | 18 | #include <pcmcia/cs_types.h> |
19 | #include <pcmcia/ss.h> | 19 | #include <pcmcia/ss.h> |
20 | #include <pcmcia/cs.h> | 20 | #include <pcmcia/cs.h> |
21 | #include <pcmcia/cistpl.h> | ||
21 | #include "cs_internal.h" | 22 | #include "cs_internal.h" |
22 | 23 | ||
23 | 24 | ||
diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c index ac8aa09ba0da..fd013a1ef47a 100644 --- a/drivers/pcmcia/sa1100_assabet.c +++ b/drivers/pcmcia/sa1100_assabet.c | |||
@@ -27,7 +27,7 @@ static struct pcmcia_irqs irqs[] = { | |||
27 | 27 | ||
28 | static int assabet_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | 28 | static int assabet_pcmcia_hw_init(struct soc_pcmcia_socket *skt) |
29 | { | 29 | { |
30 | skt->irq = ASSABET_IRQ_GPIO_CF_IRQ; | 30 | skt->socket.pci_irq = ASSABET_IRQ_GPIO_CF_IRQ; |
31 | 31 | ||
32 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 32 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
33 | } | 33 | } |
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c index 1ca9737ea79e..1ce53f493bef 100644 --- a/drivers/pcmcia/sa1100_badge4.c +++ b/drivers/pcmcia/sa1100_badge4.c | |||
@@ -127,13 +127,10 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state | |||
127 | 127 | ||
128 | static struct pcmcia_low_level badge4_pcmcia_ops = { | 128 | static struct pcmcia_low_level badge4_pcmcia_ops = { |
129 | .owner = THIS_MODULE, | 129 | .owner = THIS_MODULE, |
130 | .hw_init = sa1111_pcmcia_hw_init, | ||
131 | .hw_shutdown = sa1111_pcmcia_hw_shutdown, | ||
132 | .socket_state = sa1111_pcmcia_socket_state, | ||
133 | .configure_socket = badge4_pcmcia_configure_socket, | 130 | .configure_socket = badge4_pcmcia_configure_socket, |
134 | |||
135 | .socket_init = sa1111_pcmcia_socket_init, | 131 | .socket_init = sa1111_pcmcia_socket_init, |
136 | .socket_suspend = sa1111_pcmcia_socket_suspend, | 132 | .first = 0, |
133 | .nr = 2, | ||
137 | }; | 134 | }; |
138 | 135 | ||
139 | int pcmcia_badge4_init(struct device *dev) | 136 | int pcmcia_badge4_init(struct device *dev) |
@@ -146,7 +143,9 @@ int pcmcia_badge4_init(struct device *dev) | |||
146 | __func__, | 143 | __func__, |
147 | badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc); | 144 | badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc); |
148 | 145 | ||
149 | ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2); | 146 | sa11xx_drv_pcmcia_ops(&badge4_pcmcia_ops); |
147 | ret = sa1111_pcmcia_add(dev, &badge4_pcmcia_ops, | ||
148 | sa11xx_drv_pcmcia_add_one); | ||
150 | } | 149 | } |
151 | 150 | ||
152 | return ret; | 151 | return ret; |
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c index 63e6bc431a0d..9bf088b17275 100644 --- a/drivers/pcmcia/sa1100_cerf.c +++ b/drivers/pcmcia/sa1100_cerf.c | |||
@@ -27,7 +27,7 @@ static struct pcmcia_irqs irqs[] = { | |||
27 | 27 | ||
28 | static int cerf_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | 28 | static int cerf_pcmcia_hw_init(struct soc_pcmcia_socket *skt) |
29 | { | 29 | { |
30 | skt->irq = CERF_IRQ_GPIO_CF_IRQ; | 30 | skt->socket.pci_irq = CERF_IRQ_GPIO_CF_IRQ; |
31 | 31 | ||
32 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 32 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
33 | } | 33 | } |
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 2d0e99751530..11cc3ba1260a 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c | |||
@@ -83,7 +83,16 @@ static int sa11x0_drv_pcmcia_probe(struct platform_device *dev) | |||
83 | 83 | ||
84 | static int sa11x0_drv_pcmcia_remove(struct platform_device *dev) | 84 | static int sa11x0_drv_pcmcia_remove(struct platform_device *dev) |
85 | { | 85 | { |
86 | return soc_common_drv_pcmcia_remove(&dev->dev); | 86 | struct skt_dev_info *sinfo = platform_get_drvdata(dev); |
87 | int i; | ||
88 | |||
89 | platform_set_drvdata(dev, NULL); | ||
90 | |||
91 | for (i = 0; i < sinfo->nskt; i++) | ||
92 | soc_pcmcia_remove_one(&sinfo->skt[i]); | ||
93 | |||
94 | kfree(sinfo); | ||
95 | return 0; | ||
87 | } | 96 | } |
88 | 97 | ||
89 | static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev, | 98 | static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev, |
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c index 0cc3748f3758..3a121ac697d6 100644 --- a/drivers/pcmcia/sa1100_h3600.c +++ b/drivers/pcmcia/sa1100_h3600.c | |||
@@ -25,8 +25,8 @@ static struct pcmcia_irqs irqs[] = { | |||
25 | 25 | ||
26 | static int h3600_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | 26 | static int h3600_pcmcia_hw_init(struct soc_pcmcia_socket *skt) |
27 | { | 27 | { |
28 | skt->irq = skt->nr ? IRQ_GPIO_H3600_PCMCIA_IRQ1 | 28 | skt->socket.pci_irq = skt->nr ? IRQ_GPIO_H3600_PCMCIA_IRQ1 |
29 | : IRQ_GPIO_H3600_PCMCIA_IRQ0; | 29 | : IRQ_GPIO_H3600_PCMCIA_IRQ0; |
30 | 30 | ||
31 | 31 | ||
32 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 32 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c index 7eedb42f800c..6bcabee6bde4 100644 --- a/drivers/pcmcia/sa1100_jornada720.c +++ b/drivers/pcmcia/sa1100_jornada720.c | |||
@@ -22,25 +22,10 @@ | |||
22 | #define SOCKET1_POWER (GPIO_GPIO1 | GPIO_GPIO3) | 22 | #define SOCKET1_POWER (GPIO_GPIO1 | GPIO_GPIO3) |
23 | #define SOCKET1_3V GPIO_GPIO3 | 23 | #define SOCKET1_3V GPIO_GPIO3 |
24 | 24 | ||
25 | static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | ||
26 | { | ||
27 | unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3; | ||
28 | |||
29 | /* | ||
30 | * What is all this crap for? | ||
31 | */ | ||
32 | GRER |= 0x00000002; | ||
33 | /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */ | ||
34 | sa1111_set_io_dir(SA1111_DEV(skt->dev), pin, 0, 0); | ||
35 | sa1111_set_io(SA1111_DEV(skt->dev), pin, 0); | ||
36 | sa1111_set_sleep_io(SA1111_DEV(skt->dev), pin, 0); | ||
37 | |||
38 | return sa1111_pcmcia_hw_init(skt); | ||
39 | } | ||
40 | |||
41 | static int | 25 | static int |
42 | jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) | 26 | jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) |
43 | { | 27 | { |
28 | struct sa1111_pcmcia_socket *s = to_skt(skt); | ||
44 | unsigned int pa_dwr_mask, pa_dwr_set; | 29 | unsigned int pa_dwr_mask, pa_dwr_set; |
45 | int ret; | 30 | int ret; |
46 | 31 | ||
@@ -97,7 +82,7 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s | |||
97 | unsigned long flags; | 82 | unsigned long flags; |
98 | 83 | ||
99 | local_irq_save(flags); | 84 | local_irq_save(flags); |
100 | sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set); | 85 | sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set); |
101 | local_irq_restore(flags); | 86 | local_irq_restore(flags); |
102 | } | 87 | } |
103 | 88 | ||
@@ -106,21 +91,30 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s | |||
106 | 91 | ||
107 | static struct pcmcia_low_level jornada720_pcmcia_ops = { | 92 | static struct pcmcia_low_level jornada720_pcmcia_ops = { |
108 | .owner = THIS_MODULE, | 93 | .owner = THIS_MODULE, |
109 | .hw_init = jornada720_pcmcia_hw_init, | ||
110 | .hw_shutdown = sa1111_pcmcia_hw_shutdown, | ||
111 | .socket_state = sa1111_pcmcia_socket_state, | ||
112 | .configure_socket = jornada720_pcmcia_configure_socket, | 94 | .configure_socket = jornada720_pcmcia_configure_socket, |
113 | |||
114 | .socket_init = sa1111_pcmcia_socket_init, | 95 | .socket_init = sa1111_pcmcia_socket_init, |
115 | .socket_suspend = sa1111_pcmcia_socket_suspend, | 96 | .first = 0, |
97 | .nr = 2, | ||
116 | }; | 98 | }; |
117 | 99 | ||
118 | int __devinit pcmcia_jornada720_init(struct device *dev) | 100 | int __devinit pcmcia_jornada720_init(struct device *dev) |
119 | { | 101 | { |
120 | int ret = -ENODEV; | 102 | int ret = -ENODEV; |
121 | 103 | ||
122 | if (machine_is_jornada720()) | 104 | if (machine_is_jornada720()) { |
123 | ret = sa11xx_drv_pcmcia_probe(dev, &jornada720_pcmcia_ops, 0, 2); | 105 | unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3; |
106 | |||
107 | GRER |= 0x00000002; | ||
108 | |||
109 | /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */ | ||
110 | sa1111_set_io_dir(dev, pin, 0, 0); | ||
111 | sa1111_set_io(dev, pin, 0); | ||
112 | sa1111_set_sleep_io(dev, pin, 0); | ||
113 | |||
114 | sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops); | ||
115 | ret = sa1111_pcmcia_add(dev, &jornada720_pcmcia_ops, | ||
116 | sa11xx_drv_pcmcia_add_one); | ||
117 | } | ||
124 | 118 | ||
125 | return ret; | 119 | return ret; |
126 | } | 120 | } |
diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1100_neponset.c index 0c76d337815b..c95639b5f2a0 100644 --- a/drivers/pcmcia/sa1100_neponset.c +++ b/drivers/pcmcia/sa1100_neponset.c | |||
@@ -43,6 +43,7 @@ | |||
43 | static int | 43 | static int |
44 | neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) | 44 | neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) |
45 | { | 45 | { |
46 | struct sa1111_pcmcia_socket *s = to_skt(skt); | ||
46 | unsigned int ncr_mask, ncr_set, pa_dwr_mask, pa_dwr_set; | 47 | unsigned int ncr_mask, ncr_set, pa_dwr_mask, pa_dwr_set; |
47 | int ret; | 48 | int ret; |
48 | 49 | ||
@@ -99,7 +100,7 @@ neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_sta | |||
99 | NCR_0 = (NCR_0 & ~ncr_mask) | ncr_set; | 100 | NCR_0 = (NCR_0 & ~ncr_mask) | ncr_set; |
100 | 101 | ||
101 | local_irq_restore(flags); | 102 | local_irq_restore(flags); |
102 | sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set); | 103 | sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set); |
103 | } | 104 | } |
104 | 105 | ||
105 | return 0; | 106 | return 0; |
@@ -115,12 +116,10 @@ static void neponset_pcmcia_socket_init(struct soc_pcmcia_socket *skt) | |||
115 | 116 | ||
116 | static struct pcmcia_low_level neponset_pcmcia_ops = { | 117 | static struct pcmcia_low_level neponset_pcmcia_ops = { |
117 | .owner = THIS_MODULE, | 118 | .owner = THIS_MODULE, |
118 | .hw_init = sa1111_pcmcia_hw_init, | ||
119 | .hw_shutdown = sa1111_pcmcia_hw_shutdown, | ||
120 | .socket_state = sa1111_pcmcia_socket_state, | ||
121 | .configure_socket = neponset_pcmcia_configure_socket, | 119 | .configure_socket = neponset_pcmcia_configure_socket, |
122 | .socket_init = neponset_pcmcia_socket_init, | 120 | .socket_init = neponset_pcmcia_socket_init, |
123 | .socket_suspend = sa1111_pcmcia_socket_suspend, | 121 | .first = 0, |
122 | .nr = 2, | ||
124 | }; | 123 | }; |
125 | 124 | ||
126 | int pcmcia_neponset_init(struct sa1111_dev *sadev) | 125 | int pcmcia_neponset_init(struct sa1111_dev *sadev) |
@@ -135,7 +134,9 @@ int pcmcia_neponset_init(struct sa1111_dev *sadev) | |||
135 | sa1111_set_io_dir(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0); | 134 | sa1111_set_io_dir(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0); |
136 | sa1111_set_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); | 135 | sa1111_set_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); |
137 | sa1111_set_sleep_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); | 136 | sa1111_set_sleep_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); |
138 | ret = sa11xx_drv_pcmcia_probe(&sadev->dev, &neponset_pcmcia_ops, 0, 2); | 137 | sa11xx_drv_pcmcia_ops(&neponset_pcmcia_ops); |
138 | ret = sa1111_pcmcia_add(sadev, &neponset_pcmcia_ops, | ||
139 | sa11xx_drv_pcmcia_add_one); | ||
139 | } | 140 | } |
140 | 141 | ||
141 | return ret; | 142 | return ret; |
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c index 46d8c1977c2a..c4d51867a050 100644 --- a/drivers/pcmcia/sa1100_shannon.c +++ b/drivers/pcmcia/sa1100_shannon.c | |||
@@ -28,7 +28,7 @@ static int shannon_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
28 | GAFR &= ~(SHANNON_GPIO_EJECT_0 | SHANNON_GPIO_EJECT_1 | | 28 | GAFR &= ~(SHANNON_GPIO_EJECT_0 | SHANNON_GPIO_EJECT_1 | |
29 | SHANNON_GPIO_RDY_0 | SHANNON_GPIO_RDY_1); | 29 | SHANNON_GPIO_RDY_0 | SHANNON_GPIO_RDY_1); |
30 | 30 | ||
31 | skt->irq = skt->nr ? SHANNON_IRQ_GPIO_RDY_1 : SHANNON_IRQ_GPIO_RDY_0; | 31 | skt->socket.pci_irq = skt->nr ? SHANNON_IRQ_GPIO_RDY_1 : SHANNON_IRQ_GPIO_RDY_0; |
32 | 32 | ||
33 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 33 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
34 | } | 34 | } |
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c index 33a08ae09fdf..05bd504e6f18 100644 --- a/drivers/pcmcia/sa1100_simpad.c +++ b/drivers/pcmcia/sa1100_simpad.c | |||
@@ -28,7 +28,7 @@ static int simpad_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
28 | 28 | ||
29 | clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1); | 29 | clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1); |
30 | 30 | ||
31 | skt->irq = IRQ_GPIO_CF_IRQ; | 31 | skt->socket.pci_irq = IRQ_GPIO_CF_IRQ; |
32 | 32 | ||
33 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 33 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
34 | } | 34 | } |
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 4be4e172ffa1..de6bc333d299 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
@@ -28,23 +28,20 @@ static struct pcmcia_irqs irqs[] = { | |||
28 | { 1, IRQ_S1_BVD1_STSCHG, "SA1111 CF BVD1" }, | 28 | { 1, IRQ_S1_BVD1_STSCHG, "SA1111 CF BVD1" }, |
29 | }; | 29 | }; |
30 | 30 | ||
31 | int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | 31 | static int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *skt) |
32 | { | 32 | { |
33 | if (skt->irq == NO_IRQ) | ||
34 | skt->irq = skt->nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT; | ||
35 | |||
36 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 33 | return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
37 | } | 34 | } |
38 | 35 | ||
39 | void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) | 36 | static void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) |
40 | { | 37 | { |
41 | soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 38 | soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
42 | } | 39 | } |
43 | 40 | ||
44 | void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state) | 41 | void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state) |
45 | { | 42 | { |
46 | struct sa1111_dev *sadev = SA1111_DEV(skt->dev); | 43 | struct sa1111_pcmcia_socket *s = to_skt(skt); |
47 | unsigned long status = sa1111_readl(sadev->mapbase + SA1111_PCSR); | 44 | unsigned long status = sa1111_readl(s->dev->mapbase + SA1111_PCSR); |
48 | 45 | ||
49 | switch (skt->nr) { | 46 | switch (skt->nr) { |
50 | case 0: | 47 | case 0: |
@@ -71,7 +68,7 @@ void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_sta | |||
71 | 68 | ||
72 | int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) | 69 | int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) |
73 | { | 70 | { |
74 | struct sa1111_dev *sadev = SA1111_DEV(skt->dev); | 71 | struct sa1111_pcmcia_socket *s = to_skt(skt); |
75 | unsigned int pccr_skt_mask, pccr_set_mask, val; | 72 | unsigned int pccr_skt_mask, pccr_set_mask, val; |
76 | unsigned long flags; | 73 | unsigned long flags; |
77 | 74 | ||
@@ -100,10 +97,10 @@ int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s | |||
100 | pccr_set_mask |= PCCR_S0_FLT|PCCR_S1_FLT; | 97 | pccr_set_mask |= PCCR_S0_FLT|PCCR_S1_FLT; |
101 | 98 | ||
102 | local_irq_save(flags); | 99 | local_irq_save(flags); |
103 | val = sa1111_readl(sadev->mapbase + SA1111_PCCR); | 100 | val = sa1111_readl(s->dev->mapbase + SA1111_PCCR); |
104 | val &= ~pccr_skt_mask; | 101 | val &= ~pccr_skt_mask; |
105 | val |= pccr_set_mask & pccr_skt_mask; | 102 | val |= pccr_set_mask & pccr_skt_mask; |
106 | sa1111_writel(val, sadev->mapbase + SA1111_PCCR); | 103 | sa1111_writel(val, s->dev->mapbase + SA1111_PCCR); |
107 | local_irq_restore(flags); | 104 | local_irq_restore(flags); |
108 | 105 | ||
109 | return 0; | 106 | return 0; |
@@ -114,15 +111,51 @@ void sa1111_pcmcia_socket_init(struct soc_pcmcia_socket *skt) | |||
114 | soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 111 | soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
115 | } | 112 | } |
116 | 113 | ||
117 | void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) | 114 | static void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) |
118 | { | 115 | { |
119 | soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs)); | 116 | soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs)); |
120 | } | 117 | } |
121 | 118 | ||
119 | int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, | ||
120 | int (*add)(struct soc_pcmcia_socket *)) | ||
121 | { | ||
122 | struct sa1111_pcmcia_socket *s; | ||
123 | int i, ret = 0; | ||
124 | |||
125 | ops->hw_init = sa1111_pcmcia_hw_init; | ||
126 | ops->hw_shutdown = sa1111_pcmcia_hw_shutdown; | ||
127 | ops->socket_state = sa1111_pcmcia_socket_state; | ||
128 | ops->socket_suspend = sa1111_pcmcia_socket_suspend; | ||
129 | |||
130 | for (i = 0; i < ops->nr; i++) { | ||
131 | s = kzalloc(sizeof(*s), GFP_KERNEL); | ||
132 | if (!s) | ||
133 | return -ENOMEM; | ||
134 | |||
135 | s->soc.nr = ops->first + i; | ||
136 | s->soc.ops = ops; | ||
137 | s->soc.socket.owner = ops->owner; | ||
138 | s->soc.socket.dev.parent = &dev->dev; | ||
139 | s->soc.socket.pci_irq = s->soc.nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT; | ||
140 | s->dev = dev; | ||
141 | |||
142 | ret = add(&s->soc); | ||
143 | if (ret == 0) { | ||
144 | s->next = dev_get_drvdata(&dev->dev); | ||
145 | dev_set_drvdata(&dev->dev, s); | ||
146 | } else | ||
147 | kfree(s); | ||
148 | } | ||
149 | |||
150 | return ret; | ||
151 | } | ||
152 | |||
122 | static int pcmcia_probe(struct sa1111_dev *dev) | 153 | static int pcmcia_probe(struct sa1111_dev *dev) |
123 | { | 154 | { |
124 | void __iomem *base; | 155 | void __iomem *base; |
125 | 156 | ||
157 | dev_set_drvdata(&dev->dev, NULL); | ||
158 | |||
126 | if (!request_mem_region(dev->res.start, 512, | 159 | if (!request_mem_region(dev->res.start, 512, |
127 | SA1111_DRIVER_NAME(dev))) | 160 | SA1111_DRIVER_NAME(dev))) |
128 | return -EBUSY; | 161 | return -EBUSY; |
@@ -152,7 +185,15 @@ static int pcmcia_probe(struct sa1111_dev *dev) | |||
152 | 185 | ||
153 | static int __devexit pcmcia_remove(struct sa1111_dev *dev) | 186 | static int __devexit pcmcia_remove(struct sa1111_dev *dev) |
154 | { | 187 | { |
155 | soc_common_drv_pcmcia_remove(&dev->dev); | 188 | struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev); |
189 | |||
190 | dev_set_drvdata(&dev->dev, NULL); | ||
191 | |||
192 | for (; next = s->next, s; s = next) { | ||
193 | soc_pcmcia_remove_one(&s->soc); | ||
194 | kfree(s); | ||
195 | } | ||
196 | |||
156 | release_mem_region(dev->res.start, 512); | 197 | release_mem_region(dev->res.start, 512); |
157 | return 0; | 198 | return 0; |
158 | } | 199 | } |
diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h index 10ced4a210d7..02dc8577cdaf 100644 --- a/drivers/pcmcia/sa1111_generic.h +++ b/drivers/pcmcia/sa1111_generic.h | |||
@@ -1,12 +1,23 @@ | |||
1 | #include "soc_common.h" | 1 | #include "soc_common.h" |
2 | #include "sa11xx_base.h" | 2 | #include "sa11xx_base.h" |
3 | 3 | ||
4 | extern int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *); | 4 | struct sa1111_pcmcia_socket { |
5 | extern void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *); | 5 | struct soc_pcmcia_socket soc; |
6 | struct sa1111_dev *dev; | ||
7 | struct sa1111_pcmcia_socket *next; | ||
8 | }; | ||
9 | |||
10 | static inline struct sa1111_pcmcia_socket *to_skt(struct soc_pcmcia_socket *s) | ||
11 | { | ||
12 | return container_of(s, struct sa1111_pcmcia_socket, soc); | ||
13 | } | ||
14 | |||
15 | int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, | ||
16 | int (*add)(struct soc_pcmcia_socket *)); | ||
17 | |||
6 | extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia_state *); | 18 | extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia_state *); |
7 | extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *); | 19 | extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *); |
8 | extern void sa1111_pcmcia_socket_init(struct soc_pcmcia_socket *); | 20 | extern void sa1111_pcmcia_socket_init(struct soc_pcmcia_socket *); |
9 | extern void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *); | ||
10 | 21 | ||
11 | extern int pcmcia_badge4_init(struct device *); | 22 | extern int pcmcia_badge4_init(struct device *); |
12 | extern int pcmcia_jornada720_init(struct device *); | 23 | extern int pcmcia_jornada720_init(struct device *); |
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index e15d59f2d8a9..fc9a6527019b 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c | |||
@@ -171,12 +171,58 @@ static const char *skt_names[] = { | |||
171 | #define SKT_DEV_INFO_SIZE(n) \ | 171 | #define SKT_DEV_INFO_SIZE(n) \ |
172 | (sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket)) | 172 | (sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket)) |
173 | 173 | ||
174 | int sa11xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt) | ||
175 | { | ||
176 | skt->res_skt.start = _PCMCIA(skt->nr); | ||
177 | skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1; | ||
178 | skt->res_skt.name = skt_names[skt->nr]; | ||
179 | skt->res_skt.flags = IORESOURCE_MEM; | ||
180 | |||
181 | skt->res_io.start = _PCMCIAIO(skt->nr); | ||
182 | skt->res_io.end = _PCMCIAIO(skt->nr) + PCMCIAIOSp - 1; | ||
183 | skt->res_io.name = "io"; | ||
184 | skt->res_io.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
185 | |||
186 | skt->res_mem.start = _PCMCIAMem(skt->nr); | ||
187 | skt->res_mem.end = _PCMCIAMem(skt->nr) + PCMCIAMemSp - 1; | ||
188 | skt->res_mem.name = "memory"; | ||
189 | skt->res_mem.flags = IORESOURCE_MEM; | ||
190 | |||
191 | skt->res_attr.start = _PCMCIAAttr(skt->nr); | ||
192 | skt->res_attr.end = _PCMCIAAttr(skt->nr) + PCMCIAAttrSp - 1; | ||
193 | skt->res_attr.name = "attribute"; | ||
194 | skt->res_attr.flags = IORESOURCE_MEM; | ||
195 | |||
196 | return soc_pcmcia_add_one(skt); | ||
197 | } | ||
198 | EXPORT_SYMBOL(sa11xx_drv_pcmcia_add_one); | ||
199 | |||
200 | void sa11xx_drv_pcmcia_ops(struct pcmcia_low_level *ops) | ||
201 | { | ||
202 | /* | ||
203 | * set default MECR calculation if the board specific | ||
204 | * code did not specify one... | ||
205 | */ | ||
206 | if (!ops->get_timing) | ||
207 | ops->get_timing = sa1100_pcmcia_default_mecr_timing; | ||
208 | |||
209 | /* Provide our SA11x0 specific timing routines. */ | ||
210 | ops->set_timing = sa1100_pcmcia_set_timing; | ||
211 | ops->show_timing = sa1100_pcmcia_show_timing; | ||
212 | #ifdef CONFIG_CPU_FREQ | ||
213 | ops->frequency_change = sa1100_pcmcia_frequency_change; | ||
214 | #endif | ||
215 | } | ||
216 | EXPORT_SYMBOL(sa11xx_drv_pcmcia_ops); | ||
217 | |||
174 | int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, | 218 | int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, |
175 | int first, int nr) | 219 | int first, int nr) |
176 | { | 220 | { |
177 | struct skt_dev_info *sinfo; | 221 | struct skt_dev_info *sinfo; |
178 | struct soc_pcmcia_socket *skt; | 222 | struct soc_pcmcia_socket *skt; |
179 | int i; | 223 | int i, ret = 0; |
224 | |||
225 | sa11xx_drv_pcmcia_ops(ops); | ||
180 | 226 | ||
181 | sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL); | 227 | sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL); |
182 | if (!sinfo) | 228 | if (!sinfo) |
@@ -188,45 +234,26 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, | |||
188 | for (i = 0; i < nr; i++) { | 234 | for (i = 0; i < nr; i++) { |
189 | skt = &sinfo->skt[i]; | 235 | skt = &sinfo->skt[i]; |
190 | 236 | ||
191 | skt->nr = first + i; | 237 | skt->nr = first + i; |
192 | skt->irq = NO_IRQ; | 238 | skt->ops = ops; |
193 | 239 | skt->socket.owner = ops->owner; | |
194 | skt->res_skt.start = _PCMCIA(skt->nr); | 240 | skt->socket.dev.parent = dev; |
195 | skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1; | 241 | skt->socket.pci_irq = NO_IRQ; |
196 | skt->res_skt.name = skt_names[skt->nr]; | ||
197 | skt->res_skt.flags = IORESOURCE_MEM; | ||
198 | |||
199 | skt->res_io.start = _PCMCIAIO(skt->nr); | ||
200 | skt->res_io.end = _PCMCIAIO(skt->nr) + PCMCIAIOSp - 1; | ||
201 | skt->res_io.name = "io"; | ||
202 | skt->res_io.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
203 | 242 | ||
204 | skt->res_mem.start = _PCMCIAMem(skt->nr); | 243 | ret = sa11xx_drv_pcmcia_add_one(skt); |
205 | skt->res_mem.end = _PCMCIAMem(skt->nr) + PCMCIAMemSp - 1; | 244 | if (ret) |
206 | skt->res_mem.name = "memory"; | 245 | break; |
207 | skt->res_mem.flags = IORESOURCE_MEM; | ||
208 | |||
209 | skt->res_attr.start = _PCMCIAAttr(skt->nr); | ||
210 | skt->res_attr.end = _PCMCIAAttr(skt->nr) + PCMCIAAttrSp - 1; | ||
211 | skt->res_attr.name = "attribute"; | ||
212 | skt->res_attr.flags = IORESOURCE_MEM; | ||
213 | } | 246 | } |
214 | 247 | ||
215 | /* | 248 | if (ret) { |
216 | * set default MECR calculation if the board specific | 249 | while (--i >= 0) |
217 | * code did not specify one... | 250 | soc_pcmcia_remove_one(&sinfo->skt[i]); |
218 | */ | 251 | kfree(sinfo); |
219 | if (!ops->get_timing) | 252 | } else { |
220 | ops->get_timing = sa1100_pcmcia_default_mecr_timing; | 253 | dev_set_drvdata(dev, sinfo); |
221 | 254 | } | |
222 | /* Provide our SA11x0 specific timing routines. */ | ||
223 | ops->set_timing = sa1100_pcmcia_set_timing; | ||
224 | ops->show_timing = sa1100_pcmcia_show_timing; | ||
225 | #ifdef CONFIG_CPU_FREQ | ||
226 | ops->frequency_change = sa1100_pcmcia_frequency_change; | ||
227 | #endif | ||
228 | 255 | ||
229 | return soc_common_drv_pcmcia_probe(dev, ops, sinfo); | 256 | return ret; |
230 | } | 257 | } |
231 | EXPORT_SYMBOL(sa11xx_drv_pcmcia_probe); | 258 | EXPORT_SYMBOL(sa11xx_drv_pcmcia_probe); |
232 | 259 | ||
diff --git a/drivers/pcmcia/sa11xx_base.h b/drivers/pcmcia/sa11xx_base.h index 7bc208280527..3d76d720f463 100644 --- a/drivers/pcmcia/sa11xx_base.h +++ b/drivers/pcmcia/sa11xx_base.h | |||
@@ -118,6 +118,8 @@ static inline unsigned int sa1100_pcmcia_cmd_time(unsigned int cpu_clock_khz, | |||
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
121 | int sa11xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt); | ||
122 | void sa11xx_drv_pcmcia_ops(struct pcmcia_low_level *ops); | ||
121 | extern int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr); | 123 | extern int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr); |
122 | 124 | ||
123 | #endif /* !defined(_PCMCIA_SA1100_H) */ | 125 | #endif /* !defined(_PCMCIA_SA1100_H) */ |
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index ef7e9e58782b..6f1a86b43c60 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
@@ -144,10 +144,10 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t *stat | |||
144 | */ | 144 | */ |
145 | if (skt->irq_state != 1 && state->io_irq) { | 145 | if (skt->irq_state != 1 && state->io_irq) { |
146 | skt->irq_state = 1; | 146 | skt->irq_state = 1; |
147 | set_irq_type(skt->irq, IRQ_TYPE_EDGE_FALLING); | 147 | set_irq_type(skt->socket.pci_irq, IRQ_TYPE_EDGE_FALLING); |
148 | } else if (skt->irq_state == 1 && state->io_irq == 0) { | 148 | } else if (skt->irq_state == 1 && state->io_irq == 0) { |
149 | skt->irq_state = 0; | 149 | skt->irq_state = 0; |
150 | set_irq_type(skt->irq, IRQ_TYPE_NONE); | 150 | set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE); |
151 | } | 151 | } |
152 | 152 | ||
153 | skt->cs_state = *state; | 153 | skt->cs_state = *state; |
@@ -492,7 +492,8 @@ static ssize_t show_status(struct device *dev, struct device_attribute *attr, ch | |||
492 | 492 | ||
493 | p+=sprintf(p, "Vcc : %d\n", skt->cs_state.Vcc); | 493 | p+=sprintf(p, "Vcc : %d\n", skt->cs_state.Vcc); |
494 | p+=sprintf(p, "Vpp : %d\n", skt->cs_state.Vpp); | 494 | p+=sprintf(p, "Vpp : %d\n", skt->cs_state.Vpp); |
495 | p+=sprintf(p, "IRQ : %d (%d)\n", skt->cs_state.io_irq, skt->irq); | 495 | p+=sprintf(p, "IRQ : %d (%d)\n", skt->cs_state.io_irq, |
496 | skt->socket.pci_irq); | ||
496 | if (skt->ops->show_timing) | 497 | if (skt->ops->show_timing) |
497 | p+=skt->ops->show_timing(skt, p); | 498 | p+=skt->ops->show_timing(skt, p); |
498 | 499 | ||
@@ -574,7 +575,7 @@ void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt, | |||
574 | EXPORT_SYMBOL(soc_pcmcia_enable_irqs); | 575 | EXPORT_SYMBOL(soc_pcmcia_enable_irqs); |
575 | 576 | ||
576 | 577 | ||
577 | LIST_HEAD(soc_pcmcia_sockets); | 578 | static LIST_HEAD(soc_pcmcia_sockets); |
578 | static DEFINE_MUTEX(soc_pcmcia_sockets_lock); | 579 | static DEFINE_MUTEX(soc_pcmcia_sockets_lock); |
579 | 580 | ||
580 | #ifdef CONFIG_CPU_FREQ | 581 | #ifdef CONFIG_CPU_FREQ |
@@ -609,177 +610,137 @@ static int soc_pcmcia_cpufreq_register(void) | |||
609 | "notifier for PCMCIA (%d)\n", ret); | 610 | "notifier for PCMCIA (%d)\n", ret); |
610 | return ret; | 611 | return ret; |
611 | } | 612 | } |
613 | fs_initcall(soc_pcmcia_cpufreq_register); | ||
612 | 614 | ||
613 | static void soc_pcmcia_cpufreq_unregister(void) | 615 | static void soc_pcmcia_cpufreq_unregister(void) |
614 | { | 616 | { |
615 | cpufreq_unregister_notifier(&soc_pcmcia_notifier_block, CPUFREQ_TRANSITION_NOTIFIER); | 617 | cpufreq_unregister_notifier(&soc_pcmcia_notifier_block, CPUFREQ_TRANSITION_NOTIFIER); |
616 | } | 618 | } |
619 | module_exit(soc_pcmcia_cpufreq_unregister); | ||
617 | 620 | ||
618 | #else | ||
619 | static int soc_pcmcia_cpufreq_register(void) { return 0; } | ||
620 | static void soc_pcmcia_cpufreq_unregister(void) {} | ||
621 | #endif | 621 | #endif |
622 | 622 | ||
623 | int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, | 623 | void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt) |
624 | struct skt_dev_info *sinfo) | ||
625 | { | 624 | { |
626 | struct soc_pcmcia_socket *skt; | ||
627 | int ret, i; | ||
628 | |||
629 | mutex_lock(&soc_pcmcia_sockets_lock); | 625 | mutex_lock(&soc_pcmcia_sockets_lock); |
626 | del_timer_sync(&skt->poll_timer); | ||
630 | 627 | ||
631 | /* | 628 | pcmcia_unregister_socket(&skt->socket); |
632 | * Initialise the per-socket structure. | ||
633 | */ | ||
634 | for (i = 0; i < sinfo->nskt; i++) { | ||
635 | skt = &sinfo->skt[i]; | ||
636 | 629 | ||
637 | skt->socket.ops = &soc_common_pcmcia_operations; | 630 | flush_scheduled_work(); |
638 | skt->socket.owner = ops->owner; | ||
639 | skt->socket.dev.parent = dev; | ||
640 | 631 | ||
641 | init_timer(&skt->poll_timer); | 632 | skt->ops->hw_shutdown(skt); |
642 | skt->poll_timer.function = soc_common_pcmcia_poll_event; | ||
643 | skt->poll_timer.data = (unsigned long)skt; | ||
644 | skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; | ||
645 | 633 | ||
646 | skt->dev = dev; | 634 | soc_common_pcmcia_config_skt(skt, &dead_socket); |
647 | skt->ops = ops; | ||
648 | 635 | ||
649 | ret = request_resource(&iomem_resource, &skt->res_skt); | 636 | list_del(&skt->node); |
650 | if (ret) | 637 | mutex_unlock(&soc_pcmcia_sockets_lock); |
651 | goto out_err_1; | ||
652 | 638 | ||
653 | ret = request_resource(&skt->res_skt, &skt->res_io); | 639 | iounmap(skt->virt_io); |
654 | if (ret) | 640 | skt->virt_io = NULL; |
655 | goto out_err_2; | 641 | release_resource(&skt->res_attr); |
642 | release_resource(&skt->res_mem); | ||
643 | release_resource(&skt->res_io); | ||
644 | release_resource(&skt->res_skt); | ||
645 | } | ||
646 | EXPORT_SYMBOL(soc_pcmcia_remove_one); | ||
656 | 647 | ||
657 | ret = request_resource(&skt->res_skt, &skt->res_mem); | 648 | int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) |
658 | if (ret) | 649 | { |
659 | goto out_err_3; | 650 | int ret; |
660 | 651 | ||
661 | ret = request_resource(&skt->res_skt, &skt->res_attr); | 652 | init_timer(&skt->poll_timer); |
662 | if (ret) | 653 | skt->poll_timer.function = soc_common_pcmcia_poll_event; |
663 | goto out_err_4; | 654 | skt->poll_timer.data = (unsigned long)skt; |
655 | skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; | ||
664 | 656 | ||
665 | skt->virt_io = ioremap(skt->res_io.start, 0x10000); | 657 | ret = request_resource(&iomem_resource, &skt->res_skt); |
666 | if (skt->virt_io == NULL) { | 658 | if (ret) |
667 | ret = -ENOMEM; | 659 | goto out_err_1; |
668 | goto out_err_5; | ||
669 | } | ||
670 | 660 | ||
671 | if (list_empty(&soc_pcmcia_sockets)) | 661 | ret = request_resource(&skt->res_skt, &skt->res_io); |
672 | soc_pcmcia_cpufreq_register(); | 662 | if (ret) |
663 | goto out_err_2; | ||
673 | 664 | ||
674 | list_add(&skt->node, &soc_pcmcia_sockets); | 665 | ret = request_resource(&skt->res_skt, &skt->res_mem); |
666 | if (ret) | ||
667 | goto out_err_3; | ||
675 | 668 | ||
676 | /* | 669 | ret = request_resource(&skt->res_skt, &skt->res_attr); |
677 | * We initialize default socket timing here, because | 670 | if (ret) |
678 | * we are not guaranteed to see a SetIOMap operation at | 671 | goto out_err_4; |
679 | * runtime. | ||
680 | */ | ||
681 | ops->set_timing(skt); | ||
682 | 672 | ||
683 | ret = ops->hw_init(skt); | 673 | skt->virt_io = ioremap(skt->res_io.start, 0x10000); |
684 | if (ret) | 674 | if (skt->virt_io == NULL) { |
685 | goto out_err_6; | 675 | ret = -ENOMEM; |
676 | goto out_err_5; | ||
677 | } | ||
686 | 678 | ||
687 | skt->socket.features = SS_CAP_STATIC_MAP|SS_CAP_PCCARD; | 679 | mutex_lock(&soc_pcmcia_sockets_lock); |
688 | skt->socket.resource_ops = &pccard_static_ops; | ||
689 | skt->socket.irq_mask = 0; | ||
690 | skt->socket.map_size = PAGE_SIZE; | ||
691 | skt->socket.pci_irq = skt->irq; | ||
692 | skt->socket.io_offset = (unsigned long)skt->virt_io; | ||
693 | 680 | ||
694 | skt->status = soc_common_pcmcia_skt_state(skt); | 681 | list_add(&skt->node, &soc_pcmcia_sockets); |
695 | 682 | ||
696 | ret = pcmcia_register_socket(&skt->socket); | 683 | /* |
697 | if (ret) | 684 | * We initialize default socket timing here, because |
698 | goto out_err_7; | 685 | * we are not guaranteed to see a SetIOMap operation at |
686 | * runtime. | ||
687 | */ | ||
688 | skt->ops->set_timing(skt); | ||
699 | 689 | ||
700 | WARN_ON(skt->socket.sock != i); | 690 | ret = skt->ops->hw_init(skt); |
691 | if (ret) | ||
692 | goto out_err_6; | ||
701 | 693 | ||
702 | add_timer(&skt->poll_timer); | 694 | skt->socket.ops = &soc_common_pcmcia_operations; |
695 | skt->socket.features = SS_CAP_STATIC_MAP|SS_CAP_PCCARD; | ||
696 | skt->socket.resource_ops = &pccard_static_ops; | ||
697 | skt->socket.irq_mask = 0; | ||
698 | skt->socket.map_size = PAGE_SIZE; | ||
699 | skt->socket.io_offset = (unsigned long)skt->virt_io; | ||
703 | 700 | ||
704 | ret = device_create_file(&skt->socket.dev, &dev_attr_status); | 701 | skt->status = soc_common_pcmcia_skt_state(skt); |
705 | if (ret) | ||
706 | goto out_err_8; | ||
707 | } | ||
708 | 702 | ||
709 | dev_set_drvdata(dev, sinfo); | 703 | ret = pcmcia_register_socket(&skt->socket); |
710 | ret = 0; | 704 | if (ret) |
711 | goto out; | 705 | goto out_err_7; |
712 | 706 | ||
713 | do { | 707 | add_timer(&skt->poll_timer); |
714 | skt = &sinfo->skt[i]; | 708 | |
709 | mutex_unlock(&soc_pcmcia_sockets_lock); | ||
710 | |||
711 | ret = device_create_file(&skt->socket.dev, &dev_attr_status); | ||
712 | if (ret) | ||
713 | goto out_err_8; | ||
714 | |||
715 | return ret; | ||
715 | 716 | ||
716 | device_remove_file(&skt->socket.dev, &dev_attr_status); | ||
717 | out_err_8: | 717 | out_err_8: |
718 | del_timer_sync(&skt->poll_timer); | 718 | mutex_lock(&soc_pcmcia_sockets_lock); |
719 | pcmcia_unregister_socket(&skt->socket); | 719 | del_timer_sync(&skt->poll_timer); |
720 | pcmcia_unregister_socket(&skt->socket); | ||
720 | 721 | ||
721 | out_err_7: | 722 | out_err_7: |
722 | flush_scheduled_work(); | 723 | flush_scheduled_work(); |
723 | 724 | ||
724 | ops->hw_shutdown(skt); | 725 | skt->ops->hw_shutdown(skt); |
725 | out_err_6: | 726 | out_err_6: |
726 | list_del(&skt->node); | 727 | list_del(&skt->node); |
727 | iounmap(skt->virt_io); | 728 | mutex_unlock(&soc_pcmcia_sockets_lock); |
729 | iounmap(skt->virt_io); | ||
728 | out_err_5: | 730 | out_err_5: |
729 | release_resource(&skt->res_attr); | 731 | release_resource(&skt->res_attr); |
730 | out_err_4: | 732 | out_err_4: |
731 | release_resource(&skt->res_mem); | 733 | release_resource(&skt->res_mem); |
732 | out_err_3: | 734 | out_err_3: |
733 | release_resource(&skt->res_io); | 735 | release_resource(&skt->res_io); |
734 | out_err_2: | 736 | out_err_2: |
735 | release_resource(&skt->res_skt); | 737 | release_resource(&skt->res_skt); |
736 | out_err_1: | 738 | out_err_1: |
737 | i--; | ||
738 | } while (i > 0); | ||
739 | 739 | ||
740 | kfree(sinfo); | ||
741 | |||
742 | out: | ||
743 | mutex_unlock(&soc_pcmcia_sockets_lock); | ||
744 | return ret; | 740 | return ret; |
745 | } | 741 | } |
742 | EXPORT_SYMBOL(soc_pcmcia_add_one); | ||
746 | 743 | ||
747 | int soc_common_drv_pcmcia_remove(struct device *dev) | 744 | MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>"); |
748 | { | 745 | MODULE_DESCRIPTION("Linux PCMCIA Card Services: Common SoC support"); |
749 | struct skt_dev_info *sinfo = dev_get_drvdata(dev); | 746 | MODULE_LICENSE("Dual MPL/GPL"); |
750 | int i; | ||
751 | |||
752 | dev_set_drvdata(dev, NULL); | ||
753 | |||
754 | mutex_lock(&soc_pcmcia_sockets_lock); | ||
755 | for (i = 0; i < sinfo->nskt; i++) { | ||
756 | struct soc_pcmcia_socket *skt = &sinfo->skt[i]; | ||
757 | |||
758 | del_timer_sync(&skt->poll_timer); | ||
759 | |||
760 | pcmcia_unregister_socket(&skt->socket); | ||
761 | |||
762 | flush_scheduled_work(); | ||
763 | |||
764 | skt->ops->hw_shutdown(skt); | ||
765 | |||
766 | soc_common_pcmcia_config_skt(skt, &dead_socket); | ||
767 | |||
768 | list_del(&skt->node); | ||
769 | iounmap(skt->virt_io); | ||
770 | skt->virt_io = NULL; | ||
771 | release_resource(&skt->res_attr); | ||
772 | release_resource(&skt->res_mem); | ||
773 | release_resource(&skt->res_io); | ||
774 | release_resource(&skt->res_skt); | ||
775 | } | ||
776 | if (list_empty(&soc_pcmcia_sockets)) | ||
777 | soc_pcmcia_cpufreq_unregister(); | ||
778 | |||
779 | mutex_unlock(&soc_pcmcia_sockets_lock); | ||
780 | |||
781 | kfree(sinfo); | ||
782 | |||
783 | return 0; | ||
784 | } | ||
785 | EXPORT_SYMBOL(soc_common_drv_pcmcia_remove); | ||
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index 290e143839ee..e40824ce6b0b 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h | |||
@@ -30,14 +30,12 @@ struct soc_pcmcia_socket { | |||
30 | /* | 30 | /* |
31 | * Info from low level handler | 31 | * Info from low level handler |
32 | */ | 32 | */ |
33 | struct device *dev; | ||
34 | unsigned int nr; | 33 | unsigned int nr; |
35 | unsigned int irq; | ||
36 | 34 | ||
37 | /* | 35 | /* |
38 | * Core PCMCIA state | 36 | * Core PCMCIA state |
39 | */ | 37 | */ |
40 | struct pcmcia_low_level *ops; | 38 | const struct pcmcia_low_level *ops; |
41 | 39 | ||
42 | unsigned int status; | 40 | unsigned int status; |
43 | socket_state_t cs_state; | 41 | socket_state_t cs_state; |
@@ -135,10 +133,8 @@ extern void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt, struct pcmcia_ | |||
135 | extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_pcmcia_timing *); | 133 | extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_pcmcia_timing *); |
136 | 134 | ||
137 | 135 | ||
138 | extern struct list_head soc_pcmcia_sockets; | 136 | void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt); |
139 | 137 | int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt); | |
140 | extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, struct skt_dev_info *sinfo); | ||
141 | extern int soc_common_drv_pcmcia_remove(struct device *dev); | ||
142 | 138 | ||
143 | 139 | ||
144 | #ifdef CONFIG_PCMCIA_DEBUG | 140 | #ifdef CONFIG_PCMCIA_DEBUG |
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c index 6918849d511e..12c49ee135e1 100644 --- a/drivers/pcmcia/tcic.c +++ b/drivers/pcmcia/tcic.c | |||
@@ -55,21 +55,6 @@ | |||
55 | #include <pcmcia/ss.h> | 55 | #include <pcmcia/ss.h> |
56 | #include "tcic.h" | 56 | #include "tcic.h" |
57 | 57 | ||
58 | #ifdef CONFIG_PCMCIA_DEBUG | ||
59 | static int pc_debug; | ||
60 | |||
61 | module_param(pc_debug, int, 0644); | ||
62 | static const char version[] = | ||
63 | "tcic.c 1.111 2000/02/15 04:13:12 (David Hinds)"; | ||
64 | |||
65 | #define debug(lvl, fmt, arg...) do { \ | ||
66 | if (pc_debug > (lvl)) \ | ||
67 | printk(KERN_DEBUG "tcic: " fmt , ## arg); \ | ||
68 | } while (0) | ||
69 | #else | ||
70 | #define debug(lvl, fmt, arg...) do { } while (0) | ||
71 | #endif | ||
72 | |||
73 | MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>"); | 58 | MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>"); |
74 | MODULE_DESCRIPTION("Databook TCIC-2 PCMCIA socket driver"); | 59 | MODULE_DESCRIPTION("Databook TCIC-2 PCMCIA socket driver"); |
75 | MODULE_LICENSE("Dual MPL/GPL"); | 60 | MODULE_LICENSE("Dual MPL/GPL"); |
@@ -574,7 +559,7 @@ static irqreturn_t tcic_interrupt(int irq, void *dev) | |||
574 | } else | 559 | } else |
575 | active = 1; | 560 | active = 1; |
576 | 561 | ||
577 | debug(2, "tcic_interrupt()\n"); | 562 | pr_debug("tcic_interrupt()\n"); |
578 | 563 | ||
579 | for (i = 0; i < sockets; i++) { | 564 | for (i = 0; i < sockets; i++) { |
580 | psock = socket_table[i].psock; | 565 | psock = socket_table[i].psock; |
@@ -611,13 +596,13 @@ static irqreturn_t tcic_interrupt(int irq, void *dev) | |||
611 | } | 596 | } |
612 | active = 0; | 597 | active = 0; |
613 | 598 | ||
614 | debug(2, "interrupt done\n"); | 599 | pr_debug("interrupt done\n"); |
615 | return IRQ_HANDLED; | 600 | return IRQ_HANDLED; |
616 | } /* tcic_interrupt */ | 601 | } /* tcic_interrupt */ |
617 | 602 | ||
618 | static void tcic_timer(u_long data) | 603 | static void tcic_timer(u_long data) |
619 | { | 604 | { |
620 | debug(2, "tcic_timer()\n"); | 605 | pr_debug("tcic_timer()\n"); |
621 | tcic_timer_pending = 0; | 606 | tcic_timer_pending = 0; |
622 | tcic_interrupt(0, NULL); | 607 | tcic_interrupt(0, NULL); |
623 | } /* tcic_timer */ | 608 | } /* tcic_timer */ |
@@ -644,7 +629,7 @@ static int tcic_get_status(struct pcmcia_socket *sock, u_int *value) | |||
644 | reg = tcic_getb(TCIC_PWR); | 629 | reg = tcic_getb(TCIC_PWR); |
645 | if (reg & (TCIC_PWR_VCC(psock)|TCIC_PWR_VPP(psock))) | 630 | if (reg & (TCIC_PWR_VCC(psock)|TCIC_PWR_VPP(psock))) |
646 | *value |= SS_POWERON; | 631 | *value |= SS_POWERON; |
647 | debug(1, "GetStatus(%d) = %#2.2x\n", psock, *value); | 632 | dev_dbg(&sock->dev, "GetStatus(%d) = %#2.2x\n", psock, *value); |
648 | return 0; | 633 | return 0; |
649 | } /* tcic_get_status */ | 634 | } /* tcic_get_status */ |
650 | 635 | ||
@@ -656,7 +641,7 @@ static int tcic_set_socket(struct pcmcia_socket *sock, socket_state_t *state) | |||
656 | u_char reg; | 641 | u_char reg; |
657 | u_short scf1, scf2; | 642 | u_short scf1, scf2; |
658 | 643 | ||
659 | debug(1, "SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " | 644 | dev_dbg(&sock->dev, "SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " |
660 | "io_irq %d, csc_mask %#2.2x)\n", psock, state->flags, | 645 | "io_irq %d, csc_mask %#2.2x)\n", psock, state->flags, |
661 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | 646 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); |
662 | tcic_setw(TCIC_ADDR+2, (psock << TCIC_SS_SHFT) | TCIC_ADR2_INDREG); | 647 | tcic_setw(TCIC_ADDR+2, (psock << TCIC_SS_SHFT) | TCIC_ADR2_INDREG); |
@@ -731,7 +716,7 @@ static int tcic_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) | |||
731 | u_int addr; | 716 | u_int addr; |
732 | u_short base, len, ioctl; | 717 | u_short base, len, ioctl; |
733 | 718 | ||
734 | debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, " | 719 | dev_dbg(&sock->dev, "SetIOMap(%d, %d, %#2.2x, %d ns, " |
735 | "%#llx-%#llx)\n", psock, io->map, io->flags, io->speed, | 720 | "%#llx-%#llx)\n", psock, io->map, io->flags, io->speed, |
736 | (unsigned long long)io->start, (unsigned long long)io->stop); | 721 | (unsigned long long)io->start, (unsigned long long)io->stop); |
737 | if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) || | 722 | if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) || |
@@ -768,7 +753,7 @@ static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m | |||
768 | u_short addr, ctl; | 753 | u_short addr, ctl; |
769 | u_long base, len, mmap; | 754 | u_long base, len, mmap; |
770 | 755 | ||
771 | debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, " | 756 | dev_dbg(&sock->dev, "SetMemMap(%d, %d, %#2.2x, %d ns, " |
772 | "%#llx-%#llx, %#x)\n", psock, mem->map, mem->flags, | 757 | "%#llx-%#llx, %#x)\n", psock, mem->map, mem->flags, |
773 | mem->speed, (unsigned long long)mem->res->start, | 758 | mem->speed, (unsigned long long)mem->res->start, |
774 | (unsigned long long)mem->res->end, mem->card_start); | 759 | (unsigned long long)mem->res->end, mem->card_start); |
diff --git a/drivers/pcmcia/topic.h b/drivers/pcmcia/topic.h index edccfa5bb400..615a45a8fe86 100644 --- a/drivers/pcmcia/topic.h +++ b/drivers/pcmcia/topic.h | |||
@@ -114,22 +114,17 @@ static void topic97_zoom_video(struct pcmcia_socket *sock, int onoff) | |||
114 | reg_zv |= TOPIC97_ZV_CONTROL_ENABLE; | 114 | reg_zv |= TOPIC97_ZV_CONTROL_ENABLE; |
115 | config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv); | 115 | config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv); |
116 | 116 | ||
117 | reg = config_readb(socket, TOPIC97_MISC2); | ||
118 | reg |= TOPIC97_MISC2_ZV_ENABLE; | ||
119 | config_writeb(socket, TOPIC97_MISC2, reg); | ||
120 | |||
121 | /* not sure this is needed, doc is unclear */ | ||
122 | #if 0 | ||
123 | reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH); | 117 | reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH); |
124 | reg |= TOPIC97_AVS_AUDIO_CONTROL | TOPIC97_AVS_VIDEO_CONTROL; | 118 | reg |= TOPIC97_AVS_AUDIO_CONTROL | TOPIC97_AVS_VIDEO_CONTROL; |
125 | config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg); | 119 | config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg); |
126 | #endif | 120 | } else { |
127 | } | ||
128 | else { | ||
129 | reg_zv &= ~TOPIC97_ZV_CONTROL_ENABLE; | 121 | reg_zv &= ~TOPIC97_ZV_CONTROL_ENABLE; |
130 | config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv); | 122 | config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv); |
131 | } | ||
132 | 123 | ||
124 | reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH); | ||
125 | reg &= ~(TOPIC97_AVS_AUDIO_CONTROL | TOPIC97_AVS_VIDEO_CONTROL); | ||
126 | config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg); | ||
127 | } | ||
133 | } | 128 | } |
134 | 129 | ||
135 | static int topic97_override(struct yenta_socket *socket) | 130 | static int topic97_override(struct yenta_socket *socket) |
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index 67cde0138061..528733b4a392 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c | |||
@@ -54,15 +54,6 @@ | |||
54 | #include <pcmcia/cistpl.h> | 54 | #include <pcmcia/cistpl.h> |
55 | #include <pcmcia/ds.h> | 55 | #include <pcmcia/ds.h> |
56 | 56 | ||
57 | #ifdef PCMCIA_DEBUG | ||
58 | static int pc_debug = PCMCIA_DEBUG; | ||
59 | module_param(pc_debug, int, 0644); | ||
60 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
61 | static char *version = | ||
62 | "aha152x_cs.c 1.54 2000/06/12 21:27:25 (David Hinds)"; | ||
63 | #else | ||
64 | #define DEBUG(n, args...) | ||
65 | #endif | ||
66 | 57 | ||
67 | /*====================================================================*/ | 58 | /*====================================================================*/ |
68 | 59 | ||
@@ -103,7 +94,7 @@ static int aha152x_probe(struct pcmcia_device *link) | |||
103 | { | 94 | { |
104 | scsi_info_t *info; | 95 | scsi_info_t *info; |
105 | 96 | ||
106 | DEBUG(0, "aha152x_attach()\n"); | 97 | dev_dbg(&link->dev, "aha152x_attach()\n"); |
107 | 98 | ||
108 | /* Create new SCSI device */ | 99 | /* Create new SCSI device */ |
109 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 100 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
@@ -115,7 +106,6 @@ static int aha152x_probe(struct pcmcia_device *link) | |||
115 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 106 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
116 | link->io.IOAddrLines = 10; | 107 | link->io.IOAddrLines = 10; |
117 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 108 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
118 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
119 | link->conf.Attributes = CONF_ENABLE_IRQ; | 109 | link->conf.Attributes = CONF_ENABLE_IRQ; |
120 | link->conf.IntType = INT_MEMORY_AND_IO; | 110 | link->conf.IntType = INT_MEMORY_AND_IO; |
121 | link->conf.Present = PRESENT_OPTION; | 111 | link->conf.Present = PRESENT_OPTION; |
@@ -127,7 +117,7 @@ static int aha152x_probe(struct pcmcia_device *link) | |||
127 | 117 | ||
128 | static void aha152x_detach(struct pcmcia_device *link) | 118 | static void aha152x_detach(struct pcmcia_device *link) |
129 | { | 119 | { |
130 | DEBUG(0, "aha152x_detach(0x%p)\n", link); | 120 | dev_dbg(&link->dev, "aha152x_detach\n"); |
131 | 121 | ||
132 | aha152x_release_cs(link); | 122 | aha152x_release_cs(link); |
133 | 123 | ||
@@ -137,9 +127,6 @@ static void aha152x_detach(struct pcmcia_device *link) | |||
137 | 127 | ||
138 | /*====================================================================*/ | 128 | /*====================================================================*/ |
139 | 129 | ||
140 | #define CS_CHECK(fn, ret) \ | ||
141 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
142 | |||
143 | static int aha152x_config_check(struct pcmcia_device *p_dev, | 130 | static int aha152x_config_check(struct pcmcia_device *p_dev, |
144 | cistpl_cftable_entry_t *cfg, | 131 | cistpl_cftable_entry_t *cfg, |
145 | cistpl_cftable_entry_t *dflt, | 132 | cistpl_cftable_entry_t *dflt, |
@@ -164,19 +151,22 @@ static int aha152x_config_cs(struct pcmcia_device *link) | |||
164 | { | 151 | { |
165 | scsi_info_t *info = link->priv; | 152 | scsi_info_t *info = link->priv; |
166 | struct aha152x_setup s; | 153 | struct aha152x_setup s; |
167 | int last_ret, last_fn; | 154 | int ret; |
168 | struct Scsi_Host *host; | 155 | struct Scsi_Host *host; |
169 | 156 | ||
170 | DEBUG(0, "aha152x_config(0x%p)\n", link); | 157 | dev_dbg(&link->dev, "aha152x_config\n"); |
171 | 158 | ||
172 | last_ret = pcmcia_loop_config(link, aha152x_config_check, NULL); | 159 | ret = pcmcia_loop_config(link, aha152x_config_check, NULL); |
173 | if (last_ret) { | 160 | if (ret) |
174 | cs_error(link, RequestIO, last_ret); | 161 | goto failed; |
175 | goto failed; | ||
176 | } | ||
177 | 162 | ||
178 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 163 | ret = pcmcia_request_irq(link, &link->irq); |
179 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 164 | if (ret) |
165 | goto failed; | ||
166 | |||
167 | ret = pcmcia_request_configuration(link, &link->conf); | ||
168 | if (ret) | ||
169 | goto failed; | ||
180 | 170 | ||
181 | /* Set configuration options for the aha152x driver */ | 171 | /* Set configuration options for the aha152x driver */ |
182 | memset(&s, 0, sizeof(s)); | 172 | memset(&s, 0, sizeof(s)); |
@@ -194,7 +184,7 @@ static int aha152x_config_cs(struct pcmcia_device *link) | |||
194 | host = aha152x_probe_one(&s); | 184 | host = aha152x_probe_one(&s); |
195 | if (host == NULL) { | 185 | if (host == NULL) { |
196 | printk(KERN_INFO "aha152x_cs: no SCSI devices found\n"); | 186 | printk(KERN_INFO "aha152x_cs: no SCSI devices found\n"); |
197 | goto cs_failed; | 187 | goto failed; |
198 | } | 188 | } |
199 | 189 | ||
200 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | 190 | sprintf(info->node.dev_name, "scsi%d", host->host_no); |
@@ -203,8 +193,6 @@ static int aha152x_config_cs(struct pcmcia_device *link) | |||
203 | 193 | ||
204 | return 0; | 194 | return 0; |
205 | 195 | ||
206 | cs_failed: | ||
207 | cs_error(link, last_fn, last_ret); | ||
208 | failed: | 196 | failed: |
209 | aha152x_release_cs(link); | 197 | aha152x_release_cs(link); |
210 | return -ENODEV; | 198 | return -ENODEV; |
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 06254f46a0dd..914040684079 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c | |||
@@ -59,16 +59,6 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>"); | |||
59 | MODULE_DESCRIPTION("Future Domain PCMCIA SCSI driver"); | 59 | MODULE_DESCRIPTION("Future Domain PCMCIA SCSI driver"); |
60 | MODULE_LICENSE("Dual MPL/GPL"); | 60 | MODULE_LICENSE("Dual MPL/GPL"); |
61 | 61 | ||
62 | #ifdef PCMCIA_DEBUG | ||
63 | static int pc_debug = PCMCIA_DEBUG; | ||
64 | module_param(pc_debug, int, 0); | ||
65 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
66 | static char *version = | ||
67 | "fdomain_cs.c 1.47 2001/10/13 00:08:52 (David Hinds)"; | ||
68 | #else | ||
69 | #define DEBUG(n, args...) | ||
70 | #endif | ||
71 | |||
72 | /*====================================================================*/ | 62 | /*====================================================================*/ |
73 | 63 | ||
74 | typedef struct scsi_info_t { | 64 | typedef struct scsi_info_t { |
@@ -86,7 +76,7 @@ static int fdomain_probe(struct pcmcia_device *link) | |||
86 | { | 76 | { |
87 | scsi_info_t *info; | 77 | scsi_info_t *info; |
88 | 78 | ||
89 | DEBUG(0, "fdomain_attach()\n"); | 79 | dev_dbg(&link->dev, "fdomain_attach()\n"); |
90 | 80 | ||
91 | /* Create new SCSI device */ | 81 | /* Create new SCSI device */ |
92 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 82 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
@@ -99,7 +89,6 @@ static int fdomain_probe(struct pcmcia_device *link) | |||
99 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 89 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
100 | link->io.IOAddrLines = 10; | 90 | link->io.IOAddrLines = 10; |
101 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 91 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
102 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
103 | link->conf.Attributes = CONF_ENABLE_IRQ; | 92 | link->conf.Attributes = CONF_ENABLE_IRQ; |
104 | link->conf.IntType = INT_MEMORY_AND_IO; | 93 | link->conf.IntType = INT_MEMORY_AND_IO; |
105 | link->conf.Present = PRESENT_OPTION; | 94 | link->conf.Present = PRESENT_OPTION; |
@@ -111,7 +100,7 @@ static int fdomain_probe(struct pcmcia_device *link) | |||
111 | 100 | ||
112 | static void fdomain_detach(struct pcmcia_device *link) | 101 | static void fdomain_detach(struct pcmcia_device *link) |
113 | { | 102 | { |
114 | DEBUG(0, "fdomain_detach(0x%p)\n", link); | 103 | dev_dbg(&link->dev, "fdomain_detach\n"); |
115 | 104 | ||
116 | fdomain_release(link); | 105 | fdomain_release(link); |
117 | 106 | ||
@@ -120,9 +109,6 @@ static void fdomain_detach(struct pcmcia_device *link) | |||
120 | 109 | ||
121 | /*====================================================================*/ | 110 | /*====================================================================*/ |
122 | 111 | ||
123 | #define CS_CHECK(fn, ret) \ | ||
124 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
125 | |||
126 | static int fdomain_config_check(struct pcmcia_device *p_dev, | 112 | static int fdomain_config_check(struct pcmcia_device *p_dev, |
127 | cistpl_cftable_entry_t *cfg, | 113 | cistpl_cftable_entry_t *cfg, |
128 | cistpl_cftable_entry_t *dflt, | 114 | cistpl_cftable_entry_t *dflt, |
@@ -137,20 +123,22 @@ static int fdomain_config_check(struct pcmcia_device *p_dev, | |||
137 | static int fdomain_config(struct pcmcia_device *link) | 123 | static int fdomain_config(struct pcmcia_device *link) |
138 | { | 124 | { |
139 | scsi_info_t *info = link->priv; | 125 | scsi_info_t *info = link->priv; |
140 | int last_ret, last_fn; | 126 | int ret; |
141 | char str[22]; | 127 | char str[22]; |
142 | struct Scsi_Host *host; | 128 | struct Scsi_Host *host; |
143 | 129 | ||
144 | DEBUG(0, "fdomain_config(0x%p)\n", link); | 130 | dev_dbg(&link->dev, "fdomain_config\n"); |
145 | 131 | ||
146 | last_ret = pcmcia_loop_config(link, fdomain_config_check, NULL); | 132 | ret = pcmcia_loop_config(link, fdomain_config_check, NULL); |
147 | if (last_ret) { | 133 | if (ret) |
148 | cs_error(link, RequestIO, last_ret); | ||
149 | goto failed; | 134 | goto failed; |
150 | } | ||
151 | 135 | ||
152 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 136 | ret = pcmcia_request_irq(link, &link->irq); |
153 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 137 | if (ret) |
138 | goto failed; | ||
139 | ret = pcmcia_request_configuration(link, &link->conf); | ||
140 | if (ret) | ||
141 | goto failed; | ||
154 | 142 | ||
155 | /* A bad hack... */ | 143 | /* A bad hack... */ |
156 | release_region(link->io.BasePort1, link->io.NumPorts1); | 144 | release_region(link->io.BasePort1, link->io.NumPorts1); |
@@ -162,11 +150,11 @@ static int fdomain_config(struct pcmcia_device *link) | |||
162 | host = __fdomain_16x0_detect(&fdomain_driver_template); | 150 | host = __fdomain_16x0_detect(&fdomain_driver_template); |
163 | if (!host) { | 151 | if (!host) { |
164 | printk(KERN_INFO "fdomain_cs: no SCSI devices found\n"); | 152 | printk(KERN_INFO "fdomain_cs: no SCSI devices found\n"); |
165 | goto cs_failed; | 153 | goto failed; |
166 | } | 154 | } |
167 | 155 | ||
168 | if (scsi_add_host(host, NULL)) | 156 | if (scsi_add_host(host, NULL)) |
169 | goto cs_failed; | 157 | goto failed; |
170 | scsi_scan_host(host); | 158 | scsi_scan_host(host); |
171 | 159 | ||
172 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | 160 | sprintf(info->node.dev_name, "scsi%d", host->host_no); |
@@ -175,8 +163,6 @@ static int fdomain_config(struct pcmcia_device *link) | |||
175 | 163 | ||
176 | return 0; | 164 | return 0; |
177 | 165 | ||
178 | cs_failed: | ||
179 | cs_error(link, last_fn, last_ret); | ||
180 | failed: | 166 | failed: |
181 | fdomain_release(link); | 167 | fdomain_release(link); |
182 | return -ENODEV; | 168 | return -ENODEV; |
@@ -188,7 +174,7 @@ static void fdomain_release(struct pcmcia_device *link) | |||
188 | { | 174 | { |
189 | scsi_info_t *info = link->priv; | 175 | scsi_info_t *info = link->priv; |
190 | 176 | ||
191 | DEBUG(0, "fdomain_release(0x%p)\n", link); | 177 | dev_dbg(&link->dev, "fdomain_release\n"); |
192 | 178 | ||
193 | scsi_remove_host(info->host); | 179 | scsi_remove_host(info->host); |
194 | pcmcia_disable_device(link); | 180 | pcmcia_disable_device(link); |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index e32c344d7ad8..c2341af587a3 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -1564,12 +1564,10 @@ static int nsp_cs_probe(struct pcmcia_device *link) | |||
1564 | link->io.IOAddrLines = 10; /* not used */ | 1564 | link->io.IOAddrLines = 10; /* not used */ |
1565 | 1565 | ||
1566 | /* Interrupt setup */ | 1566 | /* Interrupt setup */ |
1567 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; | 1567 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
1568 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
1569 | 1568 | ||
1570 | /* Interrupt handler */ | 1569 | /* Interrupt handler */ |
1571 | link->irq.Handler = &nspintr; | 1570 | link->irq.Handler = &nspintr; |
1572 | link->irq.Instance = info; | ||
1573 | link->irq.Attributes |= IRQF_SHARED; | 1571 | link->irq.Attributes |= IRQF_SHARED; |
1574 | 1572 | ||
1575 | /* General socket configuration */ | 1573 | /* General socket configuration */ |
@@ -1684,10 +1682,10 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev, | |||
1684 | if (cfg_mem->req.Size < 0x1000) | 1682 | if (cfg_mem->req.Size < 0x1000) |
1685 | cfg_mem->req.Size = 0x1000; | 1683 | cfg_mem->req.Size = 0x1000; |
1686 | cfg_mem->req.AccessSpeed = 0; | 1684 | cfg_mem->req.AccessSpeed = 0; |
1687 | if (pcmcia_request_window(&p_dev, &cfg_mem->req, &p_dev->win) != 0) | 1685 | if (pcmcia_request_window(p_dev, &cfg_mem->req, &p_dev->win) != 0) |
1688 | goto next_entry; | 1686 | goto next_entry; |
1689 | map.Page = 0; map.CardOffset = mem->win[0].card_addr; | 1687 | map.Page = 0; map.CardOffset = mem->win[0].card_addr; |
1690 | if (pcmcia_map_mem_page(p_dev->win, &map) != 0) | 1688 | if (pcmcia_map_mem_page(p_dev, p_dev->win, &map) != 0) |
1691 | goto next_entry; | 1689 | goto next_entry; |
1692 | 1690 | ||
1693 | cfg_mem->data->MmioAddress = (unsigned long) ioremap_nocache(cfg_mem->req.Base, cfg_mem->req.Size); | 1691 | cfg_mem->data->MmioAddress = (unsigned long) ioremap_nocache(cfg_mem->req.Base, cfg_mem->req.Size); |
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 20c3e5e6d88a..f85f094870b4 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c | |||
@@ -62,15 +62,6 @@ | |||
62 | 62 | ||
63 | static char qlogic_name[] = "qlogic_cs"; | 63 | static char qlogic_name[] = "qlogic_cs"; |
64 | 64 | ||
65 | #ifdef PCMCIA_DEBUG | ||
66 | static int pc_debug = PCMCIA_DEBUG; | ||
67 | module_param(pc_debug, int, 0644); | ||
68 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
69 | static char *version = "qlogic_cs.c 1.79-ac 2002/10/26 (David Hinds)"; | ||
70 | #else | ||
71 | #define DEBUG(n, args...) | ||
72 | #endif | ||
73 | |||
74 | static struct scsi_host_template qlogicfas_driver_template = { | 65 | static struct scsi_host_template qlogicfas_driver_template = { |
75 | .module = THIS_MODULE, | 66 | .module = THIS_MODULE, |
76 | .name = qlogic_name, | 67 | .name = qlogic_name, |
@@ -159,7 +150,7 @@ static int qlogic_probe(struct pcmcia_device *link) | |||
159 | { | 150 | { |
160 | scsi_info_t *info; | 151 | scsi_info_t *info; |
161 | 152 | ||
162 | DEBUG(0, "qlogic_attach()\n"); | 153 | dev_dbg(&link->dev, "qlogic_attach()\n"); |
163 | 154 | ||
164 | /* Create new SCSI device */ | 155 | /* Create new SCSI device */ |
165 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 156 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
@@ -171,7 +162,6 @@ static int qlogic_probe(struct pcmcia_device *link) | |||
171 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 162 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
172 | link->io.IOAddrLines = 10; | 163 | link->io.IOAddrLines = 10; |
173 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 164 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
174 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
175 | link->conf.Attributes = CONF_ENABLE_IRQ; | 165 | link->conf.Attributes = CONF_ENABLE_IRQ; |
176 | link->conf.IntType = INT_MEMORY_AND_IO; | 166 | link->conf.IntType = INT_MEMORY_AND_IO; |
177 | link->conf.Present = PRESENT_OPTION; | 167 | link->conf.Present = PRESENT_OPTION; |
@@ -183,7 +173,7 @@ static int qlogic_probe(struct pcmcia_device *link) | |||
183 | 173 | ||
184 | static void qlogic_detach(struct pcmcia_device *link) | 174 | static void qlogic_detach(struct pcmcia_device *link) |
185 | { | 175 | { |
186 | DEBUG(0, "qlogic_detach(0x%p)\n", link); | 176 | dev_dbg(&link->dev, "qlogic_detach\n"); |
187 | 177 | ||
188 | qlogic_release(link); | 178 | qlogic_release(link); |
189 | kfree(link->priv); | 179 | kfree(link->priv); |
@@ -192,9 +182,6 @@ static void qlogic_detach(struct pcmcia_device *link) | |||
192 | 182 | ||
193 | /*====================================================================*/ | 183 | /*====================================================================*/ |
194 | 184 | ||
195 | #define CS_CHECK(fn, ret) \ | ||
196 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
197 | |||
198 | static int qlogic_config_check(struct pcmcia_device *p_dev, | 185 | static int qlogic_config_check(struct pcmcia_device *p_dev, |
199 | cistpl_cftable_entry_t *cfg, | 186 | cistpl_cftable_entry_t *cfg, |
200 | cistpl_cftable_entry_t *dflt, | 187 | cistpl_cftable_entry_t *dflt, |
@@ -213,19 +200,22 @@ static int qlogic_config_check(struct pcmcia_device *p_dev, | |||
213 | static int qlogic_config(struct pcmcia_device * link) | 200 | static int qlogic_config(struct pcmcia_device * link) |
214 | { | 201 | { |
215 | scsi_info_t *info = link->priv; | 202 | scsi_info_t *info = link->priv; |
216 | int last_ret, last_fn; | 203 | int ret; |
217 | struct Scsi_Host *host; | 204 | struct Scsi_Host *host; |
218 | 205 | ||
219 | DEBUG(0, "qlogic_config(0x%p)\n", link); | 206 | dev_dbg(&link->dev, "qlogic_config\n"); |
220 | 207 | ||
221 | last_ret = pcmcia_loop_config(link, qlogic_config_check, NULL); | 208 | ret = pcmcia_loop_config(link, qlogic_config_check, NULL); |
222 | if (last_ret) { | 209 | if (ret) |
223 | cs_error(link, RequestIO, last_ret); | 210 | goto failed; |
211 | |||
212 | ret = pcmcia_request_irq(link, &link->irq); | ||
213 | if (ret) | ||
224 | goto failed; | 214 | goto failed; |
225 | } | ||
226 | 215 | ||
227 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 216 | ret = pcmcia_request_configuration(link, &link->conf); |
228 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 217 | if (ret) |
218 | goto failed; | ||
229 | 219 | ||
230 | if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) { | 220 | if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) { |
231 | /* set ATAcmd */ | 221 | /* set ATAcmd */ |
@@ -244,7 +234,7 @@ static int qlogic_config(struct pcmcia_device * link) | |||
244 | 234 | ||
245 | if (!host) { | 235 | if (!host) { |
246 | printk(KERN_INFO "%s: no SCSI devices found\n", qlogic_name); | 236 | printk(KERN_INFO "%s: no SCSI devices found\n", qlogic_name); |
247 | goto cs_failed; | 237 | goto failed; |
248 | } | 238 | } |
249 | 239 | ||
250 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | 240 | sprintf(info->node.dev_name, "scsi%d", host->host_no); |
@@ -253,12 +243,9 @@ static int qlogic_config(struct pcmcia_device * link) | |||
253 | 243 | ||
254 | return 0; | 244 | return 0; |
255 | 245 | ||
256 | cs_failed: | ||
257 | cs_error(link, last_fn, last_ret); | ||
258 | pcmcia_disable_device(link); | ||
259 | failed: | 246 | failed: |
247 | pcmcia_disable_device(link); | ||
260 | return -ENODEV; | 248 | return -ENODEV; |
261 | |||
262 | } /* qlogic_config */ | 249 | } /* qlogic_config */ |
263 | 250 | ||
264 | /*====================================================================*/ | 251 | /*====================================================================*/ |
@@ -267,7 +254,7 @@ static void qlogic_release(struct pcmcia_device *link) | |||
267 | { | 254 | { |
268 | scsi_info_t *info = link->priv; | 255 | scsi_info_t *info = link->priv; |
269 | 256 | ||
270 | DEBUG(0, "qlogic_release(0x%p)\n", link); | 257 | dev_dbg(&link->dev, "qlogic_release\n"); |
271 | 258 | ||
272 | scsi_remove_host(info->host); | 259 | scsi_remove_host(info->host); |
273 | 260 | ||
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index b330c11a1752..e7564d8f0cbf 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
@@ -77,17 +77,6 @@ | |||
77 | #include <pcmcia/ds.h> | 77 | #include <pcmcia/ds.h> |
78 | #include <pcmcia/ciscode.h> | 78 | #include <pcmcia/ciscode.h> |
79 | 79 | ||
80 | /* ================================================================== */ | ||
81 | |||
82 | #ifdef PCMCIA_DEBUG | ||
83 | static int pc_debug = PCMCIA_DEBUG; | ||
84 | module_param(pc_debug, int, 0); | ||
85 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
86 | static char *version = | ||
87 | "sym53c500_cs.c 0.9c 2004/10/27 (Bob Tracy)"; | ||
88 | #else | ||
89 | #define DEBUG(n, args...) | ||
90 | #endif | ||
91 | 80 | ||
92 | /* ================================================================== */ | 81 | /* ================================================================== */ |
93 | 82 | ||
@@ -525,7 +514,7 @@ SYM53C500_release(struct pcmcia_device *link) | |||
525 | struct scsi_info_t *info = link->priv; | 514 | struct scsi_info_t *info = link->priv; |
526 | struct Scsi_Host *shost = info->host; | 515 | struct Scsi_Host *shost = info->host; |
527 | 516 | ||
528 | DEBUG(0, "SYM53C500_release(0x%p)\n", link); | 517 | dev_dbg(&link->dev, "SYM53C500_release\n"); |
529 | 518 | ||
530 | /* | 519 | /* |
531 | * Do this before releasing/freeing resources. | 520 | * Do this before releasing/freeing resources. |
@@ -697,9 +686,6 @@ static struct scsi_host_template sym53c500_driver_template = { | |||
697 | .shost_attrs = SYM53C500_shost_attrs | 686 | .shost_attrs = SYM53C500_shost_attrs |
698 | }; | 687 | }; |
699 | 688 | ||
700 | #define CS_CHECK(fn, ret) \ | ||
701 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
702 | |||
703 | static int SYM53C500_config_check(struct pcmcia_device *p_dev, | 689 | static int SYM53C500_config_check(struct pcmcia_device *p_dev, |
704 | cistpl_cftable_entry_t *cfg, | 690 | cistpl_cftable_entry_t *cfg, |
705 | cistpl_cftable_entry_t *dflt, | 691 | cistpl_cftable_entry_t *dflt, |
@@ -719,24 +705,27 @@ static int | |||
719 | SYM53C500_config(struct pcmcia_device *link) | 705 | SYM53C500_config(struct pcmcia_device *link) |
720 | { | 706 | { |
721 | struct scsi_info_t *info = link->priv; | 707 | struct scsi_info_t *info = link->priv; |
722 | int last_ret, last_fn; | 708 | int ret; |
723 | int irq_level, port_base; | 709 | int irq_level, port_base; |
724 | struct Scsi_Host *host; | 710 | struct Scsi_Host *host; |
725 | struct scsi_host_template *tpnt = &sym53c500_driver_template; | 711 | struct scsi_host_template *tpnt = &sym53c500_driver_template; |
726 | struct sym53c500_data *data; | 712 | struct sym53c500_data *data; |
727 | 713 | ||
728 | DEBUG(0, "SYM53C500_config(0x%p)\n", link); | 714 | dev_dbg(&link->dev, "SYM53C500_config\n"); |
729 | 715 | ||
730 | info->manf_id = link->manf_id; | 716 | info->manf_id = link->manf_id; |
731 | 717 | ||
732 | last_ret = pcmcia_loop_config(link, SYM53C500_config_check, NULL); | 718 | ret = pcmcia_loop_config(link, SYM53C500_config_check, NULL); |
733 | if (last_ret) { | 719 | if (ret) |
734 | cs_error(link, RequestIO, last_ret); | 720 | goto failed; |
721 | |||
722 | ret = pcmcia_request_irq(link, &link->irq); | ||
723 | if (ret) | ||
735 | goto failed; | 724 | goto failed; |
736 | } | ||
737 | 725 | ||
738 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 726 | ret = pcmcia_request_configuration(link, &link->conf); |
739 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 727 | if (ret) |
728 | goto failed; | ||
740 | 729 | ||
741 | /* | 730 | /* |
742 | * That's the trouble with copying liberally from another driver. | 731 | * That's the trouble with copying liberally from another driver. |
@@ -824,8 +813,6 @@ err_release: | |||
824 | printk(KERN_INFO "sym53c500_cs: no SCSI devices found\n"); | 813 | printk(KERN_INFO "sym53c500_cs: no SCSI devices found\n"); |
825 | return -ENODEV; | 814 | return -ENODEV; |
826 | 815 | ||
827 | cs_failed: | ||
828 | cs_error(link, last_fn, last_ret); | ||
829 | failed: | 816 | failed: |
830 | SYM53C500_release(link); | 817 | SYM53C500_release(link); |
831 | return -ENODEV; | 818 | return -ENODEV; |
@@ -855,7 +842,7 @@ static int sym53c500_resume(struct pcmcia_device *link) | |||
855 | static void | 842 | static void |
856 | SYM53C500_detach(struct pcmcia_device *link) | 843 | SYM53C500_detach(struct pcmcia_device *link) |
857 | { | 844 | { |
858 | DEBUG(0, "SYM53C500_detach(0x%p)\n", link); | 845 | dev_dbg(&link->dev, "SYM53C500_detach\n"); |
859 | 846 | ||
860 | SYM53C500_release(link); | 847 | SYM53C500_release(link); |
861 | 848 | ||
@@ -868,7 +855,7 @@ SYM53C500_probe(struct pcmcia_device *link) | |||
868 | { | 855 | { |
869 | struct scsi_info_t *info; | 856 | struct scsi_info_t *info; |
870 | 857 | ||
871 | DEBUG(0, "SYM53C500_attach()\n"); | 858 | dev_dbg(&link->dev, "SYM53C500_attach()\n"); |
872 | 859 | ||
873 | /* Create new SCSI device */ | 860 | /* Create new SCSI device */ |
874 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 861 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
@@ -880,7 +867,6 @@ SYM53C500_probe(struct pcmcia_device *link) | |||
880 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 867 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
881 | link->io.IOAddrLines = 10; | 868 | link->io.IOAddrLines = 10; |
882 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 869 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
883 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
884 | link->conf.Attributes = CONF_ENABLE_IRQ; | 870 | link->conf.Attributes = CONF_ENABLE_IRQ; |
885 | link->conf.IntType = INT_MEMORY_AND_IO; | 871 | link->conf.IntType = INT_MEMORY_AND_IO; |
886 | 872 | ||
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 7c7914f5fa02..fc413f0f8dd2 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -54,14 +54,6 @@ | |||
54 | 54 | ||
55 | #include "8250.h" | 55 | #include "8250.h" |
56 | 56 | ||
57 | #ifdef PCMCIA_DEBUG | ||
58 | static int pc_debug = PCMCIA_DEBUG; | ||
59 | module_param(pc_debug, int, 0644); | ||
60 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
61 | static char *version = "serial_cs.c 1.134 2002/05/04 05:48:53 (David Hinds)"; | ||
62 | #else | ||
63 | #define DEBUG(n, args...) | ||
64 | #endif | ||
65 | 57 | ||
66 | /*====================================================================*/ | 58 | /*====================================================================*/ |
67 | 59 | ||
@@ -121,24 +113,20 @@ static void quirk_setup_brainboxes_0104(struct pcmcia_device *link, struct uart_ | |||
121 | static int quirk_post_ibm(struct pcmcia_device *link) | 113 | static int quirk_post_ibm(struct pcmcia_device *link) |
122 | { | 114 | { |
123 | conf_reg_t reg = { 0, CS_READ, 0x800, 0 }; | 115 | conf_reg_t reg = { 0, CS_READ, 0x800, 0 }; |
124 | int last_ret, last_fn; | 116 | int ret; |
117 | |||
118 | ret = pcmcia_access_configuration_register(link, ®); | ||
119 | if (ret) | ||
120 | goto failed; | ||
125 | 121 | ||
126 | last_ret = pcmcia_access_configuration_register(link, ®); | ||
127 | if (last_ret) { | ||
128 | last_fn = AccessConfigurationRegister; | ||
129 | goto cs_failed; | ||
130 | } | ||
131 | reg.Action = CS_WRITE; | 122 | reg.Action = CS_WRITE; |
132 | reg.Value = reg.Value | 1; | 123 | reg.Value = reg.Value | 1; |
133 | last_ret = pcmcia_access_configuration_register(link, ®); | 124 | ret = pcmcia_access_configuration_register(link, ®); |
134 | if (last_ret) { | 125 | if (ret) |
135 | last_fn = AccessConfigurationRegister; | 126 | goto failed; |
136 | goto cs_failed; | ||
137 | } | ||
138 | return 0; | 127 | return 0; |
139 | 128 | ||
140 | cs_failed: | 129 | failed: |
141 | cs_error(link, last_fn, last_ret); | ||
142 | return -ENODEV; | 130 | return -ENODEV; |
143 | } | 131 | } |
144 | 132 | ||
@@ -283,7 +271,7 @@ static void serial_remove(struct pcmcia_device *link) | |||
283 | struct serial_info *info = link->priv; | 271 | struct serial_info *info = link->priv; |
284 | int i; | 272 | int i; |
285 | 273 | ||
286 | DEBUG(0, "serial_release(0x%p)\n", link); | 274 | dev_dbg(&link->dev, "serial_release\n"); |
287 | 275 | ||
288 | /* | 276 | /* |
289 | * Recheck to see if the device is still configured. | 277 | * Recheck to see if the device is still configured. |
@@ -334,7 +322,7 @@ static int serial_probe(struct pcmcia_device *link) | |||
334 | { | 322 | { |
335 | struct serial_info *info; | 323 | struct serial_info *info; |
336 | 324 | ||
337 | DEBUG(0, "serial_attach()\n"); | 325 | dev_dbg(&link->dev, "serial_attach()\n"); |
338 | 326 | ||
339 | /* Create new serial device */ | 327 | /* Create new serial device */ |
340 | info = kzalloc(sizeof (*info), GFP_KERNEL); | 328 | info = kzalloc(sizeof (*info), GFP_KERNEL); |
@@ -346,7 +334,6 @@ static int serial_probe(struct pcmcia_device *link) | |||
346 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 334 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
347 | link->io.NumPorts1 = 8; | 335 | link->io.NumPorts1 = 8; |
348 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 336 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
349 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
350 | link->conf.Attributes = CONF_ENABLE_IRQ; | 337 | link->conf.Attributes = CONF_ENABLE_IRQ; |
351 | if (do_sound) { | 338 | if (do_sound) { |
352 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 339 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
@@ -370,7 +357,7 @@ static void serial_detach(struct pcmcia_device *link) | |||
370 | { | 357 | { |
371 | struct serial_info *info = link->priv; | 358 | struct serial_info *info = link->priv; |
372 | 359 | ||
373 | DEBUG(0, "serial_detach(0x%p)\n", link); | 360 | dev_dbg(&link->dev, "serial_detach\n"); |
374 | 361 | ||
375 | /* | 362 | /* |
376 | * Ensure any outstanding scheduled tasks are completed. | 363 | * Ensure any outstanding scheduled tasks are completed. |
@@ -399,7 +386,7 @@ static int setup_serial(struct pcmcia_device *handle, struct serial_info * info, | |||
399 | port.irq = irq; | 386 | port.irq = irq; |
400 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ; | 387 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ; |
401 | port.uartclk = 1843200; | 388 | port.uartclk = 1843200; |
402 | port.dev = &handle_to_dev(handle); | 389 | port.dev = &handle->dev; |
403 | if (buggy_uart) | 390 | if (buggy_uart) |
404 | port.flags |= UPF_BUGGY_UART; | 391 | port.flags |= UPF_BUGGY_UART; |
405 | 392 | ||
@@ -426,21 +413,6 @@ static int setup_serial(struct pcmcia_device *handle, struct serial_info * info, | |||
426 | 413 | ||
427 | /*====================================================================*/ | 414 | /*====================================================================*/ |
428 | 415 | ||
429 | static int | ||
430 | first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse) | ||
431 | { | ||
432 | int i; | ||
433 | i = pcmcia_get_first_tuple(handle, tuple); | ||
434 | if (i != 0) | ||
435 | return i; | ||
436 | i = pcmcia_get_tuple_data(handle, tuple); | ||
437 | if (i != 0) | ||
438 | return i; | ||
439 | return pcmcia_parse_tuple(tuple, parse); | ||
440 | } | ||
441 | |||
442 | /*====================================================================*/ | ||
443 | |||
444 | static int simple_config_check(struct pcmcia_device *p_dev, | 416 | static int simple_config_check(struct pcmcia_device *p_dev, |
445 | cistpl_cftable_entry_t *cf, | 417 | cistpl_cftable_entry_t *cf, |
446 | cistpl_cftable_entry_t *dflt, | 418 | cistpl_cftable_entry_t *dflt, |
@@ -522,15 +494,13 @@ static int simple_config(struct pcmcia_device *link) | |||
522 | 494 | ||
523 | printk(KERN_NOTICE | 495 | printk(KERN_NOTICE |
524 | "serial_cs: no usable port range found, giving up\n"); | 496 | "serial_cs: no usable port range found, giving up\n"); |
525 | cs_error(link, RequestIO, i); | ||
526 | return -1; | 497 | return -1; |
527 | 498 | ||
528 | found_port: | 499 | found_port: |
529 | i = pcmcia_request_irq(link, &link->irq); | 500 | i = pcmcia_request_irq(link, &link->irq); |
530 | if (i != 0) { | 501 | if (i != 0) |
531 | cs_error(link, RequestIRQ, i); | ||
532 | link->irq.AssignedIRQ = 0; | 502 | link->irq.AssignedIRQ = 0; |
533 | } | 503 | |
534 | if (info->multi && (info->manfid == MANFID_3COM)) | 504 | if (info->multi && (info->manfid == MANFID_3COM)) |
535 | link->conf.ConfigIndex &= ~(0x08); | 505 | link->conf.ConfigIndex &= ~(0x08); |
536 | 506 | ||
@@ -541,10 +511,8 @@ found_port: | |||
541 | info->quirk->config(link); | 511 | info->quirk->config(link); |
542 | 512 | ||
543 | i = pcmcia_request_configuration(link, &link->conf); | 513 | i = pcmcia_request_configuration(link, &link->conf); |
544 | if (i != 0) { | 514 | if (i != 0) |
545 | cs_error(link, RequestConfiguration, i); | ||
546 | return -1; | 515 | return -1; |
547 | } | ||
548 | return setup_serial(link, info, link->io.BasePort1, link->irq.AssignedIRQ); | 516 | return setup_serial(link, info, link->io.BasePort1, link->irq.AssignedIRQ); |
549 | } | 517 | } |
550 | 518 | ||
@@ -613,7 +581,6 @@ static int multi_config(struct pcmcia_device *link) | |||
613 | /* FIXME: comment does not fit, error handling does not fit */ | 581 | /* FIXME: comment does not fit, error handling does not fit */ |
614 | printk(KERN_NOTICE | 582 | printk(KERN_NOTICE |
615 | "serial_cs: no usable port range found, giving up\n"); | 583 | "serial_cs: no usable port range found, giving up\n"); |
616 | cs_error(link, RequestIRQ, i); | ||
617 | link->irq.AssignedIRQ = 0; | 584 | link->irq.AssignedIRQ = 0; |
618 | } | 585 | } |
619 | 586 | ||
@@ -624,10 +591,8 @@ static int multi_config(struct pcmcia_device *link) | |||
624 | info->quirk->config(link); | 591 | info->quirk->config(link); |
625 | 592 | ||
626 | i = pcmcia_request_configuration(link, &link->conf); | 593 | i = pcmcia_request_configuration(link, &link->conf); |
627 | if (i != 0) { | 594 | if (i != 0) |
628 | cs_error(link, RequestConfiguration, i); | ||
629 | return -ENODEV; | 595 | return -ENODEV; |
630 | } | ||
631 | 596 | ||
632 | /* The Oxford Semiconductor OXCF950 cards are in fact single-port: | 597 | /* The Oxford Semiconductor OXCF950 cards are in fact single-port: |
633 | * 8 registers are for the UART, the others are extra registers. | 598 | * 8 registers are for the UART, the others are extra registers. |
@@ -665,6 +630,25 @@ static int multi_config(struct pcmcia_device *link) | |||
665 | return 0; | 630 | return 0; |
666 | } | 631 | } |
667 | 632 | ||
633 | static int serial_check_for_multi(struct pcmcia_device *p_dev, | ||
634 | cistpl_cftable_entry_t *cf, | ||
635 | cistpl_cftable_entry_t *dflt, | ||
636 | unsigned int vcc, | ||
637 | void *priv_data) | ||
638 | { | ||
639 | struct serial_info *info = p_dev->priv; | ||
640 | |||
641 | if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0)) | ||
642 | info->multi = cf->io.win[0].len >> 3; | ||
643 | |||
644 | if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) && | ||
645 | (cf->io.win[1].len == 8)) | ||
646 | info->multi = 2; | ||
647 | |||
648 | return 0; /* break */ | ||
649 | } | ||
650 | |||
651 | |||
668 | /*====================================================================== | 652 | /*====================================================================== |
669 | 653 | ||
670 | serial_config() is scheduled to run after a CARD_INSERTION event | 654 | serial_config() is scheduled to run after a CARD_INSERTION event |
@@ -676,46 +660,14 @@ static int multi_config(struct pcmcia_device *link) | |||
676 | static int serial_config(struct pcmcia_device * link) | 660 | static int serial_config(struct pcmcia_device * link) |
677 | { | 661 | { |
678 | struct serial_info *info = link->priv; | 662 | struct serial_info *info = link->priv; |
679 | struct serial_cfg_mem *cfg_mem; | 663 | int i; |
680 | tuple_t *tuple; | ||
681 | u_char *buf; | ||
682 | cisparse_t *parse; | ||
683 | cistpl_cftable_entry_t *cf; | ||
684 | int i, last_ret, last_fn; | ||
685 | |||
686 | DEBUG(0, "serial_config(0x%p)\n", link); | ||
687 | |||
688 | cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL); | ||
689 | if (!cfg_mem) | ||
690 | goto failed; | ||
691 | 664 | ||
692 | tuple = &cfg_mem->tuple; | 665 | dev_dbg(&link->dev, "serial_config\n"); |
693 | parse = &cfg_mem->parse; | ||
694 | cf = &parse->cftable_entry; | ||
695 | buf = cfg_mem->buf; | ||
696 | |||
697 | tuple->TupleData = (cisdata_t *) buf; | ||
698 | tuple->TupleOffset = 0; | ||
699 | tuple->TupleDataMax = 255; | ||
700 | tuple->Attributes = 0; | ||
701 | |||
702 | /* Get configuration register information */ | ||
703 | tuple->DesiredTuple = CISTPL_CONFIG; | ||
704 | last_ret = first_tuple(link, tuple, parse); | ||
705 | if (last_ret != 0) { | ||
706 | last_fn = ParseTuple; | ||
707 | goto cs_failed; | ||
708 | } | ||
709 | link->conf.ConfigBase = parse->config.base; | ||
710 | link->conf.Present = parse->config.rmask[0]; | ||
711 | 666 | ||
712 | /* Is this a compliant multifunction card? */ | 667 | /* Is this a compliant multifunction card? */ |
713 | tuple->DesiredTuple = CISTPL_LONGLINK_MFC; | 668 | info->multi = (link->socket->functions > 1); |
714 | tuple->Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK; | ||
715 | info->multi = (first_tuple(link, tuple, parse) == 0); | ||
716 | 669 | ||
717 | /* Is this a multiport card? */ | 670 | /* Is this a multiport card? */ |
718 | tuple->DesiredTuple = CISTPL_MANFID; | ||
719 | info->manfid = link->manf_id; | 671 | info->manfid = link->manf_id; |
720 | info->prodid = link->card_id; | 672 | info->prodid = link->card_id; |
721 | 673 | ||
@@ -730,20 +682,11 @@ static int serial_config(struct pcmcia_device * link) | |||
730 | 682 | ||
731 | /* Another check for dual-serial cards: look for either serial or | 683 | /* Another check for dual-serial cards: look for either serial or |
732 | multifunction cards that ask for appropriate IO port ranges */ | 684 | multifunction cards that ask for appropriate IO port ranges */ |
733 | tuple->DesiredTuple = CISTPL_FUNCID; | ||
734 | if ((info->multi == 0) && | 685 | if ((info->multi == 0) && |
735 | (link->has_func_id) && | 686 | (link->has_func_id) && |
736 | ((link->func_id == CISTPL_FUNCID_MULTI) || | 687 | ((link->func_id == CISTPL_FUNCID_MULTI) || |
737 | (link->func_id == CISTPL_FUNCID_SERIAL))) { | 688 | (link->func_id == CISTPL_FUNCID_SERIAL))) |
738 | tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY; | 689 | pcmcia_loop_config(link, serial_check_for_multi, info); |
739 | if (first_tuple(link, tuple, parse) == 0) { | ||
740 | if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0)) | ||
741 | info->multi = cf->io.win[0].len >> 3; | ||
742 | if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) && | ||
743 | (cf->io.win[1].len == 8)) | ||
744 | info->multi = 2; | ||
745 | } | ||
746 | } | ||
747 | 690 | ||
748 | /* | 691 | /* |
749 | * Apply any multi-port quirk. | 692 | * Apply any multi-port quirk. |
@@ -768,14 +711,10 @@ static int serial_config(struct pcmcia_device * link) | |||
768 | goto failed; | 711 | goto failed; |
769 | 712 | ||
770 | link->dev_node = &info->node[0]; | 713 | link->dev_node = &info->node[0]; |
771 | kfree(cfg_mem); | ||
772 | return 0; | 714 | return 0; |
773 | 715 | ||
774 | cs_failed: | ||
775 | cs_error(link, last_fn, last_ret); | ||
776 | failed: | 716 | failed: |
777 | serial_remove(link); | 717 | serial_remove(link); |
778 | kfree(cfg_mem); | ||
779 | return -ENODEV; | 718 | return -ENODEV; |
780 | } | 719 | } |
781 | 720 | ||
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c index 100e7a5c5ea1..e72f4046a5e0 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c | |||
@@ -617,136 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(const u16 *sprom, size_t size) | |||
617 | } \ | 617 | } \ |
618 | } while (0) | 618 | } while (0) |
619 | 619 | ||
620 | int ssb_pcmcia_get_invariants(struct ssb_bus *bus, | 620 | static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev, |
621 | struct ssb_init_invariants *iv) | 621 | tuple_t *tuple, |
622 | void *priv) | ||
622 | { | 623 | { |
623 | tuple_t tuple; | 624 | struct ssb_sprom *sprom = priv; |
624 | int res; | 625 | |
625 | unsigned char buf[32]; | 626 | if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID) |
627 | return -EINVAL; | ||
628 | if (tuple->TupleDataLen != ETH_ALEN + 2) | ||
629 | return -EINVAL; | ||
630 | if (tuple->TupleData[1] != ETH_ALEN) | ||
631 | return -EINVAL; | ||
632 | memcpy(sprom->il0mac, &tuple->TupleData[2], ETH_ALEN); | ||
633 | return 0; | ||
634 | }; | ||
635 | |||
636 | static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev, | ||
637 | tuple_t *tuple, | ||
638 | void *priv) | ||
639 | { | ||
640 | struct ssb_init_invariants *iv = priv; | ||
626 | struct ssb_sprom *sprom = &iv->sprom; | 641 | struct ssb_sprom *sprom = &iv->sprom; |
627 | struct ssb_boardinfo *bi = &iv->boardinfo; | 642 | struct ssb_boardinfo *bi = &iv->boardinfo; |
628 | const char *error_description; | 643 | const char *error_description; |
629 | 644 | ||
645 | GOTO_ERROR_ON(tuple->TupleDataLen < 1, "VEN tpl < 1"); | ||
646 | switch (tuple->TupleData[0]) { | ||
647 | case SSB_PCMCIA_CIS_ID: | ||
648 | GOTO_ERROR_ON((tuple->TupleDataLen != 5) && | ||
649 | (tuple->TupleDataLen != 7), | ||
650 | "id tpl size"); | ||
651 | bi->vendor = tuple->TupleData[1] | | ||
652 | ((u16)tuple->TupleData[2] << 8); | ||
653 | break; | ||
654 | case SSB_PCMCIA_CIS_BOARDREV: | ||
655 | GOTO_ERROR_ON(tuple->TupleDataLen != 2, | ||
656 | "boardrev tpl size"); | ||
657 | sprom->board_rev = tuple->TupleData[1]; | ||
658 | break; | ||
659 | case SSB_PCMCIA_CIS_PA: | ||
660 | GOTO_ERROR_ON((tuple->TupleDataLen != 9) && | ||
661 | (tuple->TupleDataLen != 10), | ||
662 | "pa tpl size"); | ||
663 | sprom->pa0b0 = tuple->TupleData[1] | | ||
664 | ((u16)tuple->TupleData[2] << 8); | ||
665 | sprom->pa0b1 = tuple->TupleData[3] | | ||
666 | ((u16)tuple->TupleData[4] << 8); | ||
667 | sprom->pa0b2 = tuple->TupleData[5] | | ||
668 | ((u16)tuple->TupleData[6] << 8); | ||
669 | sprom->itssi_a = tuple->TupleData[7]; | ||
670 | sprom->itssi_bg = tuple->TupleData[7]; | ||
671 | sprom->maxpwr_a = tuple->TupleData[8]; | ||
672 | sprom->maxpwr_bg = tuple->TupleData[8]; | ||
673 | break; | ||
674 | case SSB_PCMCIA_CIS_OEMNAME: | ||
675 | /* We ignore this. */ | ||
676 | break; | ||
677 | case SSB_PCMCIA_CIS_CCODE: | ||
678 | GOTO_ERROR_ON(tuple->TupleDataLen != 2, | ||
679 | "ccode tpl size"); | ||
680 | sprom->country_code = tuple->TupleData[1]; | ||
681 | break; | ||
682 | case SSB_PCMCIA_CIS_ANTENNA: | ||
683 | GOTO_ERROR_ON(tuple->TupleDataLen != 2, | ||
684 | "ant tpl size"); | ||
685 | sprom->ant_available_a = tuple->TupleData[1]; | ||
686 | sprom->ant_available_bg = tuple->TupleData[1]; | ||
687 | break; | ||
688 | case SSB_PCMCIA_CIS_ANTGAIN: | ||
689 | GOTO_ERROR_ON(tuple->TupleDataLen != 2, | ||
690 | "antg tpl size"); | ||
691 | sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1]; | ||
692 | sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1]; | ||
693 | sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1]; | ||
694 | sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1]; | ||
695 | sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1]; | ||
696 | sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1]; | ||
697 | sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1]; | ||
698 | sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1]; | ||
699 | break; | ||
700 | case SSB_PCMCIA_CIS_BFLAGS: | ||
701 | GOTO_ERROR_ON((tuple->TupleDataLen != 3) && | ||
702 | (tuple->TupleDataLen != 5), | ||
703 | "bfl tpl size"); | ||
704 | sprom->boardflags_lo = tuple->TupleData[1] | | ||
705 | ((u16)tuple->TupleData[2] << 8); | ||
706 | break; | ||
707 | case SSB_PCMCIA_CIS_LEDS: | ||
708 | GOTO_ERROR_ON(tuple->TupleDataLen != 5, | ||
709 | "leds tpl size"); | ||
710 | sprom->gpio0 = tuple->TupleData[1]; | ||
711 | sprom->gpio1 = tuple->TupleData[2]; | ||
712 | sprom->gpio2 = tuple->TupleData[3]; | ||
713 | sprom->gpio3 = tuple->TupleData[4]; | ||
714 | break; | ||
715 | } | ||
716 | return -ENOSPC; /* continue with next entry */ | ||
717 | |||
718 | error: | ||
719 | ssb_printk(KERN_ERR PFX | ||
720 | "PCMCIA: Failed to fetch device invariants: %s\n", | ||
721 | error_description); | ||
722 | return -ENODEV; | ||
723 | } | ||
724 | |||
725 | |||
726 | int ssb_pcmcia_get_invariants(struct ssb_bus *bus, | ||
727 | struct ssb_init_invariants *iv) | ||
728 | { | ||
729 | struct ssb_sprom *sprom = &iv->sprom; | ||
730 | int res; | ||
731 | |||
630 | memset(sprom, 0xFF, sizeof(*sprom)); | 732 | memset(sprom, 0xFF, sizeof(*sprom)); |
631 | sprom->revision = 1; | 733 | sprom->revision = 1; |
632 | sprom->boardflags_lo = 0; | 734 | sprom->boardflags_lo = 0; |
633 | sprom->boardflags_hi = 0; | 735 | sprom->boardflags_hi = 0; |
634 | 736 | ||
635 | /* First fetch the MAC address. */ | 737 | /* First fetch the MAC address. */ |
636 | memset(&tuple, 0, sizeof(tuple)); | 738 | res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE, |
637 | tuple.DesiredTuple = CISTPL_FUNCE; | 739 | ssb_pcmcia_get_mac, sprom); |
638 | tuple.TupleData = buf; | 740 | if (res != 0) { |
639 | tuple.TupleDataMax = sizeof(buf); | 741 | ssb_printk(KERN_ERR PFX |
640 | res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple); | 742 | "PCMCIA: Failed to fetch MAC address\n"); |
641 | GOTO_ERROR_ON(res != 0, "MAC first tpl"); | 743 | return -ENODEV; |
642 | res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple); | ||
643 | GOTO_ERROR_ON(res != 0, "MAC first tpl data"); | ||
644 | while (1) { | ||
645 | GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1"); | ||
646 | if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID) | ||
647 | break; | ||
648 | res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple); | ||
649 | GOTO_ERROR_ON(res != 0, "MAC next tpl"); | ||
650 | res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple); | ||
651 | GOTO_ERROR_ON(res != 0, "MAC next tpl data"); | ||
652 | } | 744 | } |
653 | GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size"); | ||
654 | memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN); | ||
655 | 745 | ||
656 | /* Fetch the vendor specific tuples. */ | 746 | /* Fetch the vendor specific tuples. */ |
657 | memset(&tuple, 0, sizeof(tuple)); | 747 | res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS, |
658 | tuple.DesiredTuple = SSB_PCMCIA_CIS; | 748 | ssb_pcmcia_do_get_invariants, sprom); |
659 | tuple.TupleData = buf; | 749 | if ((res == 0) || (res == -ENOSPC)) |
660 | tuple.TupleDataMax = sizeof(buf); | 750 | return 0; |
661 | res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple); | ||
662 | GOTO_ERROR_ON(res != 0, "VEN first tpl"); | ||
663 | res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple); | ||
664 | GOTO_ERROR_ON(res != 0, "VEN first tpl data"); | ||
665 | while (1) { | ||
666 | GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1"); | ||
667 | switch (tuple.TupleData[0]) { | ||
668 | case SSB_PCMCIA_CIS_ID: | ||
669 | GOTO_ERROR_ON((tuple.TupleDataLen != 5) && | ||
670 | (tuple.TupleDataLen != 7), | ||
671 | "id tpl size"); | ||
672 | bi->vendor = tuple.TupleData[1] | | ||
673 | ((u16)tuple.TupleData[2] << 8); | ||
674 | break; | ||
675 | case SSB_PCMCIA_CIS_BOARDREV: | ||
676 | GOTO_ERROR_ON(tuple.TupleDataLen != 2, | ||
677 | "boardrev tpl size"); | ||
678 | sprom->board_rev = tuple.TupleData[1]; | ||
679 | break; | ||
680 | case SSB_PCMCIA_CIS_PA: | ||
681 | GOTO_ERROR_ON((tuple.TupleDataLen != 9) && | ||
682 | (tuple.TupleDataLen != 10), | ||
683 | "pa tpl size"); | ||
684 | sprom->pa0b0 = tuple.TupleData[1] | | ||
685 | ((u16)tuple.TupleData[2] << 8); | ||
686 | sprom->pa0b1 = tuple.TupleData[3] | | ||
687 | ((u16)tuple.TupleData[4] << 8); | ||
688 | sprom->pa0b2 = tuple.TupleData[5] | | ||
689 | ((u16)tuple.TupleData[6] << 8); | ||
690 | sprom->itssi_a = tuple.TupleData[7]; | ||
691 | sprom->itssi_bg = tuple.TupleData[7]; | ||
692 | sprom->maxpwr_a = tuple.TupleData[8]; | ||
693 | sprom->maxpwr_bg = tuple.TupleData[8]; | ||
694 | break; | ||
695 | case SSB_PCMCIA_CIS_OEMNAME: | ||
696 | /* We ignore this. */ | ||
697 | break; | ||
698 | case SSB_PCMCIA_CIS_CCODE: | ||
699 | GOTO_ERROR_ON(tuple.TupleDataLen != 2, | ||
700 | "ccode tpl size"); | ||
701 | sprom->country_code = tuple.TupleData[1]; | ||
702 | break; | ||
703 | case SSB_PCMCIA_CIS_ANTENNA: | ||
704 | GOTO_ERROR_ON(tuple.TupleDataLen != 2, | ||
705 | "ant tpl size"); | ||
706 | sprom->ant_available_a = tuple.TupleData[1]; | ||
707 | sprom->ant_available_bg = tuple.TupleData[1]; | ||
708 | break; | ||
709 | case SSB_PCMCIA_CIS_ANTGAIN: | ||
710 | GOTO_ERROR_ON(tuple.TupleDataLen != 2, | ||
711 | "antg tpl size"); | ||
712 | sprom->antenna_gain.ghz24.a0 = tuple.TupleData[1]; | ||
713 | sprom->antenna_gain.ghz24.a1 = tuple.TupleData[1]; | ||
714 | sprom->antenna_gain.ghz24.a2 = tuple.TupleData[1]; | ||
715 | sprom->antenna_gain.ghz24.a3 = tuple.TupleData[1]; | ||
716 | sprom->antenna_gain.ghz5.a0 = tuple.TupleData[1]; | ||
717 | sprom->antenna_gain.ghz5.a1 = tuple.TupleData[1]; | ||
718 | sprom->antenna_gain.ghz5.a2 = tuple.TupleData[1]; | ||
719 | sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1]; | ||
720 | break; | ||
721 | case SSB_PCMCIA_CIS_BFLAGS: | ||
722 | GOTO_ERROR_ON((tuple.TupleDataLen != 3) && | ||
723 | (tuple.TupleDataLen != 5), | ||
724 | "bfl tpl size"); | ||
725 | sprom->boardflags_lo = tuple.TupleData[1] | | ||
726 | ((u16)tuple.TupleData[2] << 8); | ||
727 | break; | ||
728 | case SSB_PCMCIA_CIS_LEDS: | ||
729 | GOTO_ERROR_ON(tuple.TupleDataLen != 5, | ||
730 | "leds tpl size"); | ||
731 | sprom->gpio0 = tuple.TupleData[1]; | ||
732 | sprom->gpio1 = tuple.TupleData[2]; | ||
733 | sprom->gpio2 = tuple.TupleData[3]; | ||
734 | sprom->gpio3 = tuple.TupleData[4]; | ||
735 | break; | ||
736 | } | ||
737 | res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple); | ||
738 | if (res == -ENOSPC) | ||
739 | break; | ||
740 | GOTO_ERROR_ON(res != 0, "VEN next tpl"); | ||
741 | res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple); | ||
742 | GOTO_ERROR_ON(res != 0, "VEN next tpl data"); | ||
743 | } | ||
744 | 751 | ||
745 | return 0; | ||
746 | error: | ||
747 | ssb_printk(KERN_ERR PFX | 752 | ssb_printk(KERN_ERR PFX |
748 | "PCMCIA: Failed to fetch device invariants: %s\n", | 753 | "PCMCIA: Failed to fetch device invariants\n"); |
749 | error_description); | ||
750 | return -ENODEV; | 754 | return -ENODEV; |
751 | } | 755 | } |
752 | 756 | ||
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 80c0df8656f3..39923cb388be 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c | |||
@@ -141,37 +141,14 @@ static int das16cs_timer_insn_config(struct comedi_device *dev, | |||
141 | struct comedi_insn *insn, | 141 | struct comedi_insn *insn, |
142 | unsigned int *data); | 142 | unsigned int *data); |
143 | 143 | ||
144 | static int get_prodid(struct comedi_device *dev, struct pcmcia_device *link) | ||
145 | { | ||
146 | tuple_t tuple; | ||
147 | u_short buf[128]; | ||
148 | int prodid = 0; | ||
149 | |||
150 | tuple.TupleData = (cisdata_t *) buf; | ||
151 | tuple.TupleOffset = 0; | ||
152 | tuple.TupleDataMax = 255; | ||
153 | tuple.DesiredTuple = CISTPL_MANFID; | ||
154 | tuple.Attributes = TUPLE_RETURN_COMMON; | ||
155 | if ((pcmcia_get_first_tuple(link, &tuple) == 0) && | ||
156 | (pcmcia_get_tuple_data(link, &tuple) == 0)) { | ||
157 | prodid = le16_to_cpu(buf[1]); | ||
158 | } | ||
159 | |||
160 | return prodid; | ||
161 | } | ||
162 | |||
163 | static const struct das16cs_board *das16cs_probe(struct comedi_device *dev, | 144 | static const struct das16cs_board *das16cs_probe(struct comedi_device *dev, |
164 | struct pcmcia_device *link) | 145 | struct pcmcia_device *link) |
165 | { | 146 | { |
166 | int id; | ||
167 | int i; | 147 | int i; |
168 | 148 | ||
169 | id = get_prodid(dev, link); | ||
170 | |||
171 | for (i = 0; i < n_boards; i++) { | 149 | for (i = 0; i < n_boards; i++) { |
172 | if (das16cs_boards[i].device_id == id) { | 150 | if (das16cs_boards[i].device_id == link->card_id) |
173 | return das16cs_boards + i; | 151 | return das16cs_boards + i; |
174 | } | ||
175 | } | 152 | } |
176 | 153 | ||
177 | printk("unknown board!\n"); | 154 | printk("unknown board!\n"); |
@@ -660,27 +637,8 @@ static int das16cs_timer_insn_config(struct comedi_device *dev, | |||
660 | 637 | ||
661 | ======================================================================*/ | 638 | ======================================================================*/ |
662 | 639 | ||
663 | /* | ||
664 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
665 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
666 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
667 | be present but disabled -- but it can then be enabled for specific | ||
668 | modules at load time with a 'pc_debug=#' option to insmod. | ||
669 | */ | ||
670 | #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) | 640 | #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) |
671 | 641 | ||
672 | #ifdef PCMCIA_DEBUG | ||
673 | static int pc_debug = PCMCIA_DEBUG; | ||
674 | module_param(pc_debug, int, 0644); | ||
675 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
676 | static char *version = | ||
677 | "cb_das16_cs.c pcmcia code (David Schleef), modified from dummy_cs.c 1.31 2001/08/24 12:13:13 (David Hinds)"; | ||
678 | #else | ||
679 | #define DEBUG(n, args...) | ||
680 | #endif | ||
681 | |||
682 | /*====================================================================*/ | ||
683 | |||
684 | static void das16cs_pcmcia_config(struct pcmcia_device *link); | 642 | static void das16cs_pcmcia_config(struct pcmcia_device *link); |
685 | static void das16cs_pcmcia_release(struct pcmcia_device *link); | 643 | static void das16cs_pcmcia_release(struct pcmcia_device *link); |
686 | static int das16cs_pcmcia_suspend(struct pcmcia_device *p_dev); | 644 | static int das16cs_pcmcia_suspend(struct pcmcia_device *p_dev); |
@@ -733,7 +691,7 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link) | |||
733 | { | 691 | { |
734 | struct local_info_t *local; | 692 | struct local_info_t *local; |
735 | 693 | ||
736 | DEBUG(0, "das16cs_pcmcia_attach()\n"); | 694 | dev_dbg(&link->dev, "das16cs_pcmcia_attach()\n"); |
737 | 695 | ||
738 | /* Allocate space for private device-specific data */ | 696 | /* Allocate space for private device-specific data */ |
739 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); | 697 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); |
@@ -745,7 +703,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link) | |||
745 | /* Initialize the pcmcia_device structure */ | 703 | /* Initialize the pcmcia_device structure */ |
746 | /* Interrupt setup */ | 704 | /* Interrupt setup */ |
747 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 705 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
748 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
749 | link->irq.Handler = NULL; | 706 | link->irq.Handler = NULL; |
750 | 707 | ||
751 | link->conf.Attributes = 0; | 708 | link->conf.Attributes = 0; |
@@ -760,7 +717,7 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link) | |||
760 | 717 | ||
761 | static void das16cs_pcmcia_detach(struct pcmcia_device *link) | 718 | static void das16cs_pcmcia_detach(struct pcmcia_device *link) |
762 | { | 719 | { |
763 | DEBUG(0, "das16cs_pcmcia_detach(0x%p)\n", link); | 720 | dev_dbg(&link->dev, "das16cs_pcmcia_detach\n"); |
764 | 721 | ||
765 | if (link->dev_node) { | 722 | if (link->dev_node) { |
766 | ((struct local_info_t *)link->priv)->stop = 1; | 723 | ((struct local_info_t *)link->priv)->stop = 1; |
@@ -771,118 +728,55 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link) | |||
771 | kfree(link->priv); | 728 | kfree(link->priv); |
772 | } /* das16cs_pcmcia_detach */ | 729 | } /* das16cs_pcmcia_detach */ |
773 | 730 | ||
774 | static void das16cs_pcmcia_config(struct pcmcia_device *link) | ||
775 | { | ||
776 | struct local_info_t *dev = link->priv; | ||
777 | tuple_t tuple; | ||
778 | cisparse_t parse; | ||
779 | int last_fn, last_ret; | ||
780 | u_char buf[64]; | ||
781 | cistpl_cftable_entry_t dflt = { 0 }; | ||
782 | 731 | ||
783 | DEBUG(0, "das16cs_pcmcia_config(0x%p)\n", link); | 732 | static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev, |
784 | 733 | cistpl_cftable_entry_t *cfg, | |
785 | /* | 734 | cistpl_cftable_entry_t *dflt, |
786 | This reads the card's CONFIG tuple to find its configuration | 735 | unsigned int vcc, |
787 | registers. | 736 | void *priv_data) |
788 | */ | 737 | { |
789 | tuple.DesiredTuple = CISTPL_CONFIG; | 738 | if (cfg->index == 0) |
790 | tuple.Attributes = 0; | 739 | return -EINVAL; |
791 | tuple.TupleData = buf; | ||
792 | tuple.TupleDataMax = sizeof(buf); | ||
793 | tuple.TupleOffset = 0; | ||
794 | |||
795 | last_fn = GetFirstTuple; | ||
796 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
797 | if (last_ret != 0) | ||
798 | goto cs_failed; | ||
799 | |||
800 | last_fn = GetTupleData; | ||
801 | last_ret = pcmcia_get_tuple_data(link, &tuple); | ||
802 | if (last_ret != 0) | ||
803 | goto cs_failed; | ||
804 | |||
805 | last_fn = ParseTuple; | ||
806 | last_ret = pcmcia_parse_tuple(&tuple, &parse); | ||
807 | if (last_ret != 0) | ||
808 | goto cs_failed; | ||
809 | |||
810 | link->conf.ConfigBase = parse.config.base; | ||
811 | link->conf.Present = parse.config.rmask[0]; | ||
812 | 740 | ||
813 | /* | 741 | /* Do we need to allocate an interrupt? */ |
814 | In this loop, we scan the CIS for configuration table entries, | 742 | if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1) |
815 | each of which describes a valid card configuration, including | 743 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; |
816 | voltage, IO window, memory window, and interrupt settings. | 744 | |
817 | 745 | /* IO window settings */ | |
818 | We make no assumptions about the card to be configured: we use | 746 | p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; |
819 | just the information available in the CIS. In an ideal world, | 747 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { |
820 | this would work for any PCMCIA card, but it requires a complete | 748 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; |
821 | and accurate CIS. In practice, a driver usually "knows" most of | 749 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
822 | these things without consulting the CIS, and most client drivers | 750 | if (!(io->flags & CISTPL_IO_8BIT)) |
823 | will only use the CIS to fill in implementation-defined details. | 751 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
824 | */ | 752 | if (!(io->flags & CISTPL_IO_16BIT)) |
825 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 753 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
826 | last_fn = GetFirstTuple; | 754 | p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; |
827 | 755 | p_dev->io.BasePort1 = io->win[0].base; | |
828 | last_ret = pcmcia_get_first_tuple(link, &tuple); | 756 | p_dev->io.NumPorts1 = io->win[0].len; |
829 | if (last_ret) | 757 | if (io->nwin > 1) { |
830 | goto cs_failed; | 758 | p_dev->io.Attributes2 = p_dev->io.Attributes1; |
831 | 759 | p_dev->io.BasePort2 = io->win[1].base; | |
832 | while (1) { | 760 | p_dev->io.NumPorts2 = io->win[1].len; |
833 | cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); | ||
834 | if (pcmcia_get_tuple_data(link, &tuple)) | ||
835 | goto next_entry; | ||
836 | if (pcmcia_parse_tuple(&tuple, &parse)) | ||
837 | goto next_entry; | ||
838 | |||
839 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | ||
840 | dflt = *cfg; | ||
841 | if (cfg->index == 0) | ||
842 | goto next_entry; | ||
843 | link->conf.ConfigIndex = cfg->index; | ||
844 | |||
845 | /* Does this card need audio output? */ | ||
846 | /* if (cfg->flags & CISTPL_CFTABLE_AUDIO) { | ||
847 | link->conf.Attributes |= CONF_ENABLE_SPKR; | ||
848 | link->conf.Status = CCSR_AUDIO_ENA; | ||
849 | } | ||
850 | */ | ||
851 | /* Do we need to allocate an interrupt? */ | ||
852 | if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) | ||
853 | link->conf.Attributes |= CONF_ENABLE_IRQ; | ||
854 | |||
855 | /* IO window settings */ | ||
856 | link->io.NumPorts1 = link->io.NumPorts2 = 0; | ||
857 | if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { | ||
858 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; | ||
859 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
860 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
861 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
862 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
863 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
864 | link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
865 | link->io.BasePort1 = io->win[0].base; | ||
866 | link->io.NumPorts1 = io->win[0].len; | ||
867 | if (io->nwin > 1) { | ||
868 | link->io.Attributes2 = link->io.Attributes1; | ||
869 | link->io.BasePort2 = io->win[1].base; | ||
870 | link->io.NumPorts2 = io->win[1].len; | ||
871 | } | ||
872 | /* This reserves IO space but doesn't actually enable it */ | ||
873 | if (pcmcia_request_io(link, &link->io)) | ||
874 | goto next_entry; | ||
875 | } | 761 | } |
762 | /* This reserves IO space but doesn't actually enable it */ | ||
763 | return pcmcia_request_io(p_dev, &p_dev->io); | ||
764 | } | ||
876 | 765 | ||
877 | /* If we got this far, we're cool! */ | 766 | return 0; |
878 | break; | 767 | } |
768 | |||
769 | static void das16cs_pcmcia_config(struct pcmcia_device *link) | ||
770 | { | ||
771 | struct local_info_t *dev = link->priv; | ||
772 | int ret; | ||
879 | 773 | ||
880 | next_entry: | 774 | dev_dbg(&link->dev, "das16cs_pcmcia_config\n"); |
881 | last_fn = GetNextTuple; | ||
882 | 775 | ||
883 | last_ret = pcmcia_get_next_tuple(link, &tuple); | 776 | ret = pcmcia_loop_config(link, das16cs_pcmcia_config_loop, NULL); |
884 | if (last_ret) | 777 | if (ret) { |
885 | goto cs_failed; | 778 | dev_warn(&link->dev, "no configuration found\n"); |
779 | goto failed; | ||
886 | } | 780 | } |
887 | 781 | ||
888 | /* | 782 | /* |
@@ -891,21 +785,18 @@ next_entry: | |||
891 | irq structure is initialized. | 785 | irq structure is initialized. |
892 | */ | 786 | */ |
893 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 787 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
894 | last_fn = RequestIRQ; | 788 | ret = pcmcia_request_irq(link, &link->irq); |
895 | 789 | if (ret) | |
896 | last_ret = pcmcia_request_irq(link, &link->irq); | 790 | goto failed; |
897 | if (last_ret) | ||
898 | goto cs_failed; | ||
899 | } | 791 | } |
900 | /* | 792 | /* |
901 | This actually configures the PCMCIA socket -- setting up | 793 | This actually configures the PCMCIA socket -- setting up |
902 | the I/O windows and the interrupt mapping, and putting the | 794 | the I/O windows and the interrupt mapping, and putting the |
903 | card and host interface into "Memory and IO" mode. | 795 | card and host interface into "Memory and IO" mode. |
904 | */ | 796 | */ |
905 | last_fn = RequestConfiguration; | 797 | ret = pcmcia_request_configuration(link, &link->conf); |
906 | last_ret = pcmcia_request_configuration(link, &link->conf); | 798 | if (ret) |
907 | if (last_ret) | 799 | goto failed; |
908 | goto cs_failed; | ||
909 | 800 | ||
910 | /* | 801 | /* |
911 | At this point, the dev_node_t structure(s) need to be | 802 | At this point, the dev_node_t structure(s) need to be |
@@ -930,14 +821,13 @@ next_entry: | |||
930 | 821 | ||
931 | return; | 822 | return; |
932 | 823 | ||
933 | cs_failed: | 824 | failed: |
934 | cs_error(link, last_fn, last_ret); | ||
935 | das16cs_pcmcia_release(link); | 825 | das16cs_pcmcia_release(link); |
936 | } /* das16cs_pcmcia_config */ | 826 | } /* das16cs_pcmcia_config */ |
937 | 827 | ||
938 | static void das16cs_pcmcia_release(struct pcmcia_device *link) | 828 | static void das16cs_pcmcia_release(struct pcmcia_device *link) |
939 | { | 829 | { |
940 | DEBUG(0, "das16cs_pcmcia_release(0x%p)\n", link); | 830 | dev_dbg(&link->dev, "das16cs_pcmcia_release\n"); |
941 | pcmcia_disable_device(link); | 831 | pcmcia_disable_device(link); |
942 | } /* das16cs_pcmcia_release */ | 832 | } /* das16cs_pcmcia_release */ |
943 | 833 | ||
@@ -983,14 +873,13 @@ struct pcmcia_driver das16cs_driver = { | |||
983 | 873 | ||
984 | static int __init init_das16cs_pcmcia_cs(void) | 874 | static int __init init_das16cs_pcmcia_cs(void) |
985 | { | 875 | { |
986 | DEBUG(0, "%s\n", version); | ||
987 | pcmcia_register_driver(&das16cs_driver); | 876 | pcmcia_register_driver(&das16cs_driver); |
988 | return 0; | 877 | return 0; |
989 | } | 878 | } |
990 | 879 | ||
991 | static void __exit exit_das16cs_pcmcia_cs(void) | 880 | static void __exit exit_das16cs_pcmcia_cs(void) |
992 | { | 881 | { |
993 | DEBUG(0, "das16cs_pcmcia_cs: unloading\n"); | 882 | pr_debug("das16cs_pcmcia_cs: unloading\n"); |
994 | pcmcia_unregister_driver(&das16cs_driver); | 883 | pcmcia_unregister_driver(&das16cs_driver); |
995 | } | 884 | } |
996 | 885 | ||
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c index 9cab21eaaa18..9b945e5fdd32 100644 --- a/drivers/staging/comedi/drivers/das08_cs.c +++ b/drivers/staging/comedi/drivers/das08_cs.c | |||
@@ -110,25 +110,6 @@ static int das08_cs_attach(struct comedi_device *dev, | |||
110 | 110 | ||
111 | ======================================================================*/ | 111 | ======================================================================*/ |
112 | 112 | ||
113 | /* | ||
114 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
115 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
116 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
117 | be present but disabled -- but it can then be enabled for specific | ||
118 | modules at load time with a 'pc_debug=#' option to insmod. | ||
119 | */ | ||
120 | |||
121 | #ifdef PCMCIA_DEBUG | ||
122 | static int pc_debug = PCMCIA_DEBUG; | ||
123 | module_param(pc_debug, int, 0644); | ||
124 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
125 | static const char *version = | ||
126 | "das08.c pcmcia code (Frank Hess), modified from dummy_cs.c 1.31 2001/08/24 12:13:13 (David Hinds)"; | ||
127 | #else | ||
128 | #define DEBUG(n, args...) | ||
129 | #endif | ||
130 | |||
131 | /*====================================================================*/ | ||
132 | static void das08_pcmcia_config(struct pcmcia_device *link); | 113 | static void das08_pcmcia_config(struct pcmcia_device *link); |
133 | static void das08_pcmcia_release(struct pcmcia_device *link); | 114 | static void das08_pcmcia_release(struct pcmcia_device *link); |
134 | static int das08_pcmcia_suspend(struct pcmcia_device *p_dev); | 115 | static int das08_pcmcia_suspend(struct pcmcia_device *p_dev); |
@@ -181,7 +162,7 @@ static int das08_pcmcia_attach(struct pcmcia_device *link) | |||
181 | { | 162 | { |
182 | struct local_info_t *local; | 163 | struct local_info_t *local; |
183 | 164 | ||
184 | DEBUG(0, "das08_pcmcia_attach()\n"); | 165 | dev_dbg(&link->dev, "das08_pcmcia_attach()\n"); |
185 | 166 | ||
186 | /* Allocate space for private device-specific data */ | 167 | /* Allocate space for private device-specific data */ |
187 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); | 168 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); |
@@ -192,7 +173,6 @@ static int das08_pcmcia_attach(struct pcmcia_device *link) | |||
192 | 173 | ||
193 | /* Interrupt setup */ | 174 | /* Interrupt setup */ |
194 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 175 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
195 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
196 | link->irq.Handler = NULL; | 176 | link->irq.Handler = NULL; |
197 | 177 | ||
198 | /* | 178 | /* |
@@ -224,7 +204,7 @@ static int das08_pcmcia_attach(struct pcmcia_device *link) | |||
224 | static void das08_pcmcia_detach(struct pcmcia_device *link) | 204 | static void das08_pcmcia_detach(struct pcmcia_device *link) |
225 | { | 205 | { |
226 | 206 | ||
227 | DEBUG(0, "das08_pcmcia_detach(0x%p)\n", link); | 207 | dev_dbg(&link->dev, "das08_pcmcia_detach\n"); |
228 | 208 | ||
229 | if (link->dev_node) { | 209 | if (link->dev_node) { |
230 | ((struct local_info_t *)link->priv)->stop = 1; | 210 | ((struct local_info_t *)link->priv)->stop = 1; |
@@ -237,6 +217,44 @@ static void das08_pcmcia_detach(struct pcmcia_device *link) | |||
237 | 217 | ||
238 | } /* das08_pcmcia_detach */ | 218 | } /* das08_pcmcia_detach */ |
239 | 219 | ||
220 | |||
221 | static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev, | ||
222 | cistpl_cftable_entry_t *cfg, | ||
223 | cistpl_cftable_entry_t *dflt, | ||
224 | unsigned int vcc, | ||
225 | void *priv_data) | ||
226 | { | ||
227 | if (cfg->index == 0) | ||
228 | return -ENODEV; | ||
229 | |||
230 | /* Do we need to allocate an interrupt? */ | ||
231 | if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1) | ||
232 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; | ||
233 | |||
234 | /* IO window settings */ | ||
235 | p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; | ||
236 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { | ||
237 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; | ||
238 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
239 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
240 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
241 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
242 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
243 | p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
244 | p_dev->io.BasePort1 = io->win[0].base; | ||
245 | p_dev->io.NumPorts1 = io->win[0].len; | ||
246 | if (io->nwin > 1) { | ||
247 | p_dev->io.Attributes2 = p_dev->io.Attributes1; | ||
248 | p_dev->io.BasePort2 = io->win[1].base; | ||
249 | p_dev->io.NumPorts2 = io->win[1].len; | ||
250 | } | ||
251 | /* This reserves IO space but doesn't actually enable it */ | ||
252 | return pcmcia_request_io(p_dev, &p_dev->io); | ||
253 | } | ||
254 | return 0; | ||
255 | } | ||
256 | |||
257 | |||
240 | /*====================================================================== | 258 | /*====================================================================== |
241 | 259 | ||
242 | das08_pcmcia_config() is scheduled to run after a CARD_INSERTION event | 260 | das08_pcmcia_config() is scheduled to run after a CARD_INSERTION event |
@@ -248,128 +266,20 @@ static void das08_pcmcia_detach(struct pcmcia_device *link) | |||
248 | static void das08_pcmcia_config(struct pcmcia_device *link) | 266 | static void das08_pcmcia_config(struct pcmcia_device *link) |
249 | { | 267 | { |
250 | struct local_info_t *dev = link->priv; | 268 | struct local_info_t *dev = link->priv; |
251 | tuple_t tuple; | 269 | int ret; |
252 | cisparse_t parse; | ||
253 | int last_fn, last_ret; | ||
254 | u_char buf[64]; | ||
255 | cistpl_cftable_entry_t dflt = { 0 }; | ||
256 | |||
257 | DEBUG(0, "das08_pcmcia_config(0x%p)\n", link); | ||
258 | |||
259 | /* | ||
260 | This reads the card's CONFIG tuple to find its configuration | ||
261 | registers. | ||
262 | */ | ||
263 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
264 | tuple.Attributes = 0; | ||
265 | tuple.TupleData = buf; | ||
266 | tuple.TupleDataMax = sizeof(buf); | ||
267 | tuple.TupleOffset = 0; | ||
268 | last_fn = GetFirstTuple; | ||
269 | |||
270 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
271 | if (last_ret) | ||
272 | goto cs_failed; | ||
273 | |||
274 | last_fn = GetTupleData; | ||
275 | |||
276 | last_ret = pcmcia_get_tuple_data(link, &tuple); | ||
277 | if (last_ret) | ||
278 | goto cs_failed; | ||
279 | |||
280 | last_fn = ParseTuple; | ||
281 | |||
282 | last_ret = pcmcia_parse_tuple(&tuple, &parse); | ||
283 | if (last_ret) | ||
284 | goto cs_failed; | ||
285 | |||
286 | link->conf.ConfigBase = parse.config.base; | ||
287 | link->conf.Present = parse.config.rmask[0]; | ||
288 | |||
289 | /* | ||
290 | In this loop, we scan the CIS for configuration table entries, | ||
291 | each of which describes a valid card configuration, including | ||
292 | voltage, IO window, memory window, and interrupt settings. | ||
293 | |||
294 | We make no assumptions about the card to be configured: we use | ||
295 | just the information available in the CIS. In an ideal world, | ||
296 | this would work for any PCMCIA card, but it requires a complete | ||
297 | and accurate CIS. In practice, a driver usually "knows" most of | ||
298 | these things without consulting the CIS, and most client drivers | ||
299 | will only use the CIS to fill in implementation-defined details. | ||
300 | */ | ||
301 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
302 | last_fn = GetFirstTuple; | ||
303 | |||
304 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
305 | if (last_ret) | ||
306 | goto cs_failed; | ||
307 | |||
308 | while (1) { | ||
309 | cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); | ||
310 | |||
311 | last_ret = pcmcia_get_tuple_data(link, &tuple); | ||
312 | if (last_ret) | ||
313 | goto next_entry; | ||
314 | |||
315 | last_ret = pcmcia_parse_tuple(&tuple, &parse); | ||
316 | if (last_ret) | ||
317 | goto next_entry; | ||
318 | |||
319 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | ||
320 | dflt = *cfg; | ||
321 | if (cfg->index == 0) | ||
322 | goto next_entry; | ||
323 | link->conf.ConfigIndex = cfg->index; | ||
324 | |||
325 | /* Does this card need audio output? */ | ||
326 | /* if (cfg->flags & CISTPL_CFTABLE_AUDIO) { | ||
327 | link->conf.Attributes |= CONF_ENABLE_SPKR; | ||
328 | link->conf.Status = CCSR_AUDIO_ENA; | ||
329 | } | ||
330 | */ | ||
331 | /* Do we need to allocate an interrupt? */ | ||
332 | if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) | ||
333 | link->conf.Attributes |= CONF_ENABLE_IRQ; | ||
334 | |||
335 | /* IO window settings */ | ||
336 | link->io.NumPorts1 = link->io.NumPorts2 = 0; | ||
337 | if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { | ||
338 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; | ||
339 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
340 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
341 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
342 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
343 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
344 | link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
345 | link->io.BasePort1 = io->win[0].base; | ||
346 | link->io.NumPorts1 = io->win[0].len; | ||
347 | if (io->nwin > 1) { | ||
348 | link->io.Attributes2 = link->io.Attributes1; | ||
349 | link->io.BasePort2 = io->win[1].base; | ||
350 | link->io.NumPorts2 = io->win[1].len; | ||
351 | } | ||
352 | /* This reserves IO space but doesn't actually enable it */ | ||
353 | if (pcmcia_request_io(link, &link->io) != 0) | ||
354 | goto next_entry; | ||
355 | } | ||
356 | |||
357 | /* If we got this far, we're cool! */ | ||
358 | break; | ||
359 | 270 | ||
360 | next_entry: | 271 | dev_dbg(&link->dev, "das08_pcmcia_config\n"); |
361 | last_fn = GetNextTuple; | ||
362 | 272 | ||
363 | last_ret = pcmcia_get_next_tuple(link, &tuple); | 273 | ret = pcmcia_loop_config(link, das08_pcmcia_config_loop, NULL); |
364 | if (last_ret) | 274 | if (ret) { |
365 | goto cs_failed; | 275 | dev_warn(&link->dev, "no configuration found\n"); |
276 | goto failed; | ||
366 | } | 277 | } |
367 | 278 | ||
368 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 279 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
369 | last_fn = RequestIRQ; | 280 | ret = pcmcia_request_irq(link, &link->irq); |
370 | last_ret = pcmcia_request_irq(link, &link->irq); | 281 | if (ret) |
371 | if (last_ret) | 282 | goto failed; |
372 | goto cs_failed; | ||
373 | } | 283 | } |
374 | 284 | ||
375 | /* | 285 | /* |
@@ -377,10 +287,9 @@ next_entry: | |||
377 | the I/O windows and the interrupt mapping, and putting the | 287 | the I/O windows and the interrupt mapping, and putting the |
378 | card and host interface into "Memory and IO" mode. | 288 | card and host interface into "Memory and IO" mode. |
379 | */ | 289 | */ |
380 | last_fn = RequestConfiguration; | 290 | ret = pcmcia_request_configuration(link, &link->conf); |
381 | last_ret = pcmcia_request_configuration(link, &link->conf); | 291 | if (ret) |
382 | if (last_ret) | 292 | goto failed; |
383 | goto cs_failed; | ||
384 | 293 | ||
385 | /* | 294 | /* |
386 | At this point, the dev_node_t structure(s) need to be | 295 | At this point, the dev_node_t structure(s) need to be |
@@ -405,8 +314,7 @@ next_entry: | |||
405 | 314 | ||
406 | return; | 315 | return; |
407 | 316 | ||
408 | cs_failed: | 317 | failed: |
409 | cs_error(link, last_fn, last_ret); | ||
410 | das08_pcmcia_release(link); | 318 | das08_pcmcia_release(link); |
411 | 319 | ||
412 | } /* das08_pcmcia_config */ | 320 | } /* das08_pcmcia_config */ |
@@ -421,7 +329,7 @@ cs_failed: | |||
421 | 329 | ||
422 | static void das08_pcmcia_release(struct pcmcia_device *link) | 330 | static void das08_pcmcia_release(struct pcmcia_device *link) |
423 | { | 331 | { |
424 | DEBUG(0, "das08_pcmcia_release(0x%p)\n", link); | 332 | dev_dbg(&link->dev, "das08_pcmcia_release\n"); |
425 | pcmcia_disable_device(link); | 333 | pcmcia_disable_device(link); |
426 | } /* das08_pcmcia_release */ | 334 | } /* das08_pcmcia_release */ |
427 | 335 | ||
@@ -477,14 +385,13 @@ struct pcmcia_driver das08_cs_driver = { | |||
477 | 385 | ||
478 | static int __init init_das08_pcmcia_cs(void) | 386 | static int __init init_das08_pcmcia_cs(void) |
479 | { | 387 | { |
480 | DEBUG(0, "%s\n", version); | ||
481 | pcmcia_register_driver(&das08_cs_driver); | 388 | pcmcia_register_driver(&das08_cs_driver); |
482 | return 0; | 389 | return 0; |
483 | } | 390 | } |
484 | 391 | ||
485 | static void __exit exit_das08_pcmcia_cs(void) | 392 | static void __exit exit_das08_pcmcia_cs(void) |
486 | { | 393 | { |
487 | DEBUG(0, "das08_pcmcia_cs: unloading\n"); | 394 | pr_debug("das08_pcmcia_cs: unloading\n"); |
488 | pcmcia_unregister_driver(&das08_cs_driver); | 395 | pcmcia_unregister_driver(&das08_cs_driver); |
489 | } | 396 | } |
490 | 397 | ||
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index ec31a3970664..ef5e1183d47d 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c | |||
@@ -436,25 +436,7 @@ static int dio700_detach(struct comedi_device *dev) | |||
436 | return 0; | 436 | return 0; |
437 | }; | 437 | }; |
438 | 438 | ||
439 | /* PCMCIA crap */ | 439 | /* PCMCIA crap -- watch your words, please! */ |
440 | |||
441 | /* | ||
442 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
443 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
444 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
445 | be present but disabled -- but it can then be enabled for specific | ||
446 | modules at load time with a 'pc_debug=#' option to insmod. | ||
447 | */ | ||
448 | #ifdef PCMCIA_DEBUG | ||
449 | static int pc_debug = PCMCIA_DEBUG; | ||
450 | module_param(pc_debug, int, 0644); | ||
451 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
452 | static char *version = "ni_daq_700.c, based on dummy_cs.c"; | ||
453 | #else | ||
454 | #define DEBUG(n, args...) | ||
455 | #endif | ||
456 | |||
457 | /*====================================================================*/ | ||
458 | 440 | ||
459 | static void dio700_config(struct pcmcia_device *link); | 441 | static void dio700_config(struct pcmcia_device *link); |
460 | static void dio700_release(struct pcmcia_device *link); | 442 | static void dio700_release(struct pcmcia_device *link); |
@@ -510,7 +492,7 @@ static int dio700_cs_attach(struct pcmcia_device *link) | |||
510 | 492 | ||
511 | printk(KERN_INFO "ni_daq_700: cs-attach\n"); | 493 | printk(KERN_INFO "ni_daq_700: cs-attach\n"); |
512 | 494 | ||
513 | DEBUG(0, "dio700_cs_attach()\n"); | 495 | dev_dbg(&link->dev, "dio700_cs_attach()\n"); |
514 | 496 | ||
515 | /* Allocate space for private device-specific data */ | 497 | /* Allocate space for private device-specific data */ |
516 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); | 498 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); |
@@ -521,7 +503,6 @@ static int dio700_cs_attach(struct pcmcia_device *link) | |||
521 | 503 | ||
522 | /* Interrupt setup */ | 504 | /* Interrupt setup */ |
523 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 505 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
524 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
525 | link->irq.Handler = NULL; | 506 | link->irq.Handler = NULL; |
526 | 507 | ||
527 | /* | 508 | /* |
@@ -555,7 +536,7 @@ static void dio700_cs_detach(struct pcmcia_device *link) | |||
555 | 536 | ||
556 | printk(KERN_INFO "ni_daq_700: cs-detach!\n"); | 537 | printk(KERN_INFO "ni_daq_700: cs-detach!\n"); |
557 | 538 | ||
558 | DEBUG(0, "dio700_cs_detach(0x%p)\n", link); | 539 | dev_dbg(&link->dev, "dio700_cs_detach\n"); |
559 | 540 | ||
560 | if (link->dev_node) { | 541 | if (link->dev_node) { |
561 | ((struct local_info_t *)link->priv)->stop = 1; | 542 | ((struct local_info_t *)link->priv)->stop = 1; |
@@ -576,141 +557,85 @@ static void dio700_cs_detach(struct pcmcia_device *link) | |||
576 | 557 | ||
577 | ======================================================================*/ | 558 | ======================================================================*/ |
578 | 559 | ||
579 | static void dio700_config(struct pcmcia_device *link) | 560 | static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev, |
561 | cistpl_cftable_entry_t *cfg, | ||
562 | cistpl_cftable_entry_t *dflt, | ||
563 | unsigned int vcc, | ||
564 | void *priv_data) | ||
580 | { | 565 | { |
581 | struct local_info_t *dev = link->priv; | 566 | win_req_t *req = priv_data; |
582 | tuple_t tuple; | ||
583 | cisparse_t parse; | ||
584 | int last_ret; | ||
585 | u_char buf[64]; | ||
586 | win_req_t req; | ||
587 | memreq_t map; | 567 | memreq_t map; |
588 | cistpl_cftable_entry_t dflt = { 0 }; | ||
589 | 568 | ||
590 | printk(KERN_INFO "ni_daq_700: cs-config\n"); | 569 | if (cfg->index == 0) |
591 | 570 | return -ENODEV; | |
592 | DEBUG(0, "dio700_config(0x%p)\n", link); | ||
593 | 571 | ||
594 | /* | 572 | /* Does this card need audio output? */ |
595 | This reads the card's CONFIG tuple to find its configuration | 573 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { |
596 | registers. | 574 | p_dev->conf.Attributes |= CONF_ENABLE_SPKR; |
597 | */ | 575 | p_dev->conf.Status = CCSR_AUDIO_ENA; |
598 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
599 | tuple.Attributes = 0; | ||
600 | tuple.TupleData = buf; | ||
601 | tuple.TupleDataMax = sizeof(buf); | ||
602 | tuple.TupleOffset = 0; | ||
603 | |||
604 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
605 | if (last_ret) { | ||
606 | cs_error(link, GetFirstTuple, last_ret); | ||
607 | goto cs_failed; | ||
608 | } | 576 | } |
609 | 577 | ||
610 | last_ret = pcmcia_get_tuple_data(link, &tuple); | 578 | /* Do we need to allocate an interrupt? */ |
611 | if (last_ret) { | 579 | if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1) |
612 | cs_error(link, GetTupleData, last_ret); | 580 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; |
613 | goto cs_failed; | 581 | |
582 | /* IO window settings */ | ||
583 | p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; | ||
584 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { | ||
585 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; | ||
586 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
587 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
588 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
589 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
590 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
591 | p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
592 | p_dev->io.BasePort1 = io->win[0].base; | ||
593 | p_dev->io.NumPorts1 = io->win[0].len; | ||
594 | if (io->nwin > 1) { | ||
595 | p_dev->io.Attributes2 = p_dev->io.Attributes1; | ||
596 | p_dev->io.BasePort2 = io->win[1].base; | ||
597 | p_dev->io.NumPorts2 = io->win[1].len; | ||
598 | } | ||
599 | /* This reserves IO space but doesn't actually enable it */ | ||
600 | if (pcmcia_request_io(p_dev, &p_dev->io) != 0) | ||
601 | return -ENODEV; | ||
614 | } | 602 | } |
615 | 603 | ||
616 | last_ret = pcmcia_parse_tuple(&tuple, &parse); | 604 | if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) { |
617 | if (last_ret) { | 605 | cistpl_mem_t *mem = |
618 | cs_error(link, ParseTuple, last_ret); | 606 | (cfg->mem.nwin) ? &cfg->mem : &dflt->mem; |
619 | goto cs_failed; | 607 | req->Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM; |
608 | req->Attributes |= WIN_ENABLE; | ||
609 | req->Base = mem->win[0].host_addr; | ||
610 | req->Size = mem->win[0].len; | ||
611 | if (req->Size < 0x1000) | ||
612 | req->Size = 0x1000; | ||
613 | req->AccessSpeed = 0; | ||
614 | if (pcmcia_request_window(p_dev, req, &p_dev->win)) | ||
615 | return -ENODEV; | ||
616 | map.Page = 0; | ||
617 | map.CardOffset = mem->win[0].card_addr; | ||
618 | if (pcmcia_map_mem_page(p_dev, p_dev->win, &map)) | ||
619 | return -ENODEV; | ||
620 | } | 620 | } |
621 | link->conf.ConfigBase = parse.config.base; | 621 | /* If we got this far, we're cool! */ |
622 | link->conf.Present = parse.config.rmask[0]; | 622 | return 0; |
623 | 623 | } | |
624 | /* | ||
625 | In this loop, we scan the CIS for configuration table entries, | ||
626 | each of which describes a valid card configuration, including | ||
627 | voltage, IO window, memory window, and interrupt settings. | ||
628 | |||
629 | We make no assumptions about the card to be configured: we use | ||
630 | just the information available in the CIS. In an ideal world, | ||
631 | this would work for any PCMCIA card, but it requires a complete | ||
632 | and accurate CIS. In practice, a driver usually "knows" most of | ||
633 | these things without consulting the CIS, and most client drivers | ||
634 | will only use the CIS to fill in implementation-defined details. | ||
635 | */ | ||
636 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
637 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
638 | if (last_ret != 0) { | ||
639 | cs_error(link, GetFirstTuple, last_ret); | ||
640 | goto cs_failed; | ||
641 | } | ||
642 | while (1) { | ||
643 | cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); | ||
644 | if (pcmcia_get_tuple_data(link, &tuple) != 0) | ||
645 | goto next_entry; | ||
646 | if (pcmcia_parse_tuple(&tuple, &parse) != 0) | ||
647 | goto next_entry; | ||
648 | |||
649 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | ||
650 | dflt = *cfg; | ||
651 | if (cfg->index == 0) | ||
652 | goto next_entry; | ||
653 | link->conf.ConfigIndex = cfg->index; | ||
654 | |||
655 | /* Does this card need audio output? */ | ||
656 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { | ||
657 | link->conf.Attributes |= CONF_ENABLE_SPKR; | ||
658 | link->conf.Status = CCSR_AUDIO_ENA; | ||
659 | } | ||
660 | 624 | ||
661 | /* Do we need to allocate an interrupt? */ | 625 | static void dio700_config(struct pcmcia_device *link) |
662 | if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) | 626 | { |
663 | link->conf.Attributes |= CONF_ENABLE_IRQ; | 627 | struct local_info_t *dev = link->priv; |
664 | 628 | win_req_t req; | |
665 | /* IO window settings */ | 629 | int ret; |
666 | link->io.NumPorts1 = link->io.NumPorts2 = 0; | ||
667 | if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { | ||
668 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; | ||
669 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
670 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
671 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
672 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
673 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
674 | link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
675 | link->io.BasePort1 = io->win[0].base; | ||
676 | link->io.NumPorts1 = io->win[0].len; | ||
677 | if (io->nwin > 1) { | ||
678 | link->io.Attributes2 = link->io.Attributes1; | ||
679 | link->io.BasePort2 = io->win[1].base; | ||
680 | link->io.NumPorts2 = io->win[1].len; | ||
681 | } | ||
682 | /* This reserves IO space but doesn't actually enable it */ | ||
683 | if (pcmcia_request_io(link, &link->io) != 0) | ||
684 | goto next_entry; | ||
685 | } | ||
686 | 630 | ||
687 | if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) { | 631 | printk(KERN_INFO "ni_daq_700: cs-config\n"); |
688 | cistpl_mem_t *mem = | ||
689 | (cfg->mem.nwin) ? &cfg->mem : &dflt.mem; | ||
690 | req.Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM; | ||
691 | req.Attributes |= WIN_ENABLE; | ||
692 | req.Base = mem->win[0].host_addr; | ||
693 | req.Size = mem->win[0].len; | ||
694 | if (req.Size < 0x1000) | ||
695 | req.Size = 0x1000; | ||
696 | req.AccessSpeed = 0; | ||
697 | if (pcmcia_request_window(&link, &req, &link->win)) | ||
698 | goto next_entry; | ||
699 | map.Page = 0; | ||
700 | map.CardOffset = mem->win[0].card_addr; | ||
701 | if (pcmcia_map_mem_page(link->win, &map)) | ||
702 | goto next_entry; | ||
703 | } | ||
704 | /* If we got this far, we're cool! */ | ||
705 | break; | ||
706 | 632 | ||
707 | next_entry: | 633 | dev_dbg(&link->dev, "dio700_config\n"); |
708 | 634 | ||
709 | last_ret = pcmcia_get_next_tuple(link, &tuple); | 635 | ret = pcmcia_loop_config(link, dio700_pcmcia_config_loop, &req); |
710 | if (last_ret) { | 636 | if (ret) { |
711 | cs_error(link, GetNextTuple, last_ret); | 637 | dev_warn(&link->dev, "no configuration found\n"); |
712 | goto cs_failed; | 638 | goto failed; |
713 | } | ||
714 | } | 639 | } |
715 | 640 | ||
716 | /* | 641 | /* |
@@ -719,11 +644,9 @@ next_entry: | |||
719 | irq structure is initialized. | 644 | irq structure is initialized. |
720 | */ | 645 | */ |
721 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 646 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
722 | last_ret = pcmcia_request_irq(link, &link->irq); | 647 | ret = pcmcia_request_irq(link, &link->irq); |
723 | if (last_ret) { | 648 | if (ret) |
724 | cs_error(link, RequestIRQ, last_ret); | 649 | goto failed; |
725 | goto cs_failed; | ||
726 | } | ||
727 | } | 650 | } |
728 | 651 | ||
729 | /* | 652 | /* |
@@ -731,11 +654,9 @@ next_entry: | |||
731 | the I/O windows and the interrupt mapping, and putting the | 654 | the I/O windows and the interrupt mapping, and putting the |
732 | card and host interface into "Memory and IO" mode. | 655 | card and host interface into "Memory and IO" mode. |
733 | */ | 656 | */ |
734 | last_ret = pcmcia_request_configuration(link, &link->conf); | 657 | ret = pcmcia_request_configuration(link, &link->conf); |
735 | if (last_ret != 0) { | 658 | if (ret != 0) |
736 | cs_error(link, RequestConfiguration, last_ret); | 659 | goto failed; |
737 | goto cs_failed; | ||
738 | } | ||
739 | 660 | ||
740 | /* | 661 | /* |
741 | At this point, the dev_node_t structure(s) need to be | 662 | At this point, the dev_node_t structure(s) need to be |
@@ -763,7 +684,7 @@ next_entry: | |||
763 | 684 | ||
764 | return; | 685 | return; |
765 | 686 | ||
766 | cs_failed: | 687 | failed: |
767 | printk(KERN_INFO "ni_daq_700 cs failed"); | 688 | printk(KERN_INFO "ni_daq_700 cs failed"); |
768 | dio700_release(link); | 689 | dio700_release(link); |
769 | 690 | ||
@@ -771,7 +692,7 @@ cs_failed: | |||
771 | 692 | ||
772 | static void dio700_release(struct pcmcia_device *link) | 693 | static void dio700_release(struct pcmcia_device *link) |
773 | { | 694 | { |
774 | DEBUG(0, "dio700_release(0x%p)\n", link); | 695 | dev_dbg(&link->dev, "dio700_release\n"); |
775 | 696 | ||
776 | pcmcia_disable_device(link); | 697 | pcmcia_disable_device(link); |
777 | } /* dio700_release */ | 698 | } /* dio700_release */ |
@@ -830,15 +751,13 @@ struct pcmcia_driver dio700_cs_driver = { | |||
830 | 751 | ||
831 | static int __init init_dio700_cs(void) | 752 | static int __init init_dio700_cs(void) |
832 | { | 753 | { |
833 | printk("ni_daq_700: cs-init \n"); | ||
834 | DEBUG(0, "%s\n", version); | ||
835 | pcmcia_register_driver(&dio700_cs_driver); | 754 | pcmcia_register_driver(&dio700_cs_driver); |
836 | return 0; | 755 | return 0; |
837 | } | 756 | } |
838 | 757 | ||
839 | static void __exit exit_dio700_cs(void) | 758 | static void __exit exit_dio700_cs(void) |
840 | { | 759 | { |
841 | DEBUG(0, "ni_daq_700: unloading\n"); | 760 | pr_debug("ni_daq_700: unloading\n"); |
842 | pcmcia_unregister_driver(&dio700_cs_driver); | 761 | pcmcia_unregister_driver(&dio700_cs_driver); |
843 | } | 762 | } |
844 | 763 | ||
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 0700a8bddd1e..9017be3a92f1 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c | |||
@@ -187,25 +187,7 @@ static int dio24_detach(struct comedi_device *dev) | |||
187 | return 0; | 187 | return 0; |
188 | }; | 188 | }; |
189 | 189 | ||
190 | /* PCMCIA crap */ | 190 | /* PCMCIA crap -- watch your words! */ |
191 | |||
192 | /* | ||
193 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
194 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
195 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
196 | be present but disabled -- but it can then be enabled for specific | ||
197 | modules at load time with a 'pc_debug=#' option to insmod. | ||
198 | */ | ||
199 | #ifdef PCMCIA_DEBUG | ||
200 | static int pc_debug = PCMCIA_DEBUG; | ||
201 | module_param(pc_debug, int, 0644); | ||
202 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
203 | static char *version = "ni_daq_dio24.c, based on dummy_cs.c"; | ||
204 | #else | ||
205 | #define DEBUG(n, args...) | ||
206 | #endif | ||
207 | |||
208 | /*====================================================================*/ | ||
209 | 191 | ||
210 | static void dio24_config(struct pcmcia_device *link); | 192 | static void dio24_config(struct pcmcia_device *link); |
211 | static void dio24_release(struct pcmcia_device *link); | 193 | static void dio24_release(struct pcmcia_device *link); |
@@ -261,7 +243,7 @@ static int dio24_cs_attach(struct pcmcia_device *link) | |||
261 | 243 | ||
262 | printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO - CS-attach!\n"); | 244 | printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO - CS-attach!\n"); |
263 | 245 | ||
264 | DEBUG(0, "dio24_cs_attach()\n"); | 246 | dev_dbg(&link->dev, "dio24_cs_attach()\n"); |
265 | 247 | ||
266 | /* Allocate space for private device-specific data */ | 248 | /* Allocate space for private device-specific data */ |
267 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); | 249 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); |
@@ -272,7 +254,6 @@ static int dio24_cs_attach(struct pcmcia_device *link) | |||
272 | 254 | ||
273 | /* Interrupt setup */ | 255 | /* Interrupt setup */ |
274 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 256 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
275 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
276 | link->irq.Handler = NULL; | 257 | link->irq.Handler = NULL; |
277 | 258 | ||
278 | /* | 259 | /* |
@@ -306,7 +287,7 @@ static void dio24_cs_detach(struct pcmcia_device *link) | |||
306 | 287 | ||
307 | printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO - cs-detach!\n"); | 288 | printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO - cs-detach!\n"); |
308 | 289 | ||
309 | DEBUG(0, "dio24_cs_detach(0x%p)\n", link); | 290 | dev_dbg(&link->dev, "dio24_cs_detach\n"); |
310 | 291 | ||
311 | if (link->dev_node) { | 292 | if (link->dev_node) { |
312 | ((struct local_info_t *)link->priv)->stop = 1; | 293 | ((struct local_info_t *)link->priv)->stop = 1; |
@@ -327,142 +308,85 @@ static void dio24_cs_detach(struct pcmcia_device *link) | |||
327 | 308 | ||
328 | ======================================================================*/ | 309 | ======================================================================*/ |
329 | 310 | ||
330 | static void dio24_config(struct pcmcia_device *link) | 311 | static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev, |
312 | cistpl_cftable_entry_t *cfg, | ||
313 | cistpl_cftable_entry_t *dflt, | ||
314 | unsigned int vcc, | ||
315 | void *priv_data) | ||
331 | { | 316 | { |
332 | struct local_info_t *dev = link->priv; | 317 | win_req_t *req = priv_data; |
333 | tuple_t tuple; | ||
334 | cisparse_t parse; | ||
335 | int last_ret; | ||
336 | u_char buf[64]; | ||
337 | win_req_t req; | ||
338 | memreq_t map; | 318 | memreq_t map; |
339 | cistpl_cftable_entry_t dflt = { 0 }; | ||
340 | 319 | ||
341 | printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO! - config\n"); | 320 | if (cfg->index == 0) |
342 | 321 | return -ENODEV; | |
343 | DEBUG(0, "dio24_config(0x%p)\n", link); | ||
344 | |||
345 | /* | ||
346 | This reads the card's CONFIG tuple to find its configuration | ||
347 | registers. | ||
348 | */ | ||
349 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
350 | tuple.Attributes = 0; | ||
351 | tuple.TupleData = buf; | ||
352 | tuple.TupleDataMax = sizeof(buf); | ||
353 | tuple.TupleOffset = 0; | ||
354 | |||
355 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
356 | if (last_ret) { | ||
357 | cs_error(link, GetFirstTuple, last_ret); | ||
358 | goto cs_failed; | ||
359 | } | ||
360 | 322 | ||
361 | last_ret = pcmcia_get_tuple_data(link, &tuple); | 323 | /* Does this card need audio output? */ |
362 | if (last_ret) { | 324 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { |
363 | cs_error(link, GetTupleData, last_ret); | 325 | p_dev->conf.Attributes |= CONF_ENABLE_SPKR; |
364 | goto cs_failed; | 326 | p_dev->conf.Status = CCSR_AUDIO_ENA; |
365 | } | 327 | } |
366 | 328 | ||
367 | last_ret = pcmcia_parse_tuple(&tuple, &parse); | 329 | /* Do we need to allocate an interrupt? */ |
368 | if (last_ret) { | 330 | if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1) |
369 | cs_error(link, ParseTuple, last_ret); | 331 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; |
370 | goto cs_failed; | 332 | |
333 | /* IO window settings */ | ||
334 | p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; | ||
335 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { | ||
336 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; | ||
337 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
338 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
339 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
340 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
341 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
342 | p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
343 | p_dev->io.BasePort1 = io->win[0].base; | ||
344 | p_dev->io.NumPorts1 = io->win[0].len; | ||
345 | if (io->nwin > 1) { | ||
346 | p_dev->io.Attributes2 = p_dev->io.Attributes1; | ||
347 | p_dev->io.BasePort2 = io->win[1].base; | ||
348 | p_dev->io.NumPorts2 = io->win[1].len; | ||
349 | } | ||
350 | /* This reserves IO space but doesn't actually enable it */ | ||
351 | if (pcmcia_request_io(p_dev, &p_dev->io) != 0) | ||
352 | return -ENODEV; | ||
371 | } | 353 | } |
372 | link->conf.ConfigBase = parse.config.base; | ||
373 | link->conf.Present = parse.config.rmask[0]; | ||
374 | |||
375 | /* | ||
376 | In this loop, we scan the CIS for configuration table entries, | ||
377 | each of which describes a valid card configuration, including | ||
378 | voltage, IO window, memory window, and interrupt settings. | ||
379 | |||
380 | We make no assumptions about the card to be configured: we use | ||
381 | just the information available in the CIS. In an ideal world, | ||
382 | this would work for any PCMCIA card, but it requires a complete | ||
383 | and accurate CIS. In practice, a driver usually "knows" most of | ||
384 | these things without consulting the CIS, and most client drivers | ||
385 | will only use the CIS to fill in implementation-defined details. | ||
386 | */ | ||
387 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
388 | 354 | ||
389 | last_ret = pcmcia_get_first_tuple(link, &tuple); | 355 | if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) { |
390 | if (last_ret) { | 356 | cistpl_mem_t *mem = |
391 | cs_error(link, GetFirstTuple, last_ret); | 357 | (cfg->mem.nwin) ? &cfg->mem : &dflt->mem; |
392 | goto cs_failed; | 358 | req->Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM; |
359 | req->Attributes |= WIN_ENABLE; | ||
360 | req->Base = mem->win[0].host_addr; | ||
361 | req->Size = mem->win[0].len; | ||
362 | if (req->Size < 0x1000) | ||
363 | req->Size = 0x1000; | ||
364 | req->AccessSpeed = 0; | ||
365 | if (pcmcia_request_window(p_dev, req, &p_dev->win)) | ||
366 | return -ENODEV; | ||
367 | map.Page = 0; | ||
368 | map.CardOffset = mem->win[0].card_addr; | ||
369 | if (pcmcia_map_mem_page(p_dev, p_dev->win, &map)) | ||
370 | return -ENODEV; | ||
393 | } | 371 | } |
394 | while (1) { | 372 | /* If we got this far, we're cool! */ |
395 | cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); | 373 | return 0; |
396 | if (pcmcia_get_tuple_data(link, &tuple) != 0) | 374 | } |
397 | goto next_entry; | ||
398 | if (pcmcia_parse_tuple(&tuple, &parse) != 0) | ||
399 | goto next_entry; | ||
400 | |||
401 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | ||
402 | dflt = *cfg; | ||
403 | if (cfg->index == 0) | ||
404 | goto next_entry; | ||
405 | link->conf.ConfigIndex = cfg->index; | ||
406 | |||
407 | /* Does this card need audio output? */ | ||
408 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { | ||
409 | link->conf.Attributes |= CONF_ENABLE_SPKR; | ||
410 | link->conf.Status = CCSR_AUDIO_ENA; | ||
411 | } | ||
412 | 375 | ||
413 | /* Do we need to allocate an interrupt? */ | 376 | static void dio24_config(struct pcmcia_device *link) |
414 | if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) | 377 | { |
415 | link->conf.Attributes |= CONF_ENABLE_IRQ; | 378 | struct local_info_t *dev = link->priv; |
416 | 379 | int ret; | |
417 | /* IO window settings */ | 380 | win_req_t req; |
418 | link->io.NumPorts1 = link->io.NumPorts2 = 0; | ||
419 | if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { | ||
420 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; | ||
421 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
422 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
423 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
424 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
425 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
426 | link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
427 | link->io.BasePort1 = io->win[0].base; | ||
428 | link->io.NumPorts1 = io->win[0].len; | ||
429 | if (io->nwin > 1) { | ||
430 | link->io.Attributes2 = link->io.Attributes1; | ||
431 | link->io.BasePort2 = io->win[1].base; | ||
432 | link->io.NumPorts2 = io->win[1].len; | ||
433 | } | ||
434 | /* This reserves IO space but doesn't actually enable it */ | ||
435 | if (pcmcia_request_io(link, &link->io) != 0) | ||
436 | goto next_entry; | ||
437 | } | ||
438 | 381 | ||
439 | if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) { | 382 | printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO! - config\n"); |
440 | cistpl_mem_t *mem = | ||
441 | (cfg->mem.nwin) ? &cfg->mem : &dflt.mem; | ||
442 | req.Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM; | ||
443 | req.Attributes |= WIN_ENABLE; | ||
444 | req.Base = mem->win[0].host_addr; | ||
445 | req.Size = mem->win[0].len; | ||
446 | if (req.Size < 0x1000) | ||
447 | req.Size = 0x1000; | ||
448 | req.AccessSpeed = 0; | ||
449 | if (pcmcia_request_window(&link, &req, &link->win)) | ||
450 | goto next_entry; | ||
451 | map.Page = 0; | ||
452 | map.CardOffset = mem->win[0].card_addr; | ||
453 | if (pcmcia_map_mem_page(link->win, &map)) | ||
454 | goto next_entry; | ||
455 | } | ||
456 | /* If we got this far, we're cool! */ | ||
457 | break; | ||
458 | 383 | ||
459 | next_entry: | 384 | dev_dbg(&link->dev, "dio24_config\n"); |
460 | 385 | ||
461 | last_ret = pcmcia_get_next_tuple(link, &tuple); | 386 | ret = pcmcia_loop_config(link, dio24_pcmcia_config_loop, &req); |
462 | if (last_ret) { | 387 | if (ret) { |
463 | cs_error(link, GetNextTuple, last_ret); | 388 | dev_warn(&link->dev, "no configuration found\n"); |
464 | goto cs_failed; | 389 | goto failed; |
465 | } | ||
466 | } | 390 | } |
467 | 391 | ||
468 | /* | 392 | /* |
@@ -471,11 +395,9 @@ next_entry: | |||
471 | irq structure is initialized. | 395 | irq structure is initialized. |
472 | */ | 396 | */ |
473 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 397 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
474 | last_ret = pcmcia_request_irq(link, &link->irq); | 398 | ret = pcmcia_request_irq(link, &link->irq); |
475 | if (last_ret) { | 399 | if (ret) |
476 | cs_error(link, RequestIRQ, last_ret); | 400 | goto failed; |
477 | goto cs_failed; | ||
478 | } | ||
479 | } | 401 | } |
480 | 402 | ||
481 | /* | 403 | /* |
@@ -483,11 +405,9 @@ next_entry: | |||
483 | the I/O windows and the interrupt mapping, and putting the | 405 | the I/O windows and the interrupt mapping, and putting the |
484 | card and host interface into "Memory and IO" mode. | 406 | card and host interface into "Memory and IO" mode. |
485 | */ | 407 | */ |
486 | last_ret = pcmcia_request_configuration(link, &link->conf); | 408 | ret = pcmcia_request_configuration(link, &link->conf); |
487 | if (last_ret) { | 409 | if (ret) |
488 | cs_error(link, RequestConfiguration, last_ret); | 410 | goto failed; |
489 | goto cs_failed; | ||
490 | } | ||
491 | 411 | ||
492 | /* | 412 | /* |
493 | At this point, the dev_node_t structure(s) need to be | 413 | At this point, the dev_node_t structure(s) need to be |
@@ -515,7 +435,7 @@ next_entry: | |||
515 | 435 | ||
516 | return; | 436 | return; |
517 | 437 | ||
518 | cs_failed: | 438 | failed: |
519 | printk(KERN_INFO "Fallo"); | 439 | printk(KERN_INFO "Fallo"); |
520 | dio24_release(link); | 440 | dio24_release(link); |
521 | 441 | ||
@@ -523,7 +443,7 @@ cs_failed: | |||
523 | 443 | ||
524 | static void dio24_release(struct pcmcia_device *link) | 444 | static void dio24_release(struct pcmcia_device *link) |
525 | { | 445 | { |
526 | DEBUG(0, "dio24_release(0x%p)\n", link); | 446 | dev_dbg(&link->dev, "dio24_release\n"); |
527 | 447 | ||
528 | pcmcia_disable_device(link); | 448 | pcmcia_disable_device(link); |
529 | } /* dio24_release */ | 449 | } /* dio24_release */ |
@@ -582,14 +502,12 @@ struct pcmcia_driver dio24_cs_driver = { | |||
582 | static int __init init_dio24_cs(void) | 502 | static int __init init_dio24_cs(void) |
583 | { | 503 | { |
584 | printk("ni_daq_dio24: HOLA SOY YO!\n"); | 504 | printk("ni_daq_dio24: HOLA SOY YO!\n"); |
585 | DEBUG(0, "%s\n", version); | ||
586 | pcmcia_register_driver(&dio24_cs_driver); | 505 | pcmcia_register_driver(&dio24_cs_driver); |
587 | return 0; | 506 | return 0; |
588 | } | 507 | } |
589 | 508 | ||
590 | static void __exit exit_dio24_cs(void) | 509 | static void __exit exit_dio24_cs(void) |
591 | { | 510 | { |
592 | DEBUG(0, "ni_dio24: unloading\n"); | ||
593 | pcmcia_unregister_driver(&dio24_cs_driver); | 511 | pcmcia_unregister_driver(&dio24_cs_driver); |
594 | } | 512 | } |
595 | 513 | ||
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index a3053b8da1c6..7d514b3ee754 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c | |||
@@ -153,23 +153,6 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
153 | return labpc_common_attach(dev, iobase, irq, 0); | 153 | return labpc_common_attach(dev, iobase, irq, 0); |
154 | } | 154 | } |
155 | 155 | ||
156 | /* | ||
157 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
158 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
159 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
160 | be present but disabled -- but it can then be enabled for specific | ||
161 | modules at load time with a 'pc_debug=#' option to insmod. | ||
162 | */ | ||
163 | #ifdef PCMCIA_DEBUG | ||
164 | static int pc_debug = PCMCIA_DEBUG; | ||
165 | module_param(pc_debug, int, 0644); | ||
166 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
167 | static const char *version = | ||
168 | "ni_labpc.c, based on dummy_cs.c 1.31 2001/08/24 12:13:13"; | ||
169 | #else | ||
170 | #define DEBUG(n, args...) | ||
171 | #endif | ||
172 | |||
173 | /*====================================================================*/ | 156 | /*====================================================================*/ |
174 | 157 | ||
175 | /* | 158 | /* |
@@ -236,7 +219,7 @@ static int labpc_cs_attach(struct pcmcia_device *link) | |||
236 | { | 219 | { |
237 | struct local_info_t *local; | 220 | struct local_info_t *local; |
238 | 221 | ||
239 | DEBUG(0, "labpc_cs_attach()\n"); | 222 | dev_dbg(&link->dev, "labpc_cs_attach()\n"); |
240 | 223 | ||
241 | /* Allocate space for private device-specific data */ | 224 | /* Allocate space for private device-specific data */ |
242 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); | 225 | local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); |
@@ -247,7 +230,6 @@ static int labpc_cs_attach(struct pcmcia_device *link) | |||
247 | 230 | ||
248 | /* Interrupt setup */ | 231 | /* Interrupt setup */ |
249 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; | 232 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; |
250 | link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID; | ||
251 | link->irq.Handler = NULL; | 233 | link->irq.Handler = NULL; |
252 | 234 | ||
253 | /* | 235 | /* |
@@ -278,7 +260,7 @@ static int labpc_cs_attach(struct pcmcia_device *link) | |||
278 | 260 | ||
279 | static void labpc_cs_detach(struct pcmcia_device *link) | 261 | static void labpc_cs_detach(struct pcmcia_device *link) |
280 | { | 262 | { |
281 | DEBUG(0, "labpc_cs_detach(0x%p)\n", link); | 263 | dev_dbg(&link->dev, "labpc_cs_detach\n"); |
282 | 264 | ||
283 | /* | 265 | /* |
284 | If the device is currently configured and active, we won't | 266 | If the device is currently configured and active, we won't |
@@ -305,135 +287,84 @@ static void labpc_cs_detach(struct pcmcia_device *link) | |||
305 | 287 | ||
306 | ======================================================================*/ | 288 | ======================================================================*/ |
307 | 289 | ||
308 | static void labpc_config(struct pcmcia_device *link) | 290 | static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev, |
291 | cistpl_cftable_entry_t *cfg, | ||
292 | cistpl_cftable_entry_t *dflt, | ||
293 | unsigned int vcc, | ||
294 | void *priv_data) | ||
309 | { | 295 | { |
310 | struct local_info_t *dev = link->priv; | 296 | win_req_t *req = priv_data; |
311 | tuple_t tuple; | ||
312 | cisparse_t parse; | ||
313 | int last_ret; | ||
314 | u_char buf[64]; | ||
315 | win_req_t req; | ||
316 | memreq_t map; | 297 | memreq_t map; |
317 | cistpl_cftable_entry_t dflt = { 0 }; | ||
318 | 298 | ||
319 | DEBUG(0, "labpc_config(0x%p)\n", link); | 299 | if (cfg->index == 0) |
300 | return -ENODEV; | ||
320 | 301 | ||
321 | /* | 302 | /* Does this card need audio output? */ |
322 | This reads the card's CONFIG tuple to find its configuration | 303 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { |
323 | registers. | 304 | p_dev->conf.Attributes |= CONF_ENABLE_SPKR; |
324 | */ | 305 | p_dev->conf.Status = CCSR_AUDIO_ENA; |
325 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
326 | tuple.Attributes = 0; | ||
327 | tuple.TupleData = buf; | ||
328 | tuple.TupleDataMax = sizeof(buf); | ||
329 | tuple.TupleOffset = 0; | ||
330 | |||
331 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
332 | if (last_ret) { | ||
333 | cs_error(link, GetFirstTuple, last_ret); | ||
334 | goto cs_failed; | ||
335 | } | 306 | } |
336 | 307 | ||
337 | last_ret = pcmcia_get_tuple_data(link, &tuple); | 308 | /* Do we need to allocate an interrupt? */ |
338 | if (last_ret) { | 309 | if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1) |
339 | cs_error(link, GetTupleData, last_ret); | 310 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; |
340 | goto cs_failed; | 311 | |
312 | /* IO window settings */ | ||
313 | p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; | ||
314 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { | ||
315 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; | ||
316 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
317 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
318 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
319 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
320 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
321 | p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
322 | p_dev->io.BasePort1 = io->win[0].base; | ||
323 | p_dev->io.NumPorts1 = io->win[0].len; | ||
324 | if (io->nwin > 1) { | ||
325 | p_dev->io.Attributes2 = p_dev->io.Attributes1; | ||
326 | p_dev->io.BasePort2 = io->win[1].base; | ||
327 | p_dev->io.NumPorts2 = io->win[1].len; | ||
328 | } | ||
329 | /* This reserves IO space but doesn't actually enable it */ | ||
330 | if (pcmcia_request_io(p_dev, &p_dev->io) != 0) | ||
331 | return -ENODEV; | ||
341 | } | 332 | } |
342 | 333 | ||
343 | last_ret = pcmcia_parse_tuple(&tuple, &parse); | 334 | if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) { |
344 | if (last_ret) { | 335 | cistpl_mem_t *mem = |
345 | cs_error(link, ParseTuple, last_ret); | 336 | (cfg->mem.nwin) ? &cfg->mem : &dflt->mem; |
346 | goto cs_failed; | 337 | req->Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM; |
338 | req->Attributes |= WIN_ENABLE; | ||
339 | req->Base = mem->win[0].host_addr; | ||
340 | req->Size = mem->win[0].len; | ||
341 | if (req->Size < 0x1000) | ||
342 | req->Size = 0x1000; | ||
343 | req->AccessSpeed = 0; | ||
344 | if (pcmcia_request_window(p_dev, req, &p_dev->win)) | ||
345 | return -ENODEV; | ||
346 | map.Page = 0; | ||
347 | map.CardOffset = mem->win[0].card_addr; | ||
348 | if (pcmcia_map_mem_page(p_dev, p_dev->win, &map)) | ||
349 | return -ENODEV; | ||
347 | } | 350 | } |
348 | link->conf.ConfigBase = parse.config.base; | 351 | /* If we got this far, we're cool! */ |
349 | link->conf.Present = parse.config.rmask[0]; | 352 | return 0; |
353 | } | ||
350 | 354 | ||
351 | /* | ||
352 | In this loop, we scan the CIS for configuration table entries, | ||
353 | each of which describes a valid card configuration, including | ||
354 | voltage, IO window, memory window, and interrupt settings. | ||
355 | |||
356 | We make no assumptions about the card to be configured: we use | ||
357 | just the information available in the CIS. In an ideal world, | ||
358 | this would work for any PCMCIA card, but it requires a complete | ||
359 | and accurate CIS. In practice, a driver usually "knows" most of | ||
360 | these things without consulting the CIS, and most client drivers | ||
361 | will only use the CIS to fill in implementation-defined details. | ||
362 | */ | ||
363 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
364 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
365 | if (last_ret) { | ||
366 | cs_error(link, GetFirstTuple, last_ret); | ||
367 | goto cs_failed; | ||
368 | } | ||
369 | while (1) { | ||
370 | cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); | ||
371 | if (pcmcia_get_tuple_data(link, &tuple)) | ||
372 | goto next_entry; | ||
373 | if (pcmcia_parse_tuple(&tuple, &parse)) | ||
374 | goto next_entry; | ||
375 | |||
376 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | ||
377 | dflt = *cfg; | ||
378 | if (cfg->index == 0) | ||
379 | goto next_entry; | ||
380 | link->conf.ConfigIndex = cfg->index; | ||
381 | |||
382 | /* Does this card need audio output? */ | ||
383 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { | ||
384 | link->conf.Attributes |= CONF_ENABLE_SPKR; | ||
385 | link->conf.Status = CCSR_AUDIO_ENA; | ||
386 | } | ||
387 | 355 | ||
388 | /* Do we need to allocate an interrupt? */ | 356 | static void labpc_config(struct pcmcia_device *link) |
389 | if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) | 357 | { |
390 | link->conf.Attributes |= CONF_ENABLE_IRQ; | 358 | struct local_info_t *dev = link->priv; |
391 | 359 | int ret; | |
392 | /* IO window settings */ | 360 | win_req_t req; |
393 | link->io.NumPorts1 = link->io.NumPorts2 = 0; | ||
394 | if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { | ||
395 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; | ||
396 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
397 | link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
398 | link->io.BasePort1 = io->win[0].base; | ||
399 | link->io.NumPorts1 = io->win[0].len; | ||
400 | if (io->nwin > 1) { | ||
401 | link->io.Attributes2 = link->io.Attributes1; | ||
402 | link->io.BasePort2 = io->win[1].base; | ||
403 | link->io.NumPorts2 = io->win[1].len; | ||
404 | } | ||
405 | /* This reserves IO space but doesn't actually enable it */ | ||
406 | if (pcmcia_request_io(link, &link->io)) | ||
407 | goto next_entry; | ||
408 | } | ||
409 | 361 | ||
410 | if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) { | 362 | dev_dbg(&link->dev, "labpc_config\n"); |
411 | cistpl_mem_t *mem = | ||
412 | (cfg->mem.nwin) ? &cfg->mem : &dflt.mem; | ||
413 | req.Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM; | ||
414 | req.Attributes |= WIN_ENABLE; | ||
415 | req.Base = mem->win[0].host_addr; | ||
416 | req.Size = mem->win[0].len; | ||
417 | if (req.Size < 0x1000) | ||
418 | req.Size = 0x1000; | ||
419 | req.AccessSpeed = 0; | ||
420 | link->win = (window_handle_t) link; | ||
421 | if (pcmcia_request_window(&link, &req, &link->win)) | ||
422 | goto next_entry; | ||
423 | map.Page = 0; | ||
424 | map.CardOffset = mem->win[0].card_addr; | ||
425 | if (pcmcia_map_mem_page(link->win, &map)) | ||
426 | goto next_entry; | ||
427 | } | ||
428 | /* If we got this far, we're cool! */ | ||
429 | break; | ||
430 | 363 | ||
431 | next_entry: | 364 | ret = pcmcia_loop_config(link, labpc_pcmcia_config_loop, &req); |
432 | last_ret = pcmcia_get_next_tuple(link, &tuple); | 365 | if (ret) { |
433 | if (last_ret) { | 366 | dev_warn(&link->dev, "no configuration found\n"); |
434 | cs_error(link, GetNextTuple, last_ret); | 367 | goto failed; |
435 | goto cs_failed; | ||
436 | } | ||
437 | } | 368 | } |
438 | 369 | ||
439 | /* | 370 | /* |
@@ -442,11 +373,9 @@ next_entry: | |||
442 | irq structure is initialized. | 373 | irq structure is initialized. |
443 | */ | 374 | */ |
444 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 375 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
445 | last_ret = pcmcia_request_irq(link, &link->irq); | 376 | ret = pcmcia_request_irq(link, &link->irq); |
446 | if (last_ret) { | 377 | if (ret) |
447 | cs_error(link, RequestIRQ, last_ret); | 378 | goto failed; |
448 | goto cs_failed; | ||
449 | } | ||
450 | } | 379 | } |
451 | 380 | ||
452 | /* | 381 | /* |
@@ -454,11 +383,9 @@ next_entry: | |||
454 | the I/O windows and the interrupt mapping, and putting the | 383 | the I/O windows and the interrupt mapping, and putting the |
455 | card and host interface into "Memory and IO" mode. | 384 | card and host interface into "Memory and IO" mode. |
456 | */ | 385 | */ |
457 | last_ret = pcmcia_request_configuration(link, &link->conf); | 386 | ret = pcmcia_request_configuration(link, &link->conf); |
458 | if (last_ret) { | 387 | if (ret) |
459 | cs_error(link, RequestConfiguration, last_ret); | 388 | goto failed; |
460 | goto cs_failed; | ||
461 | } | ||
462 | 389 | ||
463 | /* | 390 | /* |
464 | At this point, the dev_node_t structure(s) need to be | 391 | At this point, the dev_node_t structure(s) need to be |
@@ -486,14 +413,14 @@ next_entry: | |||
486 | 413 | ||
487 | return; | 414 | return; |
488 | 415 | ||
489 | cs_failed: | 416 | failed: |
490 | labpc_release(link); | 417 | labpc_release(link); |
491 | 418 | ||
492 | } /* labpc_config */ | 419 | } /* labpc_config */ |
493 | 420 | ||
494 | static void labpc_release(struct pcmcia_device *link) | 421 | static void labpc_release(struct pcmcia_device *link) |
495 | { | 422 | { |
496 | DEBUG(0, "labpc_release(0x%p)\n", link); | 423 | dev_dbg(&link->dev, "labpc_release\n"); |
497 | 424 | ||
498 | pcmcia_disable_device(link); | 425 | pcmcia_disable_device(link); |
499 | } /* labpc_release */ | 426 | } /* labpc_release */ |
@@ -551,14 +478,12 @@ struct pcmcia_driver labpc_cs_driver = { | |||
551 | 478 | ||
552 | static int __init init_labpc_cs(void) | 479 | static int __init init_labpc_cs(void) |
553 | { | 480 | { |
554 | DEBUG(0, "%s\n", version); | ||
555 | pcmcia_register_driver(&labpc_cs_driver); | 481 | pcmcia_register_driver(&labpc_cs_driver); |
556 | return 0; | 482 | return 0; |
557 | } | 483 | } |
558 | 484 | ||
559 | static void __exit exit_labpc_cs(void) | 485 | static void __exit exit_labpc_cs(void) |
560 | { | 486 | { |
561 | DEBUG(0, "ni_labpc: unloading\n"); | ||
562 | pcmcia_unregister_driver(&labpc_cs_driver); | 487 | pcmcia_unregister_driver(&labpc_cs_driver); |
563 | } | 488 | } |
564 | 489 | ||
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index 9aef87fc81dc..d692f4bb47ea 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c | |||
@@ -274,7 +274,6 @@ static int cs_attach(struct pcmcia_device *link) | |||
274 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 274 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
275 | link->io.NumPorts1 = 16; | 275 | link->io.NumPorts1 = 16; |
276 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 276 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
277 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
278 | link->conf.Attributes = CONF_ENABLE_IRQ; | 277 | link->conf.Attributes = CONF_ENABLE_IRQ; |
279 | link->conf.IntType = INT_MEMORY_AND_IO; | 278 | link->conf.IntType = INT_MEMORY_AND_IO; |
280 | 279 | ||
@@ -312,96 +311,47 @@ static int mio_cs_resume(struct pcmcia_device *link) | |||
312 | return 0; | 311 | return 0; |
313 | } | 312 | } |
314 | 313 | ||
315 | static void mio_cs_config(struct pcmcia_device *link) | ||
316 | { | ||
317 | tuple_t tuple; | ||
318 | u_short buf[128]; | ||
319 | cisparse_t parse; | ||
320 | int manfid = 0, prodid = 0; | ||
321 | int ret; | ||
322 | |||
323 | DPRINTK("mio_cs_config(link=%p)\n", link); | ||
324 | 314 | ||
325 | tuple.TupleData = (cisdata_t *) buf; | 315 | static int mio_pcmcia_config_loop(struct pcmcia_device *p_dev, |
326 | tuple.TupleOffset = 0; | 316 | cistpl_cftable_entry_t *cfg, |
327 | tuple.TupleDataMax = 255; | 317 | cistpl_cftable_entry_t *dflt, |
328 | tuple.Attributes = 0; | 318 | unsigned int vcc, |
319 | void *priv_data) | ||
320 | { | ||
321 | int base, ret; | ||
329 | 322 | ||
330 | tuple.DesiredTuple = CISTPL_CONFIG; | 323 | p_dev->io.NumPorts1 = cfg->io.win[0].len; |
331 | ret = pcmcia_get_first_tuple(link, &tuple); | 324 | p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; |
332 | ret = pcmcia_get_tuple_data(link, &tuple); | 325 | p_dev->io.NumPorts2 = 0; |
333 | ret = pcmcia_parse_tuple(&tuple, &parse); | ||
334 | link->conf.ConfigBase = parse.config.base; | ||
335 | link->conf.Present = parse.config.rmask[0]; | ||
336 | 326 | ||
337 | #if 0 | 327 | for (base = 0x000; base < 0x400; base += 0x20) { |
338 | tuple.DesiredTuple = CISTPL_LONGLINK_MFC; | 328 | p_dev->io.BasePort1 = base; |
339 | tuple.Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK; | 329 | ret = pcmcia_request_io(p_dev, &p_dev->io); |
340 | info->multi(first_tuple(link, &tuple, &parse) == 0); | 330 | if (!ret) |
341 | #endif | 331 | return 0; |
342 | |||
343 | tuple.DesiredTuple = CISTPL_MANFID; | ||
344 | tuple.Attributes = TUPLE_RETURN_COMMON; | ||
345 | if ((pcmcia_get_first_tuple(link, &tuple) == 0) && | ||
346 | (pcmcia_get_tuple_data(link, &tuple) == 0)) { | ||
347 | manfid = le16_to_cpu(buf[0]); | ||
348 | prodid = le16_to_cpu(buf[1]); | ||
349 | } | 332 | } |
350 | /* printk("manfid = 0x%04x, 0x%04x\n",manfid,prodid); */ | 333 | return -ENODEV; |
334 | } | ||
351 | 335 | ||
352 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | ||
353 | tuple.Attributes = 0; | ||
354 | ret = pcmcia_get_first_tuple(link, &tuple); | ||
355 | ret = pcmcia_get_tuple_data(link, &tuple); | ||
356 | ret = pcmcia_parse_tuple(&tuple, &parse); | ||
357 | 336 | ||
358 | #if 0 | 337 | static void mio_cs_config(struct pcmcia_device *link) |
359 | printk(" index: 0x%x\n", parse.cftable_entry.index); | 338 | { |
360 | printk(" flags: 0x%x\n", parse.cftable_entry.flags); | 339 | int ret; |
361 | printk(" io flags: 0x%x\n", parse.cftable_entry.io.flags); | ||
362 | printk(" io nwin: 0x%x\n", parse.cftable_entry.io.nwin); | ||
363 | printk(" io base: 0x%x\n", parse.cftable_entry.io.win[0].base); | ||
364 | printk(" io len: 0x%x\n", parse.cftable_entry.io.win[0].len); | ||
365 | printk(" irq1: 0x%x\n", parse.cftable_entry.irq.IRQInfo1); | ||
366 | printk(" irq2: 0x%x\n", parse.cftable_entry.irq.IRQInfo2); | ||
367 | printk(" mem flags: 0x%x\n", parse.cftable_entry.mem.flags); | ||
368 | printk(" mem nwin: 0x%x\n", parse.cftable_entry.mem.nwin); | ||
369 | printk(" subtuples: 0x%x\n", parse.cftable_entry.subtuples); | ||
370 | #endif | ||
371 | 340 | ||
372 | #if 0 | 341 | DPRINTK("mio_cs_config(link=%p)\n", link); |
373 | link->io.NumPorts1 = 0x20; | ||
374 | link->io.IOAddrLines = 5; | ||
375 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
376 | #endif | ||
377 | link->io.NumPorts1 = parse.cftable_entry.io.win[0].len; | ||
378 | link->io.IOAddrLines = | ||
379 | parse.cftable_entry.io.flags & CISTPL_IO_LINES_MASK; | ||
380 | link->io.NumPorts2 = 0; | ||
381 | 342 | ||
382 | { | 343 | ret = pcmcia_loop_config(link, mio_pcmcia_config_loop, NULL); |
383 | int base; | 344 | if (ret) { |
384 | for (base = 0x000; base < 0x400; base += 0x20) { | 345 | dev_warn(&link->dev, "no configuration found\n"); |
385 | link->io.BasePort1 = base; | 346 | return; |
386 | ret = pcmcia_request_io(link, &link->io); | ||
387 | /* printk("RequestIO 0x%02x\n",ret); */ | ||
388 | if (!ret) | ||
389 | break; | ||
390 | } | ||
391 | } | 347 | } |
392 | 348 | ||
393 | link->irq.IRQInfo1 = parse.cftable_entry.irq.IRQInfo1; | ||
394 | link->irq.IRQInfo2 = parse.cftable_entry.irq.IRQInfo2; | ||
395 | ret = pcmcia_request_irq(link, &link->irq); | 349 | ret = pcmcia_request_irq(link, &link->irq); |
396 | if (ret) { | 350 | if (ret) { |
397 | printk("pcmcia_request_irq() returned error: %i\n", ret); | 351 | printk("pcmcia_request_irq() returned error: %i\n", ret); |
398 | } | 352 | } |
399 | /* printk("RequestIRQ 0x%02x\n",ret); */ | ||
400 | |||
401 | link->conf.ConfigIndex = 1; | ||
402 | 353 | ||
403 | ret = pcmcia_request_configuration(link, &link->conf); | 354 | ret = pcmcia_request_configuration(link, &link->conf); |
404 | /* printk("RequestConfiguration %d\n",ret); */ | ||
405 | 355 | ||
406 | link->dev_node = &dev_node; | 356 | link->dev_node = &dev_node; |
407 | } | 357 | } |
@@ -475,40 +425,17 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
475 | return 0; | 425 | return 0; |
476 | } | 426 | } |
477 | 427 | ||
478 | static int get_prodid(struct comedi_device *dev, struct pcmcia_device *link) | ||
479 | { | ||
480 | tuple_t tuple; | ||
481 | u_short buf[128]; | ||
482 | int prodid = 0; | ||
483 | |||
484 | tuple.TupleData = (cisdata_t *) buf; | ||
485 | tuple.TupleOffset = 0; | ||
486 | tuple.TupleDataMax = 255; | ||
487 | tuple.DesiredTuple = CISTPL_MANFID; | ||
488 | tuple.Attributes = TUPLE_RETURN_COMMON; | ||
489 | if ((pcmcia_get_first_tuple(link, &tuple) == 0) && | ||
490 | (pcmcia_get_tuple_data(link, &tuple) == 0)) { | ||
491 | prodid = le16_to_cpu(buf[1]); | ||
492 | } | ||
493 | |||
494 | return prodid; | ||
495 | } | ||
496 | |||
497 | static int ni_getboardtype(struct comedi_device *dev, | 428 | static int ni_getboardtype(struct comedi_device *dev, |
498 | struct pcmcia_device *link) | 429 | struct pcmcia_device *link) |
499 | { | 430 | { |
500 | int id; | ||
501 | int i; | 431 | int i; |
502 | 432 | ||
503 | id = get_prodid(dev, link); | ||
504 | |||
505 | for (i = 0; i < n_ni_boards; i++) { | 433 | for (i = 0; i < n_ni_boards; i++) { |
506 | if (ni_boards[i].device_id == id) { | 434 | if (ni_boards[i].device_id == link->card_id) |
507 | return i; | 435 | return i; |
508 | } | ||
509 | } | 436 | } |
510 | 437 | ||
511 | printk("unknown board 0x%04x -- pretend it is a ", id); | 438 | printk("unknown board 0x%04x -- pretend it is a ", link->card_id); |
512 | 439 | ||
513 | return 0; | 440 | return 0; |
514 | } | 441 | } |
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 344b82353e08..5256fd933162 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c | |||
@@ -55,23 +55,6 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308 | |||
55 | #include <pcmcia/cisreg.h> | 55 | #include <pcmcia/cisreg.h> |
56 | #include <pcmcia/ds.h> | 56 | #include <pcmcia/ds.h> |
57 | 57 | ||
58 | /* | ||
59 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | ||
60 | you do not define PCMCIA_DEBUG at all, all the debug code will be | ||
61 | left out. If you compile with PCMCIA_DEBUG=0, the debug code will | ||
62 | be present but disabled -- but it can then be enabled for specific | ||
63 | modules at load time with a 'pc_debug=#' option to insmod. | ||
64 | */ | ||
65 | |||
66 | #ifdef PCMCIA_DEBUG | ||
67 | static int pc_debug = PCMCIA_DEBUG; | ||
68 | module_param(pc_debug, int, 0644); | ||
69 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
70 | static char *version = "quatech_daqp_cs.c 1.10 2003/04/21 (Brent Baccala)"; | ||
71 | #else | ||
72 | #define DEBUG(n, args...) | ||
73 | #endif | ||
74 | |||
75 | /* Maximum number of separate DAQP devices we'll allow */ | 58 | /* Maximum number of separate DAQP devices we'll allow */ |
76 | #define MAX_DEV 4 | 59 | #define MAX_DEV 4 |
77 | 60 | ||
@@ -863,8 +846,6 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
863 | { | 846 | { |
864 | int ret; | 847 | int ret; |
865 | struct local_info_t *local = dev_table[it->options[0]]; | 848 | struct local_info_t *local = dev_table[it->options[0]]; |
866 | tuple_t tuple; | ||
867 | int i; | ||
868 | struct comedi_subdevice *s; | 849 | struct comedi_subdevice *s; |
869 | 850 | ||
870 | if (it->options[0] < 0 || it->options[0] >= MAX_DEV || !local) { | 851 | if (it->options[0] < 0 || it->options[0] >= MAX_DEV || !local) { |
@@ -883,29 +864,10 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
883 | 864 | ||
884 | strcpy(local->board_name, "DAQP"); | 865 | strcpy(local->board_name, "DAQP"); |
885 | dev->board_name = local->board_name; | 866 | dev->board_name = local->board_name; |
886 | 867 | if (local->link->prod_id[2]) { | |
887 | tuple.DesiredTuple = CISTPL_VERS_1; | 868 | if (strncmp(local->link->prod_id[2], "DAQP", 4) == 0) { |
888 | if (pcmcia_get_first_tuple(local->link, &tuple) == 0) { | 869 | strncpy(local->board_name, local->link->prod_id[2], |
889 | u_char buf[128]; | 870 | sizeof(local->board_name)); |
890 | |||
891 | buf[0] = buf[sizeof(buf) - 1] = 0; | ||
892 | tuple.TupleData = buf; | ||
893 | tuple.TupleDataMax = sizeof(buf); | ||
894 | tuple.TupleOffset = 2; | ||
895 | if (pcmcia_get_tuple_data(local->link, &tuple) == 0) { | ||
896 | |||
897 | for (i = 0; i < tuple.TupleDataLen - 4; i++) | ||
898 | if (buf[i] == 0) | ||
899 | break; | ||
900 | for (i++; i < tuple.TupleDataLen - 4; i++) | ||
901 | if (buf[i] == 0) | ||
902 | break; | ||
903 | i++; | ||
904 | if ((i < tuple.TupleDataLen - 4) | ||
905 | && (strncmp(buf + i, "DAQP", 4) == 0)) { | ||
906 | strncpy(local->board_name, buf + i, | ||
907 | sizeof(local->board_name)); | ||
908 | } | ||
909 | } | 871 | } |
910 | } | 872 | } |
911 | 873 | ||
@@ -1058,7 +1020,7 @@ static int daqp_cs_attach(struct pcmcia_device *link) | |||
1058 | struct local_info_t *local; | 1020 | struct local_info_t *local; |
1059 | int i; | 1021 | int i; |
1060 | 1022 | ||
1061 | DEBUG(0, "daqp_cs_attach()\n"); | 1023 | dev_dbg(&link->dev, "daqp_cs_attach()\n"); |
1062 | 1024 | ||
1063 | for (i = 0; i < MAX_DEV; i++) | 1025 | for (i = 0; i < MAX_DEV; i++) |
1064 | if (dev_table[i] == NULL) | 1026 | if (dev_table[i] == NULL) |
@@ -1079,10 +1041,8 @@ static int daqp_cs_attach(struct pcmcia_device *link) | |||
1079 | link->priv = local; | 1041 | link->priv = local; |
1080 | 1042 | ||
1081 | /* Interrupt setup */ | 1043 | /* Interrupt setup */ |
1082 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 1044 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
1083 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
1084 | link->irq.Handler = daqp_interrupt; | 1045 | link->irq.Handler = daqp_interrupt; |
1085 | link->irq.Instance = local; | ||
1086 | 1046 | ||
1087 | /* | 1047 | /* |
1088 | General socket configuration defaults can go here. In this | 1048 | General socket configuration defaults can go here. In this |
@@ -1112,7 +1072,7 @@ static void daqp_cs_detach(struct pcmcia_device *link) | |||
1112 | { | 1072 | { |
1113 | struct local_info_t *dev = link->priv; | 1073 | struct local_info_t *dev = link->priv; |
1114 | 1074 | ||
1115 | DEBUG(0, "daqp_cs_detach(0x%p)\n", link); | 1075 | dev_dbg(&link->dev, "daqp_cs_detach\n"); |
1116 | 1076 | ||
1117 | if (link->dev_node) { | 1077 | if (link->dev_node) { |
1118 | dev->stop = 1; | 1078 | dev->stop = 1; |
@@ -1134,115 +1094,54 @@ static void daqp_cs_detach(struct pcmcia_device *link) | |||
1134 | 1094 | ||
1135 | ======================================================================*/ | 1095 | ======================================================================*/ |
1136 | 1096 | ||
1137 | static void daqp_cs_config(struct pcmcia_device *link) | ||
1138 | { | ||
1139 | struct local_info_t *dev = link->priv; | ||
1140 | tuple_t tuple; | ||
1141 | cisparse_t parse; | ||
1142 | int last_ret; | ||
1143 | u_char buf[64]; | ||
1144 | |||
1145 | DEBUG(0, "daqp_cs_config(0x%p)\n", link); | ||
1146 | |||
1147 | /* | ||
1148 | This reads the card's CONFIG tuple to find its configuration | ||
1149 | registers. | ||
1150 | */ | ||
1151 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
1152 | tuple.Attributes = 0; | ||
1153 | tuple.TupleData = buf; | ||
1154 | tuple.TupleDataMax = sizeof(buf); | ||
1155 | tuple.TupleOffset = 0; | ||
1156 | |||
1157 | last_ret = pcmcia_get_first_tuple(link, &tuple); | ||
1158 | if (last_ret) { | ||
1159 | cs_error(link, GetFirstTuple, last_ret); | ||
1160 | goto cs_failed; | ||
1161 | } | ||
1162 | 1097 | ||
1163 | last_ret = pcmcia_get_tuple_data(link, &tuple); | 1098 | static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, |
1164 | if (last_ret) { | 1099 | cistpl_cftable_entry_t *cfg, |
1165 | cs_error(link, GetTupleData, last_ret); | 1100 | cistpl_cftable_entry_t *dflt, |
1166 | goto cs_failed; | 1101 | unsigned int vcc, |
1167 | } | 1102 | void *priv_data) |
1168 | 1103 | { | |
1169 | last_ret = pcmcia_parse_tuple(&tuple, &parse); | 1104 | if (cfg->index == 0) |
1170 | if (last_ret) { | 1105 | return -ENODEV; |
1171 | cs_error(link, ParseTuple, last_ret); | ||
1172 | goto cs_failed; | ||
1173 | } | ||
1174 | link->conf.ConfigBase = parse.config.base; | ||
1175 | link->conf.Present = parse.config.rmask[0]; | ||
1176 | 1106 | ||
1177 | /* | 1107 | /* Do we need to allocate an interrupt? */ |
1178 | In this loop, we scan the CIS for configuration table entries, | 1108 | if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1) |
1179 | each of which describes a valid card configuration, including | 1109 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; |
1180 | voltage, IO window, memory window, and interrupt settings. | 1110 | |
1181 | 1111 | /* IO window settings */ | |
1182 | We make no assumptions about the card to be configured: we use | 1112 | p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; |
1183 | just the information available in the CIS. In an ideal world, | 1113 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { |
1184 | this would work for any PCMCIA card, but it requires a complete | 1114 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; |
1185 | and accurate CIS. In practice, a driver usually "knows" most of | 1115 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
1186 | these things without consulting the CIS, and most client drivers | 1116 | if (!(io->flags & CISTPL_IO_8BIT)) |
1187 | will only use the CIS to fill in implementation-defined details. | 1117 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
1188 | */ | 1118 | if (!(io->flags & CISTPL_IO_16BIT)) |
1189 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 1119 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
1190 | last_ret = pcmcia_get_first_tuple(link, &tuple); | 1120 | p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; |
1191 | if (last_ret) { | 1121 | p_dev->io.BasePort1 = io->win[0].base; |
1192 | cs_error(link, GetFirstTuple, last_ret); | 1122 | p_dev->io.NumPorts1 = io->win[0].len; |
1193 | goto cs_failed; | 1123 | if (io->nwin > 1) { |
1124 | p_dev->io.Attributes2 = p_dev->io.Attributes1; | ||
1125 | p_dev->io.BasePort2 = io->win[1].base; | ||
1126 | p_dev->io.NumPorts2 = io->win[1].len; | ||
1127 | } | ||
1194 | } | 1128 | } |
1195 | 1129 | ||
1196 | while (1) { | 1130 | /* This reserves IO space but doesn't actually enable it */ |
1197 | cistpl_cftable_entry_t dflt = { 0 }; | 1131 | return pcmcia_request_io(p_dev, &p_dev->io); |
1198 | cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); | 1132 | } |
1199 | if (pcmcia_get_tuple_data(link, &tuple)) | ||
1200 | goto next_entry; | ||
1201 | if (pcmcia_parse_tuple(&tuple, &parse)) | ||
1202 | goto next_entry; | ||
1203 | |||
1204 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | ||
1205 | dflt = *cfg; | ||
1206 | if (cfg->index == 0) | ||
1207 | goto next_entry; | ||
1208 | link->conf.ConfigIndex = cfg->index; | ||
1209 | |||
1210 | /* Do we need to allocate an interrupt? */ | ||
1211 | if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) | ||
1212 | link->conf.Attributes |= CONF_ENABLE_IRQ; | ||
1213 | |||
1214 | /* IO window settings */ | ||
1215 | link->io.NumPorts1 = link->io.NumPorts2 = 0; | ||
1216 | if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { | ||
1217 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; | ||
1218 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | ||
1219 | if (!(io->flags & CISTPL_IO_8BIT)) | ||
1220 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | ||
1221 | if (!(io->flags & CISTPL_IO_16BIT)) | ||
1222 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | ||
1223 | link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
1224 | link->io.BasePort1 = io->win[0].base; | ||
1225 | link->io.NumPorts1 = io->win[0].len; | ||
1226 | if (io->nwin > 1) { | ||
1227 | link->io.Attributes2 = link->io.Attributes1; | ||
1228 | link->io.BasePort2 = io->win[1].base; | ||
1229 | link->io.NumPorts2 = io->win[1].len; | ||
1230 | } | ||
1231 | } | ||
1232 | 1133 | ||
1233 | /* This reserves IO space but doesn't actually enable it */ | 1134 | static void daqp_cs_config(struct pcmcia_device *link) |
1234 | if (pcmcia_request_io(link, &link->io)) | 1135 | { |
1235 | goto next_entry; | 1136 | struct local_info_t *dev = link->priv; |
1137 | int ret; | ||
1236 | 1138 | ||
1237 | /* If we got this far, we're cool! */ | 1139 | dev_dbg(&link->dev, "daqp_cs_config\n"); |
1238 | break; | ||
1239 | 1140 | ||
1240 | next_entry: | 1141 | ret = pcmcia_loop_config(link, daqp_pcmcia_config_loop, NULL); |
1241 | last_ret = pcmcia_get_next_tuple(link, &tuple); | 1142 | if (ret) { |
1242 | if (last_ret) { | 1143 | dev_warn(&link->dev, "no configuration found\n"); |
1243 | cs_error(link, GetNextTuple, last_ret); | 1144 | goto failed; |
1244 | goto cs_failed; | ||
1245 | } | ||
1246 | } | 1145 | } |
1247 | 1146 | ||
1248 | /* | 1147 | /* |
@@ -1251,11 +1150,9 @@ next_entry: | |||
1251 | irq structure is initialized. | 1150 | irq structure is initialized. |
1252 | */ | 1151 | */ |
1253 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 1152 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
1254 | last_ret = pcmcia_request_irq(link, &link->irq); | 1153 | ret = pcmcia_request_irq(link, &link->irq); |
1255 | if (last_ret) { | 1154 | if (ret) |
1256 | cs_error(link, RequestIRQ, last_ret); | 1155 | goto failed; |
1257 | goto cs_failed; | ||
1258 | } | ||
1259 | } | 1156 | } |
1260 | 1157 | ||
1261 | /* | 1158 | /* |
@@ -1263,11 +1160,9 @@ next_entry: | |||
1263 | the I/O windows and the interrupt mapping, and putting the | 1160 | the I/O windows and the interrupt mapping, and putting the |
1264 | card and host interface into "Memory and IO" mode. | 1161 | card and host interface into "Memory and IO" mode. |
1265 | */ | 1162 | */ |
1266 | last_ret = pcmcia_request_configuration(link, &link->conf); | 1163 | ret = pcmcia_request_configuration(link, &link->conf); |
1267 | if (last_ret) { | 1164 | if (ret) |
1268 | cs_error(link, RequestConfiguration, last_ret); | 1165 | goto failed; |
1269 | goto cs_failed; | ||
1270 | } | ||
1271 | 1166 | ||
1272 | /* | 1167 | /* |
1273 | At this point, the dev_node_t structure(s) need to be | 1168 | At this point, the dev_node_t structure(s) need to be |
@@ -1296,14 +1191,14 @@ next_entry: | |||
1296 | 1191 | ||
1297 | return; | 1192 | return; |
1298 | 1193 | ||
1299 | cs_failed: | 1194 | failed: |
1300 | daqp_cs_release(link); | 1195 | daqp_cs_release(link); |
1301 | 1196 | ||
1302 | } /* daqp_cs_config */ | 1197 | } /* daqp_cs_config */ |
1303 | 1198 | ||
1304 | static void daqp_cs_release(struct pcmcia_device *link) | 1199 | static void daqp_cs_release(struct pcmcia_device *link) |
1305 | { | 1200 | { |
1306 | DEBUG(0, "daqp_cs_release(0x%p)\n", link); | 1201 | dev_dbg(&link->dev, "daqp_cs_release\n"); |
1307 | 1202 | ||
1308 | pcmcia_disable_device(link); | 1203 | pcmcia_disable_device(link); |
1309 | } /* daqp_cs_release */ | 1204 | } /* daqp_cs_release */ |
@@ -1363,7 +1258,6 @@ struct pcmcia_driver daqp_cs_driver = { | |||
1363 | 1258 | ||
1364 | int __init init_module(void) | 1259 | int __init init_module(void) |
1365 | { | 1260 | { |
1366 | DEBUG(0, "%s\n", version); | ||
1367 | pcmcia_register_driver(&daqp_cs_driver); | 1261 | pcmcia_register_driver(&daqp_cs_driver); |
1368 | comedi_driver_register(&driver_daqp); | 1262 | comedi_driver_register(&driver_daqp); |
1369 | return 0; | 1263 | return 0; |
@@ -1371,7 +1265,6 @@ int __init init_module(void) | |||
1371 | 1265 | ||
1372 | void __exit cleanup_module(void) | 1266 | void __exit cleanup_module(void) |
1373 | { | 1267 | { |
1374 | DEBUG(0, "daqp_cs: unloading\n"); | ||
1375 | comedi_driver_unregister(&driver_daqp); | 1268 | comedi_driver_unregister(&driver_daqp); |
1376 | pcmcia_unregister_driver(&daqp_cs_driver); | 1269 | pcmcia_unregister_driver(&daqp_cs_driver); |
1377 | } | 1270 | } |
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c index 347c3ed1d9f1..d442fd35620a 100644 --- a/drivers/telephony/ixj_pcmcia.c +++ b/drivers/telephony/ixj_pcmcia.c | |||
@@ -19,13 +19,6 @@ | |||
19 | * PCMCIA service support for Quicknet cards | 19 | * PCMCIA service support for Quicknet cards |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #ifdef PCMCIA_DEBUG | ||
23 | static int pc_debug = PCMCIA_DEBUG; | ||
24 | module_param(pc_debug, int, 0644); | ||
25 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | ||
26 | #else | ||
27 | #define DEBUG(n, args...) | ||
28 | #endif | ||
29 | 22 | ||
30 | typedef struct ixj_info_t { | 23 | typedef struct ixj_info_t { |
31 | int ndev; | 24 | int ndev; |
@@ -39,7 +32,7 @@ static void ixj_cs_release(struct pcmcia_device * link); | |||
39 | 32 | ||
40 | static int ixj_probe(struct pcmcia_device *p_dev) | 33 | static int ixj_probe(struct pcmcia_device *p_dev) |
41 | { | 34 | { |
42 | DEBUG(0, "ixj_attach()\n"); | 35 | dev_dbg(&p_dev->dev, "ixj_attach()\n"); |
43 | /* Create new ixj device */ | 36 | /* Create new ixj device */ |
44 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 37 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
45 | p_dev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 38 | p_dev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
@@ -55,33 +48,30 @@ static int ixj_probe(struct pcmcia_device *p_dev) | |||
55 | 48 | ||
56 | static void ixj_detach(struct pcmcia_device *link) | 49 | static void ixj_detach(struct pcmcia_device *link) |
57 | { | 50 | { |
58 | DEBUG(0, "ixj_detach(0x%p)\n", link); | 51 | dev_dbg(&link->dev, "ixj_detach\n"); |
59 | 52 | ||
60 | ixj_cs_release(link); | 53 | ixj_cs_release(link); |
61 | 54 | ||
62 | kfree(link->priv); | 55 | kfree(link->priv); |
63 | } | 56 | } |
64 | 57 | ||
65 | #define CS_CHECK(fn, ret) \ | ||
66 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | ||
67 | |||
68 | static void ixj_get_serial(struct pcmcia_device * link, IXJ * j) | 58 | static void ixj_get_serial(struct pcmcia_device * link, IXJ * j) |
69 | { | 59 | { |
70 | char *str; | 60 | char *str; |
71 | int i, place; | 61 | int i, place; |
72 | DEBUG(0, "ixj_get_serial(0x%p)\n", link); | 62 | dev_dbg(&link->dev, "ixj_get_serial\n"); |
73 | 63 | ||
74 | str = link->prod_id[0]; | 64 | str = link->prod_id[0]; |
75 | if (!str) | 65 | if (!str) |
76 | goto cs_failed; | 66 | goto failed; |
77 | printk("%s", str); | 67 | printk("%s", str); |
78 | str = link->prod_id[1]; | 68 | str = link->prod_id[1]; |
79 | if (!str) | 69 | if (!str) |
80 | goto cs_failed; | 70 | goto failed; |
81 | printk(" %s", str); | 71 | printk(" %s", str); |
82 | str = link->prod_id[2]; | 72 | str = link->prod_id[2]; |
83 | if (!str) | 73 | if (!str) |
84 | goto cs_failed; | 74 | goto failed; |
85 | place = 1; | 75 | place = 1; |
86 | for (i = strlen(str) - 1; i >= 0; i--) { | 76 | for (i = strlen(str) - 1; i >= 0; i--) { |
87 | switch (str[i]) { | 77 | switch (str[i]) { |
@@ -118,9 +108,9 @@ static void ixj_get_serial(struct pcmcia_device * link, IXJ * j) | |||
118 | } | 108 | } |
119 | str = link->prod_id[3]; | 109 | str = link->prod_id[3]; |
120 | if (!str) | 110 | if (!str) |
121 | goto cs_failed; | 111 | goto failed; |
122 | printk(" version %s\n", str); | 112 | printk(" version %s\n", str); |
123 | cs_failed: | 113 | failed: |
124 | return; | 114 | return; |
125 | } | 115 | } |
126 | 116 | ||
@@ -151,13 +141,13 @@ static int ixj_config(struct pcmcia_device * link) | |||
151 | cistpl_cftable_entry_t dflt = { 0 }; | 141 | cistpl_cftable_entry_t dflt = { 0 }; |
152 | 142 | ||
153 | info = link->priv; | 143 | info = link->priv; |
154 | DEBUG(0, "ixj_config(0x%p)\n", link); | 144 | dev_dbg(&link->dev, "ixj_config\n"); |
155 | 145 | ||
156 | if (pcmcia_loop_config(link, ixj_config_check, &dflt)) | 146 | if (pcmcia_loop_config(link, ixj_config_check, &dflt)) |
157 | goto cs_failed; | 147 | goto failed; |
158 | 148 | ||
159 | if (pcmcia_request_configuration(link, &link->conf)) | 149 | if (pcmcia_request_configuration(link, &link->conf)) |
160 | goto cs_failed; | 150 | goto failed; |
161 | 151 | ||
162 | /* | 152 | /* |
163 | * Register the card with the core. | 153 | * Register the card with the core. |
@@ -170,7 +160,7 @@ static int ixj_config(struct pcmcia_device * link) | |||
170 | ixj_get_serial(link, j); | 160 | ixj_get_serial(link, j); |
171 | return 0; | 161 | return 0; |
172 | 162 | ||
173 | cs_failed: | 163 | failed: |
174 | ixj_cs_release(link); | 164 | ixj_cs_release(link); |
175 | return -ENODEV; | 165 | return -ENODEV; |
176 | } | 166 | } |
@@ -178,7 +168,7 @@ static int ixj_config(struct pcmcia_device * link) | |||
178 | static void ixj_cs_release(struct pcmcia_device *link) | 168 | static void ixj_cs_release(struct pcmcia_device *link) |
179 | { | 169 | { |
180 | ixj_info_t *info = link->priv; | 170 | ixj_info_t *info = link->priv; |
181 | DEBUG(0, "ixj_cs_release(0x%p)\n", link); | 171 | dev_dbg(&link->dev, "ixj_cs_release\n"); |
182 | info->ndev = 0; | 172 | info->ndev = 0; |
183 | pcmcia_disable_device(link); | 173 | pcmcia_disable_device(link); |
184 | } | 174 | } |
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index 516848dd9b48..39d253e841f6 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/drivers/usb/host/sl811_cs.c | |||
@@ -37,28 +37,8 @@ MODULE_LICENSE("GPL"); | |||
37 | /* MACROS */ | 37 | /* MACROS */ |
38 | /*====================================================================*/ | 38 | /*====================================================================*/ |
39 | 39 | ||
40 | #if defined(DEBUG) || defined(PCMCIA_DEBUG) | ||
41 | |||
42 | static int pc_debug = 0; | ||
43 | module_param(pc_debug, int, 0644); | ||
44 | |||
45 | #define DBG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG "sl811_cs: " args) | ||
46 | |||
47 | #else | ||
48 | #define DBG(n, args...) do{}while(0) | ||
49 | #endif /* no debugging */ | ||
50 | |||
51 | #define INFO(args...) printk(KERN_INFO "sl811_cs: " args) | 40 | #define INFO(args...) printk(KERN_INFO "sl811_cs: " args) |
52 | 41 | ||
53 | #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444) | ||
54 | |||
55 | #define CS_CHECK(fn, ret) \ | ||
56 | do { \ | ||
57 | last_fn = (fn); \ | ||
58 | if ((last_ret = (ret)) != 0) \ | ||
59 | goto cs_failed; \ | ||
60 | } while (0) | ||
61 | |||
62 | /*====================================================================*/ | 42 | /*====================================================================*/ |
63 | /* VARIABLES */ | 43 | /* VARIABLES */ |
64 | /*====================================================================*/ | 44 | /*====================================================================*/ |
@@ -76,7 +56,7 @@ static void sl811_cs_release(struct pcmcia_device * link); | |||
76 | 56 | ||
77 | static void release_platform_dev(struct device * dev) | 57 | static void release_platform_dev(struct device * dev) |
78 | { | 58 | { |
79 | DBG(0, "sl811_cs platform_dev release\n"); | 59 | dev_dbg(dev, "sl811_cs platform_dev release\n"); |
80 | dev->parent = NULL; | 60 | dev->parent = NULL; |
81 | } | 61 | } |
82 | 62 | ||
@@ -140,7 +120,7 @@ static int sl811_hc_init(struct device *parent, resource_size_t base_addr, | |||
140 | 120 | ||
141 | static void sl811_cs_detach(struct pcmcia_device *link) | 121 | static void sl811_cs_detach(struct pcmcia_device *link) |
142 | { | 122 | { |
143 | DBG(0, "sl811_cs_detach(0x%p)\n", link); | 123 | dev_dbg(&link->dev, "sl811_cs_detach\n"); |
144 | 124 | ||
145 | sl811_cs_release(link); | 125 | sl811_cs_release(link); |
146 | 126 | ||
@@ -150,7 +130,7 @@ static void sl811_cs_detach(struct pcmcia_device *link) | |||
150 | 130 | ||
151 | static void sl811_cs_release(struct pcmcia_device * link) | 131 | static void sl811_cs_release(struct pcmcia_device * link) |
152 | { | 132 | { |
153 | DBG(0, "sl811_cs_release(0x%p)\n", link); | 133 | dev_dbg(&link->dev, "sl811_cs_release\n"); |
154 | 134 | ||
155 | pcmcia_disable_device(link); | 135 | pcmcia_disable_device(link); |
156 | platform_device_unregister(&platform_dev); | 136 | platform_device_unregister(&platform_dev); |
@@ -205,11 +185,11 @@ static int sl811_cs_config_check(struct pcmcia_device *p_dev, | |||
205 | 185 | ||
206 | static int sl811_cs_config(struct pcmcia_device *link) | 186 | static int sl811_cs_config(struct pcmcia_device *link) |
207 | { | 187 | { |
208 | struct device *parent = &handle_to_dev(link); | 188 | struct device *parent = &link->dev; |
209 | local_info_t *dev = link->priv; | 189 | local_info_t *dev = link->priv; |
210 | int last_fn, last_ret; | 190 | int ret; |
211 | 191 | ||
212 | DBG(0, "sl811_cs_config(0x%p)\n", link); | 192 | dev_dbg(&link->dev, "sl811_cs_config\n"); |
213 | 193 | ||
214 | if (pcmcia_loop_config(link, sl811_cs_config_check, NULL)) | 194 | if (pcmcia_loop_config(link, sl811_cs_config_check, NULL)) |
215 | goto failed; | 195 | goto failed; |
@@ -217,14 +197,16 @@ static int sl811_cs_config(struct pcmcia_device *link) | |||
217 | /* require an IRQ and two registers */ | 197 | /* require an IRQ and two registers */ |
218 | if (!link->io.NumPorts1 || link->io.NumPorts1 < 2) | 198 | if (!link->io.NumPorts1 || link->io.NumPorts1 < 2) |
219 | goto failed; | 199 | goto failed; |
220 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 200 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
221 | CS_CHECK(RequestIRQ, | 201 | ret = pcmcia_request_irq(link, &link->irq); |
222 | pcmcia_request_irq(link, &link->irq)); | 202 | if (ret) |
223 | else | 203 | goto failed; |
204 | } else | ||
224 | goto failed; | 205 | goto failed; |
225 | 206 | ||
226 | CS_CHECK(RequestConfiguration, | 207 | ret = pcmcia_request_configuration(link, &link->conf); |
227 | pcmcia_request_configuration(link, &link->conf)); | 208 | if (ret) |
209 | goto failed; | ||
228 | 210 | ||
229 | sprintf(dev->node.dev_name, driver_name); | 211 | sprintf(dev->node.dev_name, driver_name); |
230 | dev->node.major = dev->node.minor = 0; | 212 | dev->node.major = dev->node.minor = 0; |
@@ -241,8 +223,6 @@ static int sl811_cs_config(struct pcmcia_device *link) | |||
241 | 223 | ||
242 | if (sl811_hc_init(parent, link->io.BasePort1, link->irq.AssignedIRQ) | 224 | if (sl811_hc_init(parent, link->io.BasePort1, link->irq.AssignedIRQ) |
243 | < 0) { | 225 | < 0) { |
244 | cs_failed: | ||
245 | cs_error(link, last_fn, last_ret); | ||
246 | failed: | 226 | failed: |
247 | printk(KERN_WARNING "sl811_cs_config failed\n"); | 227 | printk(KERN_WARNING "sl811_cs_config failed\n"); |
248 | sl811_cs_release(link); | 228 | sl811_cs_release(link); |
@@ -263,7 +243,6 @@ static int sl811_cs_probe(struct pcmcia_device *link) | |||
263 | 243 | ||
264 | /* Initialize */ | 244 | /* Initialize */ |
265 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 245 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
266 | link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; | ||
267 | link->irq.Handler = NULL; | 246 | link->irq.Handler = NULL; |
268 | 247 | ||
269 | link->conf.Attributes = 0; | 248 | link->conf.Attributes = 0; |