summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-09-21 09:55:26 +0200
committerKalle Valo <kvalo@codeaurora.org>2015-09-29 11:03:14 +0300
commitcf75496b6fc2fd8dd74633b0f49f4fa3f58f36e1 (patch)
treec9f667fe00fa1939c80f892b7ab86923fdf2117f /drivers
parent264c7708c9ceabfd10c70f942bb2910976ca92ff (diff)
downloadlinux-stable-cf75496b6fc2fd8dd74633b0f49f4fa3f58f36e1.tar.gz
linux-stable-cf75496b6fc2fd8dd74633b0f49f4fa3f58f36e1.tar.bz2
linux-stable-cf75496b6fc2fd8dd74633b0f49f4fa3f58f36e1.zip
ssb: make ssb_pcmcia_switch_core static
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ssb/pcmcia.c3
-rw-r--r--drivers/ssb/ssb_private.h7
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index b413e0187087..f03422bbf087 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -147,8 +147,7 @@ error:
return err;
}
-int ssb_pcmcia_switch_core(struct ssb_bus *bus,
- struct ssb_device *dev)
+static int ssb_pcmcia_switch_core(struct ssb_bus *bus, struct ssb_device *dev)
{
int err;
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
index 426c805b7727..8a2ebc88c66f 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -85,8 +85,6 @@ static inline int ssb_pci_init(struct ssb_bus *bus)
/* pcmcia.c */
#ifdef CONFIG_SSB_PCMCIAHOST
-extern int ssb_pcmcia_switch_core(struct ssb_bus *bus,
- struct ssb_device *dev);
extern int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus,
u8 coreidx);
extern int ssb_pcmcia_switch_segment(struct ssb_bus *bus,
@@ -98,11 +96,6 @@ extern void ssb_pcmcia_exit(struct ssb_bus *bus);
extern int ssb_pcmcia_init(struct ssb_bus *bus);
extern const struct ssb_bus_ops ssb_pcmcia_ops;
#else /* CONFIG_SSB_PCMCIAHOST */
-static inline int ssb_pcmcia_switch_core(struct ssb_bus *bus,
- struct ssb_device *dev)
-{
- return 0;
-}
static inline int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus,
u8 coreidx)
{