diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-30 03:51:52 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:23 -0400 |
commit | 440eed43e2a95bb842488755683716814da10f2b (patch) | |
tree | 45c49181a077f845cd366cfa7dc07f259fd01078 /drivers/char/pcmcia | |
parent | 9485ee14e143c7076e88deea1e87ca3eb0b2f94e (diff) |
pcmcia: introduce autoconfiguration feature
Introduce an autoconfiguration feature to set certain values in
pcmcia_loop_config(), instead of copying the same code over and over
in each PCMCIA driver. At first, introduce the following options:
CONF_AUTO_CHECK_VCC check or matching Vcc entry
CONF_AUTO_SET_VPP set Vpp
CONF_AUTO_AUDIO enable the speaker line
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 1 | ||||
-rw-r--r-- | drivers/char/pcmcia/cm4040_cs.c | 1 | ||||
-rw-r--r-- | drivers/char/pcmcia/ipwireless/main.c | 1 | ||||
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 75caa8c1b484..0b2f3b9d261a 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1744,7 +1744,6 @@ static void cmm_cm4000_release(struct pcmcia_device * link) | |||
1744 | static int cm4000_config_check(struct pcmcia_device *p_dev, | 1744 | static int cm4000_config_check(struct pcmcia_device *p_dev, |
1745 | cistpl_cftable_entry_t *cfg, | 1745 | cistpl_cftable_entry_t *cfg, |
1746 | cistpl_cftable_entry_t *dflt, | 1746 | cistpl_cftable_entry_t *dflt, |
1747 | unsigned int vcc, | ||
1748 | void *priv_data) | 1747 | void *priv_data) |
1749 | { | 1748 | { |
1750 | if (!cfg->io.nwin) | 1749 | if (!cfg->io.nwin) |
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index 0c87b80bf641..acf88d5c72b2 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c | |||
@@ -518,7 +518,6 @@ static void cm4040_reader_release(struct pcmcia_device *link) | |||
518 | static int cm4040_config_check(struct pcmcia_device *p_dev, | 518 | static int cm4040_config_check(struct pcmcia_device *p_dev, |
519 | cistpl_cftable_entry_t *cfg, | 519 | cistpl_cftable_entry_t *cfg, |
520 | cistpl_cftable_entry_t *dflt, | 520 | cistpl_cftable_entry_t *dflt, |
521 | unsigned int vcc, | ||
522 | void *priv_data) | 521 | void *priv_data) |
523 | { | 522 | { |
524 | int rc; | 523 | int rc; |
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index cd21b2bcdcd7..1b7f0920737b 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
@@ -78,7 +78,6 @@ static void signalled_reboot_callback(void *callback_data) | |||
78 | static int ipwireless_probe(struct pcmcia_device *p_dev, | 78 | static int ipwireless_probe(struct pcmcia_device *p_dev, |
79 | cistpl_cftable_entry_t *cfg, | 79 | cistpl_cftable_entry_t *cfg, |
80 | cistpl_cftable_entry_t *dflt, | 80 | cistpl_cftable_entry_t *dflt, |
81 | unsigned int vcc, | ||
82 | void *priv_data) | 81 | void *priv_data) |
83 | { | 82 | { |
84 | struct ipw_dev *ipw = priv_data; | 83 | struct ipw_dev *ipw = priv_data; |
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 99feaedc53a1..c701434f76b7 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -564,7 +564,6 @@ static int mgslpc_probe(struct pcmcia_device *link) | |||
564 | static int mgslpc_ioprobe(struct pcmcia_device *p_dev, | 564 | static int mgslpc_ioprobe(struct pcmcia_device *p_dev, |
565 | cistpl_cftable_entry_t *cfg, | 565 | cistpl_cftable_entry_t *cfg, |
566 | cistpl_cftable_entry_t *dflt, | 566 | cistpl_cftable_entry_t *dflt, |
567 | unsigned int vcc, | ||
568 | void *priv_data) | 567 | void *priv_data) |
569 | { | 568 | { |
570 | if (!cfg->io.nwin) | 569 | if (!cfg->io.nwin) |