ssb: Fix extif compile error

PATCH New Michael Buesch 1 participant 1 message Aug 6, 2007 Sonics silicon backplane driver (ssb)

Share & tools

Michael Buesch

author

2007-08-06 22:54 UTC #0 lore raw

PATCH 1/1 ssb: Fix extif compile error

This is a compilation fix for a recently applied patch [PATCH 2/3] Use SSB EXTIF in SSB MIPS core driver when the extif core is not enabled.

This also makes the extif driver depend on CONFIG_SSB_DRIVER_EXTIF (sorry, my mistake).

Signed-off-by Michael Buesch <[email protected]>

John, please apply to wireless-dev
Andrew, please apply to -mm after applying the other ssb patches.

drivers/ssb/main.c +1 -1

Index: wireless-dev/drivers/ssb/main.c
===================================================================
@@ -819,7 +819,7 @@
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 
-	if (bus->extif.dev)
+	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
 	else if (bus->chipco.dev)

include/linux/ssb/ssb_driver_extif.h +32 -4

Index: wireless-dev/include/linux/ssb/ssb_driver_extif.h
===================================================================
@@ -20,10 +20,6 @@
 #ifndef LINUX_SSB_EXTIFCORE_H_
 #define LINUX_SSB_EXTIFCORE_H_
 
-struct ssb_extif {
-	struct ssb_device *dev;
-};
-
 /* external interface address space */
 #define	SSB_EXTIF_PCMCIA_MEMBASE(x)	(x)
 #define	SSB_EXTIF_PCMCIA_IOBASE(x)	((x) + 0x100000)

@@ -156,6 +152,19 @@
 /* watchdog */
 #define SSB_EXTIF_WATCHDOG_CLK		48000000	/* Hz */
 
+
+
+#ifdef CONFIG_SSB_DRIVER_EXTIF
+
+struct ssb_extif {
+	struct ssb_device *dev;
+};
+
+static inline bool ssb_extif_available(struct ssb_extif *extif)
+{
+	return (extif->dev != NULL);
+}
+
 extern void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
 			               u32 *plltype, u32 *n, u32 *m);

@@ -167,4 +176,23 @@
 				 struct ssb_serial_port *ports);
 #endif /* CONFIG_SSB_SERIAL */
 
+
+#else /* CONFIG_SSB_DRIVER_EXTIF */
+/* extif disabled */
+
+struct ssb_extif {
+};
+
+static inline bool ssb_extif_available(struct ssb_extif *extif)
+{
+	return 0;
+}
+
+static inline
+void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
+			        u32 *plltype, u32 *n, u32 *m)
+{
+}
+
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
 #endif /* LINUX_SSB_EXTIFCORE_H_ */

Signature · 1 line

Greetings Michael.