From a747ce835e69069f9bccfb7791008127012cbf32 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 13 Jul 2011 15:54:56 +0100 Subject: [PATCH] drivers:pcmcia:soc_common: make socket_init and socket_suspend optional 10 boards define these empty, probably indicating not everyone has a use for them. Signed-off-by: Jonathan Cameron Signed-off-by: Dominik Brodowski --- drivers/pcmcia/soc_common.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 768f9572a8c8..a0a9c2aa8d78 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -186,8 +186,8 @@ static int soc_common_pcmcia_sock_init(struct pcmcia_socket *sock) struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock); debug(skt, 2, "initializing socket\n"); - - skt->ops->socket_init(skt); + if (skt->ops->socket_init) + skt->ops->socket_init(skt); return 0; } @@ -207,7 +207,8 @@ static int soc_common_pcmcia_suspend(struct pcmcia_socket *sock) debug(skt, 2, "suspending socket\n"); - skt->ops->socket_suspend(skt); + if (skt->ops->socket_suspend) + skt->ops->socket_suspend(skt); return 0; } -- 2.39.5