aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia/cm4000_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/pcmcia/cm4000_cs.c')
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index a8be2a7906e0..18484edc1259 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -421,7 +421,7 @@ static struct card_fixup card_fixups[] = {
421static void set_cardparameter(struct cm4000_dev *dev) 421static void set_cardparameter(struct cm4000_dev *dev)
422{ 422{
423 int i; 423 int i;
424 unsigned int iobase = dev->p_dev->io.BasePort1; 424 unsigned int iobase = dev->p_dev->resource[0]->start;
425 u_int8_t stopbits = 0x02; /* ISO default */ 425 u_int8_t stopbits = 0x02; /* ISO default */
426 426
427 DEBUGP(3, dev, "-> set_cardparameter\n"); 427 DEBUGP(3, dev, "-> set_cardparameter\n");
@@ -454,7 +454,7 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq)
454 unsigned short num_bytes_read; 454 unsigned short num_bytes_read;
455 unsigned char pts_reply[4]; 455 unsigned char pts_reply[4];
456 ssize_t rc; 456 ssize_t rc;
457 unsigned int iobase = dev->p_dev->io.BasePort1; 457 unsigned int iobase = dev->p_dev->resource[0]->start;
458 458
459 rc = 0; 459 rc = 0;
460 460
@@ -663,7 +663,7 @@ static void terminate_monitor(struct cm4000_dev *dev)
663static void monitor_card(unsigned long p) 663static void monitor_card(unsigned long p)
664{ 664{
665 struct cm4000_dev *dev = (struct cm4000_dev *) p; 665 struct cm4000_dev *dev = (struct cm4000_dev *) p;
666 unsigned int iobase = dev->p_dev->io.BasePort1; 666 unsigned int iobase = dev->p_dev->resource[0]->start;
667 unsigned short s; 667 unsigned short s;
668 struct ptsreq ptsreq; 668 struct ptsreq ptsreq;
669 int i, atrc; 669 int i, atrc;
@@ -924,7 +924,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
924 loff_t *ppos) 924 loff_t *ppos)
925{ 925{
926 struct cm4000_dev *dev = filp->private_data; 926 struct cm4000_dev *dev = filp->private_data;
927 unsigned int iobase = dev->p_dev->io.BasePort1; 927 unsigned int iobase = dev->p_dev->resource[0]->start;
928 ssize_t rc; 928 ssize_t rc;
929 int i, j, k; 929 int i, j, k;
930 930
@@ -1047,7 +1047,7 @@ static ssize_t cmm_write(struct file *filp, const char __user *buf,
1047 size_t count, loff_t *ppos) 1047 size_t count, loff_t *ppos)
1048{ 1048{
1049 struct cm4000_dev *dev = filp->private_data; 1049 struct cm4000_dev *dev = filp->private_data;
1050 unsigned int iobase = dev->p_dev->io.BasePort1; 1050 unsigned int iobase = dev->p_dev->resource[0]->start;
1051 unsigned short s; 1051 unsigned short s;
1052 unsigned char tmp; 1052 unsigned char tmp;
1053 unsigned char infolen; 1053 unsigned char infolen;
@@ -1400,7 +1400,7 @@ static void stop_monitor(struct cm4000_dev *dev)
1400static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 1400static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
1401{ 1401{
1402 struct cm4000_dev *dev = filp->private_data; 1402 struct cm4000_dev *dev = filp->private_data;
1403 unsigned int iobase = dev->p_dev->io.BasePort1; 1403 unsigned int iobase = dev->p_dev->resource[0]->start;
1404 struct inode *inode = filp->f_path.dentry->d_inode; 1404 struct inode *inode = filp->f_path.dentry->d_inode;
1405 struct pcmcia_device *link; 1405 struct pcmcia_device *link;
1406 int size; 1406 int size;