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: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index e872e0684273..50574e869418 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1624,10 +1624,10 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
                 }
 
                 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
-                        p_dev->conf.Vpp =
+                        p_dev->vpp =
                                 cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 } else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
-                        p_dev->conf.Vpp =
+                        p_dev->vpp =
                                 dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 }
 
@@ -1749,8 +1749,8 @@ static int nsp_cs_config(struct pcmcia_device *link)
         /* Finally, report what we've done */
         printk(KERN_INFO "nsp_cs: 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);