Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66024db5 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Dominik Brodowski
Browse files

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket 



skt->irq is a mere duplication of pcmcia_socket's pci_irq member.
Get rid of it.

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

drivers/pcmcia/pxa2xx_base.c

+1 −1
Original line number Diff line number Diff line
@@ -287,10 +287,10 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) 
		skt = &sinfo->skt[i];



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

		skt->irq = NO_IRQ;

		skt->ops = ops;

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

		skt->socket.dev.parent = dev;

		skt->socket.pci_irq = NO_IRQ;



		ret = pxa2xx_drv_pcmcia_add_one(skt);

		if (ret)

drivers/pcmcia/pxa2xx_cm_x255.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
		return ret;

	gpio_direction_output(GPIO_PCMCIA_RESET, 0);



	skt->irq = skt->nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;

	skt->socket.pci_irq = skt->nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;

	ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));

	if (!ret)

		gpio_free(GPIO_PCMCIA_RESET);

drivers/pcmcia/pxa2xx_cm_x270.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
		return ret;

	gpio_direction_output(GPIO_PCMCIA_RESET, 0);



	skt->irq = PCMCIA_S0_RDYINT;

	skt->socket.pci_irq = PCMCIA_S0_RDYINT;

	ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));

	if (!ret)

		gpio_free(GPIO_PCMCIA_RESET);

drivers/pcmcia/pxa2xx_e740.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static struct pcmcia_irqs cd_irqs[] = { 


static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	skt->irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) :

	skt->socket.pci_irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) :

				IRQ_GPIO(GPIO_E740_PCMCIA_RDY1);



	return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1);

drivers/pcmcia/pxa2xx_mainstone.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int mst_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
	 * before we enable them as outputs.

	 */



	skt->irq = (skt->nr == 0) ? MAINSTONE_S0_IRQ : MAINSTONE_S1_IRQ;

	skt->socket.pci_irq = (skt->nr == 0) ? MAINSTONE_S0_IRQ : MAINSTONE_S1_IRQ;

	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));

}