[svn-commits] tzafrir: linux/trunk r10020 - /linux/trunk/drivers/dahdi/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Jul  4 09:04:56 2011
New Revision: 10020

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10020
Log:
xpp: Eliminate "set but unused" compiler warnings.

gcc 4.6 complains about variables that are assigned values but then
never used.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-By: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Modified:
    linux/trunk/drivers/dahdi/xpp/card_bri.c
    linux/trunk/drivers/dahdi/xpp/card_echo.c

Modified: linux/trunk/drivers/dahdi/xpp/card_bri.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_bri.c?view=diff&rev=10020&r1=10019&r2=10020
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_bri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_bri.c Mon Jul  4 09:04:56 2011
@@ -615,7 +615,6 @@
 #else
 static int rx_dchan(xpd_t *xpd, reg_cmd_t *regcmd)
 {
-	xbus_t			*xbus;
 	struct BRI_priv_data	*priv;
 	byte			*src;
 	struct dahdi_chan	*dchan;
@@ -633,7 +632,6 @@
 	BUG_ON(!xpd);
 	priv = xpd->priv;
 	BUG_ON(!priv);
-	xbus = xpd->xbus;
 	dchan = XPD_CHAN(xpd, 2);
 	if(!IS_OFFHOOK(xpd, 2)) {	/* D-chan is used? */
 		static int rate_limit;

Modified: linux/trunk/drivers/dahdi/xpp/card_echo.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_echo.c?view=diff&rev=10020&r1=10019&r2=10020
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_echo.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_echo.c Mon Jul  4 09:04:56 2011
@@ -63,7 +63,6 @@
 		int subunits, int subunit_ports, bool to_phone)
 {
 	xpd_t *xpd = NULL;
-	struct ECHO_priv_data *priv;
 	int channels = 0;
 
 	if (subunit_ports != 1) {
@@ -76,21 +75,16 @@
 	if (!xpd)
 		return NULL;
 	xpd->type_name = "ECHO";
-	priv = xpd->priv;
 	return xpd;
 }
 
 static int ECHO_card_init(xbus_t *xbus, xpd_t *xpd)
 {
-	struct ECHO_priv_data *priv;
-	xproto_table_t *proto_table;
 	int ret = 0;
 
 	BUG_ON(!xpd);
 	XPD_DBG(GENERAL, xpd, "\n");
 	xpd->type = XPD_TYPE_ECHO;
-	proto_table = &PROTO_TABLE(ECHO);
-	priv = xpd->priv;
 	XPD_DBG(DEVICES, xpd, "%s\n", xpd->type_name);
 	ret = CALL_EC_METHOD(ec_update, xbus, xbus);
 	return ret;
@@ -98,10 +92,7 @@
 
 static int ECHO_card_remove(xbus_t *xbus, xpd_t *xpd)
 {
-	struct ECHO_priv_data *priv;
-
 	BUG_ON(!xpd);
-	priv = xpd->priv;
 	XPD_DBG(GENERAL, xpd, "\n");
 	return 0;
 }
@@ -121,15 +112,11 @@
 	unsigned long flags;
 	struct xpd_addr addr;
 	xpd_t *orig_xpd;
-	byte regnum;
-	byte data_low;
 
 	/* Map UNIT + PORTNUM to XPD */
 	orig_xpd = xpd;
 	addr.unit = orig_xpd->addr.unit;
 	addr.subunit = info->portnum;
-	regnum = REG_FIELD(info, regnum);
-	data_low = REG_FIELD(info, data_low);
 	xpd = xpd_byaddr(xbus, addr.unit, addr.subunit);
 	if (!xpd) {
 		static int rate_limit;