diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-03-29 17:12:34 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 02:30:14 -0500 |
commit | f397b9c5dcc30a575973b2e4f0a602fc85b38853 (patch) | |
tree | 390591fa924942ba928b873ba30fbbb416fe046b /drivers/pcmcia | |
parent | b62d99b5028b6df1c32b864fd9dd32ad6b42d396 (diff) |
PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
The 'dev' member is now only ever written, so we can safely remove it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 1 | ||||
-rw-r--r-- | drivers/pcmcia/sa11xx_base.c | 1 | ||||
-rw-r--r-- | drivers/pcmcia/soc_common.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index c9c104b57c59..7f61b62a1de0 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
@@ -288,7 +288,6 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) | |||
288 | 288 | ||
289 | skt->nr = ops->first + i; | 289 | skt->nr = ops->first + i; |
290 | skt->irq = NO_IRQ; | 290 | skt->irq = NO_IRQ; |
291 | skt->dev = dev; | ||
292 | skt->ops = ops; | 291 | skt->ops = ops; |
293 | skt->socket.owner = ops->owner; | 292 | skt->socket.owner = ops->owner; |
294 | skt->socket.dev.parent = dev; | 293 | skt->socket.dev.parent = dev; |
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 4db81490e5c9..ac9987243131 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c | |||
@@ -236,7 +236,6 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, | |||
236 | 236 | ||
237 | skt->nr = first + i; | 237 | skt->nr = first + i; |
238 | skt->irq = NO_IRQ; | 238 | skt->irq = NO_IRQ; |
239 | skt->dev = dev; | ||
240 | skt->ops = ops; | 239 | skt->ops = ops; |
241 | skt->socket.owner = ops->owner; | 240 | skt->socket.owner = ops->owner; |
242 | skt->socket.dev.parent = dev; | 241 | skt->socket.dev.parent = dev; |
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index f7533dcba679..4fb06f797ad6 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h | |||
@@ -30,7 +30,6 @@ struct soc_pcmcia_socket { | |||
30 | /* | 30 | /* |
31 | * Info from low level handler | 31 | * Info from low level handler |
32 | */ | 32 | */ |
33 | struct device *dev; | ||
34 | unsigned int nr; | 33 | unsigned int nr; |
35 | unsigned int irq; | 34 | unsigned int irq; |
36 | 35 | ||