diff options
| author | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2010-10-26 20:25:49 +0200 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2011-12-10 15:53:09 +0100 |
| commit | 97789eaf5bbb603eb87b578e49c7222ccf330a87 (patch) | |
| tree | e96cc795100720f24aa67507a1eb1d25ab1a068e | |
| parent | 9de0975f628a36b72012935d90026a42600c7366 (diff) | |
| download | linux-hpc-97789eaf5bbb603eb87b578e49c7222ccf330a87.tar.gz | |
driverS/pcmcia/sa1100_jornada720.c :
* Theres no point in fiddling with device when they
are really after sadev->device. So change that and remove
warnings.
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
| -rw-r--r-- | drivers/pcmcia/sa1100_jornada720.c | 11 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 6 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1111_generic.h | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c index 6bcabee6bde468..ac6d606e571ba0 100644 --- a/drivers/pcmcia/sa1100_jornada720.c +++ b/drivers/pcmcia/sa1100_jornada720.c @@ -97,22 +97,21 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = { .nr = 2, }; -int __devinit pcmcia_jornada720_init(struct device *dev) +int pcmcia_jornada720_init(struct sa1111_dev *sadev) { int ret = -ENODEV; if (machine_is_jornada720()) { - unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3; GRER |= 0x00000002; /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */ - sa1111_set_io_dir(dev, pin, 0, 0); - sa1111_set_io(dev, pin, 0); - sa1111_set_sleep_io(dev, pin, 0); + sa1111_set_io_dir(sadev, GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3, 0, 0); + sa1111_set_io(sadev, GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3, 0); + sa1111_set_sleep_io(sadev, GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3, 0); sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops); - ret = sa1111_pcmcia_add(dev, &jornada720_pcmcia_ops, + ret = sa1111_pcmcia_add(sadev, &jornada720_pcmcia_ops, sa11xx_drv_pcmcia_add_one); } diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 59866905ea37e5..11896b7186e919 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -145,8 +145,8 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, s->soc.socket.owner = ops->owner; s->soc.socket.dev.parent = &dev->dev; s->soc.socket.pci_irq = s->soc.nr ? - dev->irq[IDX_IRQ_S0_READY_NINT] : - dev->irq[IDX_IRQ_S1_READY_NINT]; + dev->irq[IDX_IRQ_S1_READY_NINT] : + dev->irq[IDX_IRQ_S0_READY_NINT]; s->dev = dev; ret = add(&s->soc); @@ -188,7 +188,7 @@ static int pcmcia_probe(struct sa1111_dev *dev) pcmcia_badge4_init(&dev->dev); #endif #ifdef CONFIG_SA1100_JORNADA720 - pcmcia_jornada720_init(&dev->dev); + pcmcia_jornada720_init(dev); #endif #ifdef CONFIG_ARCH_LUBBOCK pcmcia_lubbock_init(dev); diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h index 02dc8577cdafca..2092aad67f4c82 100644 --- a/drivers/pcmcia/sa1111_generic.h +++ b/drivers/pcmcia/sa1111_generic.h @@ -20,7 +20,7 @@ extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const sock extern void sa1111_pcmcia_socket_init(struct soc_pcmcia_socket *); extern int pcmcia_badge4_init(struct device *); -extern int pcmcia_jornada720_init(struct device *); +extern int pcmcia_jornada720_init(struct sa1111_dev *); extern int pcmcia_lubbock_init(struct sa1111_dev *); extern int pcmcia_neponset_init(struct sa1111_dev *); |