File 0004-Fix-Wimplicit-fallthrough-5-warnings.patch of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-Fix-Wimplicit-fallthrough-5-warnings.patch of Package dahdi-linux (Revision f87ff277df9e70447a7dd124c6939659)

Currently displaying revision f87ff277df9e70447a7dd124c6939659 , Show latest

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index af2fcc4..7640f2e 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -7949,6 +7949,7 @@ static inline void __dahdi_process_getaudio_chunk(struct dahdi_chan *ss, unsigne
 			txb[0] = DAHDI_LIN2X(0, ms);
 			memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1);
 			/* fallthrough */
+			fallthrough;
 		case DAHDI_CONF_CONF:	/* Normal conference mode */
 			if (is_pseudo_chan(ms)) /* if pseudo-channel */
 			   {
@@ -7972,7 +7973,7 @@ static inline void __dahdi_process_getaudio_chunk(struct dahdi_chan *ss, unsigne
 				memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1);
 				break;
 		 	   }
-			/* fall through */
+			fallthrough;
 		case DAHDI_CONF_CONFMON:	/* Conference monitor mode */
 			if (ms->confmode & DAHDI_CONF_LISTENER) {
 				/* Subtract out last sample written to conf */
@@ -8512,6 +8513,7 @@ static void __dahdi_hooksig_pvt(struct dahdi_chan *chan, enum dahdi_rxsig rxsig)
 		}
 #endif
 		/* fallthrough */
+		fallthrough;
 	   case DAHDI_SIG_FXSGS:  /* FXS Groundstart */
 		if (rxsig == DAHDI_RXSIG_ONHOOK) {
 			chan->ringdebtimer = RING_DEBOUNCE_TIME;
@@ -8531,6 +8533,7 @@ static void __dahdi_hooksig_pvt(struct dahdi_chan *chan, enum dahdi_rxsig rxsig)
 			}
 		}
 		/* fallthrough */
+		fallthrough;
 	   case DAHDI_SIG_FXOLS: /* FXO Loopstart */
 	   case DAHDI_SIG_FXOKS: /* FXO Kewlstart */
 		switch(rxsig) {
@@ -8630,7 +8633,7 @@ void dahdi_rbsbits(struct dahdi_chan *chan, int cursig)
 			__dahdi_hooksig_pvt(chan, DAHDI_RXSIG_START);
 			break;
 		}
-		/* Fall through */
+		fallthrough;
 	    case DAHDI_SIG_EM_E1:
 	    case DAHDI_SIG_FXOLS: /* FXO Loopstart */
 	    case DAHDI_SIG_FXOKS: /* FXO Kewlstart */
@@ -8648,7 +8651,7 @@ void dahdi_rbsbits(struct dahdi_chan *chan, int cursig)
 		break;
 	   case DAHDI_SIG_FXSKS:  /* FXS Kewlstart */
 	   case DAHDI_SIG_FXSGS:  /* FXS Groundstart */
-		/* Fall through */
+		fallthrough;
 	   case DAHDI_SIG_FXSLS:
 		if (!(cursig & DAHDI_BBIT)) {
 			/* Check for ringing first */
@@ -9077,7 +9080,7 @@ static inline void __dahdi_process_putaudio_chunk(struct dahdi_chan *ss, unsigne
 				memcpy(ss->putlin, putlin, DAHDI_CHUNKSIZE * sizeof(short));
 				break;
 			   }
-			/* fall through */
+			fallthrough;
 		case DAHDI_CONF_CONFANN:  /* Conference with announce */
 			if (ms->confmode & DAHDI_CONF_TALKER) {
 				/* Store temp value */
diff --git a/drivers/dahdi/wcaxx-base.c b/drivers/dahdi/wcaxx-base.c
index 8a95176..cf82773 100644
--- a/drivers/dahdi/wcaxx-base.c
+++ b/drivers/dahdi/wcaxx-base.c
@@ -1445,6 +1445,7 @@ wcaxx_check_battery_lost(struct wcaxx *wc, struct wcaxx_module *const mod)
 		fxo->battery_state = BATTERY_LOST;
 		break;
 	case BATTERY_DEBOUNCING_PRESENT_FROM_LOST_ALARM:
+		fallthrough;
 		fxo->battery_state = BATTERY_DEBOUNCING_LOST_ALARM;
 		fxo->battdebounce_timer = wc->framecount +
 						battalarm - battdebounce;
@@ -1553,6 +1554,7 @@ wcaxx_check_battery_present(struct wcaxx *wc, struct wcaxx_module *const mod)
 		fxo->battdebounce_timer = wc->framecount + battdebounce;
 		break;
 	case BATTERY_DEBOUNCING_LOST_FROM_PRESENT_ALARM:
+		fallthrough;
 		fxo->battery_state = BATTERY_DEBOUNCING_PRESENT_ALARM;
 		fxo->battdebounce_timer = wc->framecount +
 						battalarm - battdebounce;
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index c3b44da..0bb2ae2 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -1954,6 +1954,7 @@ wctdm_check_battery_lost(struct wctdm *wc, struct wctdm_module *const mod)
 	   battery present or unknown, debounce timer (going to battery lost)
 	*/
 	switch (fxo->battery_state) {
+		fallthrough;
 	case BATTERY_DEBOUNCING_PRESENT_ALARM:
 		fxo->battery_state = BATTERY_DEBOUNCING_LOST_FROM_PRESENT_ALARM;
 		fxo->battdebounce_timer = wc->framecount + battdebounce;
@@ -2062,6 +2063,7 @@ wctdm_check_battery_present(struct wctdm *wc, struct wctdm_module *const mod)
 					    DAHDI_ALARM_NONE);
 		}
 		break;
+		fallthrough;
 	case BATTERY_PRESENT:
 		break;
 	case BATTERY_DEBOUNCING_LOST_ALARM:
diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c
index da1393e..434d3e8 100644
--- a/drivers/dahdi/xpp/card_global.c
+++ b/drivers/dahdi/xpp/card_global.c
@@ -148,7 +148,7 @@ static int execute_chip_command(xpd_t *xpd, const int argc, char *argv[])
 		XPD_NOTICE(xpd,
 			"'I' is deprecated in register commands. "
 			"Use 'S' instead.\n");
-		/* fall through */
+		fallthrough;
 	case 'S':
 		do_subreg = 1;
 		num_args += 2;	/* register + subreg */
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index cd7e543..036f8f5 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -58,6 +58,13 @@
 #include <linux/sysfs.h>
 
 #include <linux/poll.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
+#include <linux/compiler_attributes.h>
+#endif
+#ifndef fallthrough
+#define fallthrough do {} while (0)  /* fallthrough */
+#endif
+
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 #define HAVE_NET_DEVICE_OPS

Places

File 0004-Fix-Wimplicit-fallthrough-5-warnings.patch of Package dahdi-linux (Revision f87ff277df9e70447a7dd124c6939659)

Places