Skip to contentSkip to conversation

ssb: make ssb_pcmcia_switch_core static

PATCH In review Rafał Miłecki 3 participants 3 messages Sep 21, 2015 – Sep 29, 2015 Sonics silicon backplane driver (ssb)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ssb: make ssb_pcmcia_switch_core static

---
 drivers/ssb/pcmcia.c      | 3 +--
 drivers/ssb/ssb_private.h | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/ssb/pcmcia.c +1 -2
index b413e01..f03422b 100644
@@ -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;
 
drivers/ssb/ssb_private.h +0 -7
index 426c805..8a2ebc8 100644
@@ -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)
 {
Signature · 1 line
1.8.4.5
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 35 lines · On Mon, 21 Sep 2015 09:55:26 +0200 Rafał Miłecki <[email protected]> wrote:
---
 drivers/ssb/pcmcia.c      | 3 +--
 drivers/ssb/ssb_private.h | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/ssb/pcmcia.c +1 -2
index b413e01..f03422b 100644
@@ -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;
 
drivers/ssb/ssb_private.h +0 -2
index 426c805..8a2ebc8 100644
@@ -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);

drivers/ssb/ssb_private.h extern void ssb_pcmcia_exit(struct ssb_bus *bus); · line 101

Quoted 10 lines
drivers/ssb/ssb_private.h +0 -5
 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)
 {
Signature · 1 line
Michael