Commit 7594549e authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Dominik Brodowski

pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.

Now the are optional, let us get rid of the ones that don't have
any content.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent a747ce83
...@@ -103,22 +103,12 @@ static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -103,22 +103,12 @@ static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return 0; return 0;
} }
static void balloon3_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void balloon3_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level balloon3_pcmcia_ops = { static struct pcmcia_low_level balloon3_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = balloon3_pcmcia_hw_init, .hw_init = balloon3_pcmcia_hw_init,
.hw_shutdown = balloon3_pcmcia_hw_shutdown, .hw_shutdown = balloon3_pcmcia_hw_shutdown,
.socket_state = balloon3_pcmcia_socket_state, .socket_state = balloon3_pcmcia_socket_state,
.configure_socket = balloon3_pcmcia_configure_socket, .configure_socket = balloon3_pcmcia_configure_socket,
.socket_init = balloon3_pcmcia_socket_init,
.socket_suspend = balloon3_pcmcia_socket_suspend,
.first = 0, .first = 0,
.nr = 1, .nr = 1,
}; };
......
...@@ -102,23 +102,12 @@ static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -102,23 +102,12 @@ static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return 0; return 0;
} }
static void cmx255_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void cmx255_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = { static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = cmx255_pcmcia_hw_init, .hw_init = cmx255_pcmcia_hw_init,
.hw_shutdown = cmx255_pcmcia_shutdown, .hw_shutdown = cmx255_pcmcia_shutdown,
.socket_state = cmx255_pcmcia_socket_state, .socket_state = cmx255_pcmcia_socket_state,
.configure_socket = cmx255_pcmcia_configure_socket, .configure_socket = cmx255_pcmcia_configure_socket,
.socket_init = cmx255_pcmcia_socket_init,
.socket_suspend = cmx255_pcmcia_socket_suspend,
.nr = 1, .nr = 1,
}; };
......
...@@ -82,23 +82,12 @@ static int cmx270_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -82,23 +82,12 @@ static int cmx270_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return 0; return 0;
} }
static void cmx270_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void cmx270_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = { static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = cmx270_pcmcia_hw_init, .hw_init = cmx270_pcmcia_hw_init,
.hw_shutdown = cmx270_pcmcia_shutdown, .hw_shutdown = cmx270_pcmcia_shutdown,
.socket_state = cmx270_pcmcia_socket_state, .socket_state = cmx270_pcmcia_socket_state,
.configure_socket = cmx270_pcmcia_configure_socket, .configure_socket = cmx270_pcmcia_configure_socket,
.socket_init = cmx270_pcmcia_socket_init,
.socket_suspend = cmx270_pcmcia_socket_suspend,
.nr = 1, .nr = 1,
}; };
......
...@@ -116,14 +116,6 @@ colibri_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -116,14 +116,6 @@ colibri_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return 0; return 0;
} }
static void colibri_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void colibri_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level colibri_pcmcia_ops = { static struct pcmcia_low_level colibri_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -135,9 +127,6 @@ static struct pcmcia_low_level colibri_pcmcia_ops = { ...@@ -135,9 +127,6 @@ static struct pcmcia_low_level colibri_pcmcia_ops = {
.socket_state = colibri_pcmcia_socket_state, .socket_state = colibri_pcmcia_socket_state,
.configure_socket = colibri_pcmcia_configure_socket, .configure_socket = colibri_pcmcia_configure_socket,
.socket_init = colibri_pcmcia_socket_init,
.socket_suspend = colibri_pcmcia_socket_suspend,
}; };
static struct platform_device *colibri_pcmcia_device; static struct platform_device *colibri_pcmcia_device;
......
...@@ -128,22 +128,12 @@ static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -128,22 +128,12 @@ static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return ret; return ret;
} }
static void mst_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void mst_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level mst_pcmcia_ops __initdata = { static struct pcmcia_low_level mst_pcmcia_ops __initdata = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = mst_pcmcia_hw_init, .hw_init = mst_pcmcia_hw_init,
.hw_shutdown = mst_pcmcia_hw_shutdown, .hw_shutdown = mst_pcmcia_hw_shutdown,
.socket_state = mst_pcmcia_socket_state, .socket_state = mst_pcmcia_socket_state,
.configure_socket = mst_pcmcia_configure_socket, .configure_socket = mst_pcmcia_configure_socket,
.socket_init = mst_pcmcia_socket_init,
.socket_suspend = mst_pcmcia_socket_suspend,
.nr = 2, .nr = 2,
}; };
......
...@@ -65,14 +65,6 @@ static int palmld_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -65,14 +65,6 @@ static int palmld_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return 0; return 0;
} }
static void palmld_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level palmld_pcmcia_ops = { static struct pcmcia_low_level palmld_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -84,9 +76,6 @@ static struct pcmcia_low_level palmld_pcmcia_ops = { ...@@ -84,9 +76,6 @@ static struct pcmcia_low_level palmld_pcmcia_ops = {
.socket_state = palmld_pcmcia_socket_state, .socket_state = palmld_pcmcia_socket_state,
.configure_socket = palmld_pcmcia_configure_socket, .configure_socket = palmld_pcmcia_configure_socket,
.socket_init = palmld_pcmcia_socket_init,
.socket_suspend = palmld_pcmcia_socket_suspend,
}; };
static struct platform_device *palmld_pcmcia_device; static struct platform_device *palmld_pcmcia_device;
......
...@@ -117,14 +117,6 @@ static int palmtc_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -117,14 +117,6 @@ static int palmtc_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return ret; return ret;
} }
static void palmtc_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void palmtc_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level palmtc_pcmcia_ops = { static struct pcmcia_low_level palmtc_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -136,9 +128,6 @@ static struct pcmcia_low_level palmtc_pcmcia_ops = { ...@@ -136,9 +128,6 @@ static struct pcmcia_low_level palmtc_pcmcia_ops = {
.socket_state = palmtc_pcmcia_socket_state, .socket_state = palmtc_pcmcia_socket_state,
.configure_socket = palmtc_pcmcia_configure_socket, .configure_socket = palmtc_pcmcia_configure_socket,
.socket_init = palmtc_pcmcia_socket_init,
.socket_suspend = palmtc_pcmcia_socket_suspend,
}; };
static struct platform_device *palmtc_pcmcia_device; static struct platform_device *palmtc_pcmcia_device;
......
...@@ -67,14 +67,6 @@ palmtx_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -67,14 +67,6 @@ palmtx_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return 0; return 0;
} }
static void palmtx_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void palmtx_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level palmtx_pcmcia_ops = { static struct pcmcia_low_level palmtx_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -86,9 +78,6 @@ static struct pcmcia_low_level palmtx_pcmcia_ops = { ...@@ -86,9 +78,6 @@ static struct pcmcia_low_level palmtx_pcmcia_ops = {
.socket_state = palmtx_pcmcia_socket_state, .socket_state = palmtx_pcmcia_socket_state,
.configure_socket = palmtx_pcmcia_configure_socket, .configure_socket = palmtx_pcmcia_configure_socket,
.socket_init = palmtx_pcmcia_socket_init,
.socket_suspend = palmtx_pcmcia_socket_suspend,
}; };
static struct platform_device *palmtx_pcmcia_device; static struct platform_device *palmtx_pcmcia_device;
......
...@@ -136,22 +136,12 @@ static int viper_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ...@@ -136,22 +136,12 @@ static int viper_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
return 0; return 0;
} }
static void viper_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
}
static void viper_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
}
static struct pcmcia_low_level viper_pcmcia_ops = { static struct pcmcia_low_level viper_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = viper_pcmcia_hw_init, .hw_init = viper_pcmcia_hw_init,
.hw_shutdown = viper_pcmcia_hw_shutdown, .hw_shutdown = viper_pcmcia_hw_shutdown,
.socket_state = viper_pcmcia_socket_state, .socket_state = viper_pcmcia_socket_state,
.configure_socket = viper_pcmcia_configure_socket, .configure_socket = viper_pcmcia_configure_socket,
.socket_init = viper_pcmcia_socket_init,
.socket_suspend = viper_pcmcia_socket_suspend,
.nr = 1, .nr = 1,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment