Commit 7feabb64 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: move config_{base,index,regs} to struct pcmcia_device 



Several drivers prefer to explicitly set config_{base,index,regs},
formerly known as ConfigBase, ConfigIndex and Present. Instead of
passing these values inside config_req_t, store it in struct
pcmcia_device.

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: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 37979e15

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static int bluecard_config(struct pcmcia_device *link) 
	bluecard_info_t *info = link->priv;

	int i, n;



	link->conf.ConfigIndex = 0x20;

	link->config_index = 0x20;



	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 64;

drivers/char/pcmcia/ipwireless/main.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 


	/* 0x40 causes it to generate level mode interrupts. */

	/* 0x04 enables IREQ pin. */

	p_dev->conf.ConfigIndex = cfg->index | 0x44;

	p_dev->config_index = cfg->index | 0x44;

	p_dev->io_lines = 16;

	ret = pcmcia_request_io(p_dev);

	if (ret)

drivers/char/pcmcia/synclink_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -594,8 +594,8 @@ static int mgslpc_config(struct pcmcia_device *link) 
	    goto failed;



    link->conf.Attributes = CONF_ENABLE_IRQ;

    link->conf.ConfigIndex = 8;

    link->conf.Present = PRESENT_OPTION;

    link->config_index = 8;

    link->config_regs = PRESENT_OPTION;



    ret = pcmcia_request_irq(link, mgslpc_isr);

    if (ret)
@@ -608,7 +608,7 @@ static int mgslpc_config(struct pcmcia_device *link) 
    info->irq_level = link->irq;



    dev_info(&link->dev, "index 0x%02x:",

	    link->conf.ConfigIndex);

	    link->config_index);

    if (link->conf.Attributes & CONF_ENABLE_IRQ)

	    printk(", irq %d", link->irq);

    if (link->resource[0])

drivers/ide/ide-cs.c

+1 −2
Original line number Diff line number Diff line
@@ -227,8 +227,7 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev, 
	if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {

		cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;

		pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;



		pdev->conf.ConfigIndex = cfg->index;

		pdev->config_index = cfg->index;

		pdev->resource[0]->start = io->win[0].base;

		if (!(io->flags & CISTPL_IO_16BIT)) {

			pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

drivers/isdn/hardware/avm/avm_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ static int avmcs_probe(struct pcmcia_device *p_dev) 


    /* General socket configuration */

    p_dev->conf.Attributes = CONF_ENABLE_IRQ;

    p_dev->conf.ConfigIndex = 1;

    p_dev->conf.Present = PRESENT_OPTION;

    p_dev->config_index = 1;

    p_dev->config_regs = PRESENT_OPTION;



    return avmcs_config(p_dev);

} /* avmcs_attach */

CRA Git | Maintained and supported by SUSTech CRA and CCSE