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

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

PCMCIA: sa1111: remove duplicated initializers 



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

drivers/pcmcia/pxa2xx_lubbock.c

+0 −4
Original line number Diff line number Diff line
@@ -201,12 +201,8 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 


static struct pcmcia_low_level lubbock_pcmcia_ops = {

	.owner			= THIS_MODULE,

	.hw_init		= sa1111_pcmcia_hw_init,

	.hw_shutdown		= sa1111_pcmcia_hw_shutdown,

	.socket_state		= sa1111_pcmcia_socket_state,

	.configure_socket	= lubbock_pcmcia_configure_socket,

	.socket_init		= sa1111_pcmcia_socket_init,

	.socket_suspend		= sa1111_pcmcia_socket_suspend,

	.first			= 0,

	.nr			= 2,

};

drivers/pcmcia/sa1100_badge4.c

+0 −6
Original line number Diff line number Diff line
@@ -127,14 +127,8 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state 


static struct pcmcia_low_level badge4_pcmcia_ops = {

	.owner			= THIS_MODULE,

	.hw_init		= sa1111_pcmcia_hw_init,

	.hw_shutdown		= sa1111_pcmcia_hw_shutdown,

	.socket_state		= sa1111_pcmcia_socket_state,

	.configure_socket	= badge4_pcmcia_configure_socket,



	.socket_init		= sa1111_pcmcia_socket_init,

	.socket_suspend		= sa1111_pcmcia_socket_suspend,



	.first			= 0,

	.nr			= 2,

};

drivers/pcmcia/sa1100_jornada720.c

+9 −23
Original line number Diff line number Diff line
@@ -22,23 +22,6 @@ 
#define SOCKET1_POWER	(GPIO_GPIO1 | GPIO_GPIO3)

#define SOCKET1_3V	GPIO_GPIO3



static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	struct sa1111_pcmcia_socket *s = to_skt(skt);

	unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;



	/*

	* What is all this crap for?

	*/

	GRER |= 0x00000002;

	/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */

	sa1111_set_io_dir(s->dev, pin, 0, 0);

	sa1111_set_io(s->dev, pin, 0);

	sa1111_set_sleep_io(s->dev, pin, 0);



	return sa1111_pcmcia_hw_init(skt);

}



static int

jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)

{
@@ -108,14 +91,8 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s 


static struct pcmcia_low_level jornada720_pcmcia_ops = {

	.owner			= THIS_MODULE,

	.hw_init		= jornada720_pcmcia_hw_init,

	.hw_shutdown		= sa1111_pcmcia_hw_shutdown,

	.socket_state		= sa1111_pcmcia_socket_state,

	.configure_socket	= jornada720_pcmcia_configure_socket,



	.socket_init		= sa1111_pcmcia_socket_init,

	.socket_suspend		= sa1111_pcmcia_socket_suspend,



	.first			= 0,

	.nr			= 2,

};
@@ -125,6 +102,15 @@ int __devinit pcmcia_jornada720_init(struct device *dev) 
	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);



		sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops);

		ret = sa1111_pcmcia_add(dev, &jornada720_pcmcia_ops,

				sa11xx_drv_pcmcia_add_one);

drivers/pcmcia/sa1100_neponset.c

+0 −4
Original line number Diff line number Diff line
@@ -116,12 +116,8 @@ static void neponset_pcmcia_socket_init(struct soc_pcmcia_socket *skt) 


static struct pcmcia_low_level neponset_pcmcia_ops = {

	.owner			= THIS_MODULE,

	.hw_init		= sa1111_pcmcia_hw_init,

	.hw_shutdown		= sa1111_pcmcia_hw_shutdown,

	.socket_state		= sa1111_pcmcia_socket_state,

	.configure_socket	= neponset_pcmcia_configure_socket,

	.socket_init		= neponset_pcmcia_socket_init,

	.socket_suspend 	= sa1111_pcmcia_socket_suspend,

	.first			= 0,

	.nr			= 2,

};

drivers/pcmcia/sa1111_generic.c

+8 −3
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ static struct pcmcia_irqs irqs[] = { 
	{ 1, IRQ_S1_BVD1_STSCHG, "SA1111 CF BVD1"            },

};



int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

static int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

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

}



void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)

static void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)

{

	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

}
@@ -111,7 +111,7 @@ void sa1111_pcmcia_socket_init(struct soc_pcmcia_socket *skt) 
	soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));

}



void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)

static void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)

{

	soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));

}
@@ -122,6 +122,11 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, 
	struct sa1111_pcmcia_socket *s;

	int i, ret = 0;



	ops->hw_init = sa1111_pcmcia_hw_init;

	ops->hw_shutdown = sa1111_pcmcia_hw_shutdown;

	ops->socket_state = sa1111_pcmcia_socket_state;

	ops->socket_suspend = sa1111_pcmcia_socket_suspend;



	s = kzalloc(sizeof(*s) * ops->nr, GFP_KERNEL);

	if (!s)

		return -ENODEV;