tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39159?usp=email )
Change subject: Misc warning/build fixes for more recent kernels ......................................................................
Misc warning/build fixes for more recent kernels
Change-Id: I54e89040dfc6e21d23f620df407b6613397f7e45 Signed-off-by: Sylvain Munaut tnt@246tNt.com --- M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/xpp/xbus-core.c 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/59/39159/1
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 9725d3c..ba328aa 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -1501,16 +1501,16 @@ unsigned char data = 0; int count = 0;
- #define MAX 10 /* attempts */ + #define MAX_ATTEMPTS 10
/* Wait for indirect access */ - while (count++ < MAX) { + while (count++ < MAX_ATTEMPTS) { data = wctdm_getreg(wc, mod, I_STATUS); if (!data) return 0; }
- if (count > (MAX-1)) { + if (count > (MAX_ATTEMPTS-1)) { dev_notice(&wc->vb.pdev->dev, " ##### Loop error (%02x) #####\n", data); } diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index e08e2d6..141c54f 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -113,7 +113,7 @@ { if (!xbus) return -ENOENT; - if (xbus->label && *(xbus->label)) { + if (xbus->label[0]) { xbus_t *xbus_old;
XBUS_DBG(DEVICES, xbus, "Checking LABEL='%s'\n", xbus->label);
-
tnt