Commit e0d21178 authored by Russell King's avatar Russell King
Browse files

PCMCIA: soc_common: move common initialization into soc_common 



Move common socket initialization into soc_common.c.

Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dcd6c922

drivers/pcmcia/pxa2xx_base.c

+1 −4
Original line number Diff line number Diff line
@@ -318,10 +318,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) 


		skt->nr = ops->first + i;

		skt->clk = clk;

		skt->ops = ops;

		skt->socket.owner = ops->owner;

		skt->socket.dev.parent = &dev->dev;

		skt->socket.pci_irq = NO_IRQ;

		soc_pcmcia_init_one(skt, ops, &dev->dev);



		ret = pxa2xx_drv_pcmcia_add_one(skt);

		if (ret)

drivers/pcmcia/sa1111_generic.c

+1 −3
Original line number Diff line number Diff line
@@ -141,9 +141,7 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, 
			return -ENOMEM;



		s->soc.nr = ops->first + i;

		s->soc.ops = ops;

		s->soc.socket.owner = ops->owner;

		s->soc.socket.dev.parent = &dev->dev;

		soc_pcmcia_init_one(&s->soc, ops, &dev->dev);

		s->soc.socket.pci_irq = s->soc.nr ?

				dev->irq[IDX_IRQ_S0_READY_NINT] :

				dev->irq[IDX_IRQ_S1_READY_NINT];

drivers/pcmcia/sa11xx_base.c

+1 −4
Original line number Diff line number Diff line
@@ -236,10 +236,7 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, 
		skt = &sinfo->skt[i];



		skt->nr = first + i;

		skt->ops = ops;

		skt->socket.owner = ops->owner;

		skt->socket.dev.parent = dev;

		skt->socket.pci_irq = NO_IRQ;

		soc_pcmcia_init_one(skt, ops, dev);



		ret = sa11xx_drv_pcmcia_add_one(skt);

		if (ret)

drivers/pcmcia/soc_common.c

+10 −0
Original line number Diff line number Diff line
@@ -635,6 +635,16 @@ module_exit(soc_pcmcia_cpufreq_unregister); 


#endif



void soc_pcmcia_init_one(struct soc_pcmcia_socket *skt,

	struct pcmcia_low_level *ops, struct device *dev)

{

	skt->ops = ops;

	skt->socket.owner = ops->owner;

	skt->socket.dev.parent = dev;

	skt->socket.pci_irq = NO_IRQ;

}

EXPORT_SYMBOL(soc_pcmcia_init_one);



void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt)

{

	mutex_lock(&soc_pcmcia_sockets_lock);

drivers/pcmcia/soc_common.h

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ extern void soc_pcmcia_disable_irqs(struct soc_pcmcia_socket *skt, struct pcmcia 
extern void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt, struct pcmcia_irqs *irqs, int nr);

extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_pcmcia_timing *);





void soc_pcmcia_init_one(struct soc_pcmcia_socket *skt,

	struct pcmcia_low_level *ops, struct device *dev);

void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt);

int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt);