pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
pcmcia_enable_device() now replaces pcmcia_request_configuration(). Instead of config_req_t, all necessary flags are either passed as a parameter to pcmcia_enable_device(), or (in rare circumstances) set in struct pcmcia_device -> flags. With the last remaining user of include/pcmcia/cs.h gone, remove all references. 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>
这个提交包含在:
@@ -27,7 +27,6 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include <pcmcia/cs.h>
|
||||
#include <pcmcia/cistpl.h>
|
||||
#include <pcmcia/cisreg.h>
|
||||
#include <pcmcia/ds.h>
|
||||
@@ -109,7 +108,7 @@ static int __devinit teles_probe(struct pcmcia_device *link)
|
||||
link->resource[0]->end = 96;
|
||||
link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
|
||||
|
||||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->config_flags |= CONF_ENABLE_IRQ;
|
||||
|
||||
return teles_cs_config(link);
|
||||
} /* teles_attach */
|
||||
@@ -185,15 +184,14 @@ static int __devinit teles_cs_config(struct pcmcia_device *link)
|
||||
if (!link->irq)
|
||||
goto cs_failed;
|
||||
|
||||
i = pcmcia_request_configuration(link, &link->conf);
|
||||
i = pcmcia_enable_device(link);
|
||||
if (i != 0)
|
||||
goto cs_failed;
|
||||
|
||||
/* Finally, report what we've done */
|
||||
dev_info(&link->dev, "index 0x%02x:",
|
||||
link->config_index);
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
||||
printk(", irq %d", link->irq);
|
||||
printk(", irq %d", link->irq);
|
||||
if (link->resource[0])
|
||||
printk(" & %pR", link->resource[0]);
|
||||
if (link->resource[1])
|
||||
|
在新工单中引用
屏蔽一个用户