diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-02 09:30:31 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-22 19:22:00 -0400 |
commit | 8e2fc39ddea7fe8c6798837da282db88a09af793 (patch) | |
tree | 7cba37b5b86f4ff25562012a14e29424e3872de0 /drivers/bluetooth | |
parent | 498ac1899b62626bf6879a251d75c22ec564c559 (diff) |
pcmcia: pcmcia_config_loop() default CIS entry handling
Many drivers use the default CIS entry within their pcmcia_config_loop()
callback function. Therefore, factor the default CIS entry handling out.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 3436be152485..794a5ef9ea22 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -680,6 +680,7 @@ static void bt3c_detach(struct pcmcia_device *link) | |||
680 | 680 | ||
681 | static int bt3c_check_config(struct pcmcia_device *p_dev, | 681 | static int bt3c_check_config(struct pcmcia_device *p_dev, |
682 | cistpl_cftable_entry_t *cf, | 682 | cistpl_cftable_entry_t *cf, |
683 | cistpl_cftable_entry_t *dflt, | ||
683 | void *priv_data) | 684 | void *priv_data) |
684 | { | 685 | { |
685 | unsigned long try = (unsigned long) priv_data; | 686 | unsigned long try = (unsigned long) priv_data; |
@@ -699,6 +700,7 @@ static int bt3c_check_config(struct pcmcia_device *p_dev, | |||
699 | 700 | ||
700 | static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev, | 701 | static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev, |
701 | cistpl_cftable_entry_t *cf, | 702 | cistpl_cftable_entry_t *cf, |
703 | cistpl_cftable_entry_t *dflt, | ||
702 | void *priv_data) | 704 | void *priv_data) |
703 | { | 705 | { |
704 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | 706 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; |
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 5e31ea2f2d6f..32017f96067c 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -609,6 +609,7 @@ static void btuart_detach(struct pcmcia_device *link) | |||
609 | 609 | ||
610 | static int btuart_check_config(struct pcmcia_device *p_dev, | 610 | static int btuart_check_config(struct pcmcia_device *p_dev, |
611 | cistpl_cftable_entry_t *cf, | 611 | cistpl_cftable_entry_t *cf, |
612 | cistpl_cftable_entry_t *dflt, | ||
612 | void *priv_data) | 613 | void *priv_data) |
613 | { | 614 | { |
614 | unsigned long try = (unsigned long) priv_data; | 615 | unsigned long try = (unsigned long) priv_data; |
@@ -628,6 +629,7 @@ static int btuart_check_config(struct pcmcia_device *p_dev, | |||
628 | 629 | ||
629 | static int btuart_check_config_notpicky(struct pcmcia_device *p_dev, | 630 | static int btuart_check_config_notpicky(struct pcmcia_device *p_dev, |
630 | cistpl_cftable_entry_t *cf, | 631 | cistpl_cftable_entry_t *cf, |
632 | cistpl_cftable_entry_t *dflt, | ||
631 | void *priv_data) | 633 | void *priv_data) |
632 | { | 634 | { |
633 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | 635 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; |
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 1846e2aa9d4a..1830ebd6ca7b 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -592,6 +592,7 @@ static void dtl1_detach(struct pcmcia_device *link) | |||
592 | 592 | ||
593 | static int dtl1_confcheck(struct pcmcia_device *p_dev, | 593 | static int dtl1_confcheck(struct pcmcia_device *p_dev, |
594 | cistpl_cftable_entry_t *cf, | 594 | cistpl_cftable_entry_t *cf, |
595 | cistpl_cftable_entry_t *dflt, | ||
595 | void *priv_data) | 596 | void *priv_data) |
596 | { | 597 | { |
597 | if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) { | 598 | if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) { |