diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-07-13 10:54:56 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2011-07-29 11:55:10 -0400 |
commit | a747ce835e69069f9bccfb7791008127012cbf32 (patch) | |
tree | 62af73dbb14057a33fbddc303c27ed3e6ad32c7e /drivers/pcmcia | |
parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) |
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 <jic23@cam.ac.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/soc_common.c | 7 |
1 files 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) | |||
186 | struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock); | 186 | struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock); |
187 | 187 | ||
188 | debug(skt, 2, "initializing socket\n"); | 188 | debug(skt, 2, "initializing socket\n"); |
189 | 189 | if (skt->ops->socket_init) | |
190 | skt->ops->socket_init(skt); | 190 | skt->ops->socket_init(skt); |
191 | return 0; | 191 | return 0; |
192 | } | 192 | } |
193 | 193 | ||
@@ -207,7 +207,8 @@ static int soc_common_pcmcia_suspend(struct pcmcia_socket *sock) | |||
207 | 207 | ||
208 | debug(skt, 2, "suspending socket\n"); | 208 | debug(skt, 2, "suspending socket\n"); |
209 | 209 | ||
210 | skt->ops->socket_suspend(skt); | 210 | if (skt->ops->socket_suspend) |
211 | skt->ops->socket_suspend(skt); | ||
211 | 212 | ||
212 | return 0; | 213 | return 0; |
213 | } | 214 | } |