Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8405f0f authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: move Vpp setup to struct pcmcia_device 



Some drivers prefer to explicitly set Vpp. Instead of passing the
voltage inside config_req_t, store it in struct pcmcia_device.

CC: linux-ide@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-mtd@lists.infradead.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: linux-usb@vger.kernel.org
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 fb49fa53

drivers/ata/pata_pcmcia.c

+2 −2
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev, 
	}



	if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))

		pdev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;

		pdev->vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;

	else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))

		pdev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;

		pdev->vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;



	if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {

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

drivers/bluetooth/bt3c_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static int bt3c_check_config(struct pcmcia_device *p_dev, 
	p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;



	if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))

		p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

		p_dev->vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

	if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&

	    (cf->io.win[0].base != 0)) {

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

drivers/bluetooth/btuart_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int btuart_check_config(struct pcmcia_device *p_dev, 
	p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;



	if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))

		p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

		p_dev->vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

	if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&

	    (cf->io.win[0].base != 0)) {

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

drivers/ide/ide-cs.c

+3 −3
Original line number Diff line number Diff line
@@ -221,9 +221,9 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev, 
	}



	if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))

		pdev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;

		pdev->vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;

	else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))

		pdev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;

		pdev->vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;



	if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {

		cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
@@ -311,7 +311,7 @@ static int ide_config(struct pcmcia_device *link) 
    info->host = host;

    dev_info(&link->dev, "ide-cs: hd%c: Vpp = %d.%d\n",

	    'a' + host->ports[0]->index * 2,

	    link->conf.Vpp / 10, link->conf.Vpp % 10);

	    link->vpp / 10, link->vpp % 10);



    kfree(stk);

    return 0;

drivers/isdn/hisax/sedlbauer_cs.c

+4 −4
Original line number Diff line number Diff line
@@ -191,9 +191,9 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, 
	}



	if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))

		p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;

		p_dev->vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;

	else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))

		p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;

		p_dev->vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;



	p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
@@ -257,8 +257,8 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link) 
    /* Finally, report what we've done */

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

	   link->conf.ConfigIndex);

    if (link->conf.Vpp)

	printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);

    if (link->vpp)

	printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);

    if (link->conf.Attributes & CONF_ENABLE_IRQ)

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

    if (link->resource[0])