PCMCIA: sa1111: remove duplicated initializers
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
parent
701a5dc05a
commit
dabd14684b
|
@ -201,12 +201,8 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
|
||||||
|
|
||||||
static struct pcmcia_low_level lubbock_pcmcia_ops = {
|
static struct pcmcia_low_level lubbock_pcmcia_ops = {
|
||||||
.owner = THIS_MODULE,
|
.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,
|
.configure_socket = lubbock_pcmcia_configure_socket,
|
||||||
.socket_init = sa1111_pcmcia_socket_init,
|
.socket_init = sa1111_pcmcia_socket_init,
|
||||||
.socket_suspend = sa1111_pcmcia_socket_suspend,
|
|
||||||
.first = 0,
|
.first = 0,
|
||||||
.nr = 2,
|
.nr = 2,
|
||||||
};
|
};
|
||||||
|
|
|
@ -127,14 +127,8 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state
|
||||||
|
|
||||||
static struct pcmcia_low_level badge4_pcmcia_ops = {
|
static struct pcmcia_low_level badge4_pcmcia_ops = {
|
||||||
.owner = THIS_MODULE,
|
.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,
|
.configure_socket = badge4_pcmcia_configure_socket,
|
||||||
|
|
||||||
.socket_init = sa1111_pcmcia_socket_init,
|
.socket_init = sa1111_pcmcia_socket_init,
|
||||||
.socket_suspend = sa1111_pcmcia_socket_suspend,
|
|
||||||
|
|
||||||
.first = 0,
|
.first = 0,
|
||||||
.nr = 2,
|
.nr = 2,
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,23 +22,6 @@
|
||||||
#define SOCKET1_POWER (GPIO_GPIO1 | GPIO_GPIO3)
|
#define SOCKET1_POWER (GPIO_GPIO1 | GPIO_GPIO3)
|
||||||
#define SOCKET1_3V 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
|
static int
|
||||||
jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
|
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 = {
|
static struct pcmcia_low_level jornada720_pcmcia_ops = {
|
||||||
.owner = THIS_MODULE,
|
.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,
|
.configure_socket = jornada720_pcmcia_configure_socket,
|
||||||
|
|
||||||
.socket_init = sa1111_pcmcia_socket_init,
|
.socket_init = sa1111_pcmcia_socket_init,
|
||||||
.socket_suspend = sa1111_pcmcia_socket_suspend,
|
|
||||||
|
|
||||||
.first = 0,
|
.first = 0,
|
||||||
.nr = 2,
|
.nr = 2,
|
||||||
};
|
};
|
||||||
|
@ -125,6 +102,15 @@ int __devinit pcmcia_jornada720_init(struct device *dev)
|
||||||
int ret = -ENODEV;
|
int ret = -ENODEV;
|
||||||
|
|
||||||
if (machine_is_jornada720()) {
|
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);
|
sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops);
|
||||||
ret = sa1111_pcmcia_add(dev, &jornada720_pcmcia_ops,
|
ret = sa1111_pcmcia_add(dev, &jornada720_pcmcia_ops,
|
||||||
sa11xx_drv_pcmcia_add_one);
|
sa11xx_drv_pcmcia_add_one);
|
||||||
|
|
|
@ -116,12 +116,8 @@ static void neponset_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
|
||||||
|
|
||||||
static struct pcmcia_low_level neponset_pcmcia_ops = {
|
static struct pcmcia_low_level neponset_pcmcia_ops = {
|
||||||
.owner = THIS_MODULE,
|
.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,
|
.configure_socket = neponset_pcmcia_configure_socket,
|
||||||
.socket_init = neponset_pcmcia_socket_init,
|
.socket_init = neponset_pcmcia_socket_init,
|
||||||
.socket_suspend = sa1111_pcmcia_socket_suspend,
|
|
||||||
.first = 0,
|
.first = 0,
|
||||||
.nr = 2,
|
.nr = 2,
|
||||||
};
|
};
|
||||||
|
|
|
@ -28,12 +28,12 @@ static struct pcmcia_irqs irqs[] = {
|
||||||
{ 1, IRQ_S1_BVD1_STSCHG, "SA1111 CF BVD1" },
|
{ 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));
|
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));
|
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));
|
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));
|
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;
|
struct sa1111_pcmcia_socket *s;
|
||||||
int i, ret = 0;
|
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);
|
s = kzalloc(sizeof(*s) * ops->nr, GFP_KERNEL);
|
||||||
if (!s)
|
if (!s)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
|
@ -15,12 +15,9 @@ static inline struct sa1111_pcmcia_socket *to_skt(struct soc_pcmcia_socket *s)
|
||||||
int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
|
int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
|
||||||
int (*add)(struct soc_pcmcia_socket *));
|
int (*add)(struct soc_pcmcia_socket *));
|
||||||
|
|
||||||
extern int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *);
|
|
||||||
extern void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *);
|
|
||||||
extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia_state *);
|
extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia_state *);
|
||||||
extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *);
|
extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *);
|
||||||
extern void sa1111_pcmcia_socket_init(struct soc_pcmcia_socket *);
|
extern void sa1111_pcmcia_socket_init(struct soc_pcmcia_socket *);
|
||||||
extern void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *);
|
|
||||||
|
|
||||||
extern int pcmcia_badge4_init(struct device *);
|
extern int pcmcia_badge4_init(struct device *);
|
||||||
extern int pcmcia_jornada720_init(struct device *);
|
extern int pcmcia_jornada720_init(struct device *);
|
||||||
|
|
Loading…
Reference in a new issue