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

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

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

drivers/pcmcia/pxa2xx_balloon3.c

+0 −10
Original line number Diff line number Diff line
@@ -103,22 +103,12 @@ static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
	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 = {

	.owner			= THIS_MODULE,

	.hw_init		= balloon3_pcmcia_hw_init,

	.hw_shutdown		= balloon3_pcmcia_hw_shutdown,

	.socket_state		= balloon3_pcmcia_socket_state,

	.configure_socket	= balloon3_pcmcia_configure_socket,

	.socket_init		= balloon3_pcmcia_socket_init,

	.socket_suspend		= balloon3_pcmcia_socket_suspend,

	.first			= 0,

	.nr			= 1,

};

drivers/pcmcia/pxa2xx_cm_x255.c

+0 −11
Original line number Diff line number Diff line
@@ -102,23 +102,12 @@ static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
	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 = {

	.owner			= THIS_MODULE,

	.hw_init		= cmx255_pcmcia_hw_init,

	.hw_shutdown		= cmx255_pcmcia_shutdown,

	.socket_state		= cmx255_pcmcia_socket_state,

	.configure_socket	= cmx255_pcmcia_configure_socket,

	.socket_init		= cmx255_pcmcia_socket_init,

	.socket_suspend		= cmx255_pcmcia_socket_suspend,

	.nr			= 1,

};

drivers/pcmcia/pxa2xx_cm_x270.c

+0 −11
Original line number Diff line number Diff line
@@ -82,23 +82,12 @@ static int cmx270_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
	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 = {

	.owner			= THIS_MODULE,

	.hw_init		= cmx270_pcmcia_hw_init,

	.hw_shutdown		= cmx270_pcmcia_shutdown,

	.socket_state		= cmx270_pcmcia_socket_state,

	.configure_socket	= cmx270_pcmcia_configure_socket,

	.socket_init		= cmx270_pcmcia_socket_init,

	.socket_suspend		= cmx270_pcmcia_socket_suspend,

	.nr			= 1,

};

drivers/pcmcia/pxa2xx_colibri.c

+0 −11
Original line number Diff line number Diff line
@@ -116,14 +116,6 @@ colibri_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
	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 = {

	.owner			= THIS_MODULE,
@@ -135,9 +127,6 @@ static struct pcmcia_low_level colibri_pcmcia_ops = { 


	.socket_state		= colibri_pcmcia_socket_state,

	.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;

drivers/pcmcia/pxa2xx_mainstone.c

+0 −10
Original line number Diff line number Diff line
@@ -128,22 +128,12 @@ static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
	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 = {

	.owner			= THIS_MODULE,

	.hw_init		= mst_pcmcia_hw_init,

	.hw_shutdown		= mst_pcmcia_hw_shutdown,

	.socket_state		= mst_pcmcia_socket_state,

	.configure_socket	= mst_pcmcia_configure_socket,

	.socket_init		= mst_pcmcia_socket_init,

	.socket_suspend		= mst_pcmcia_socket_suspend,

	.nr			= 2,

};