Re: [PATCH v4 4/6] dgnc: checkpatch: macros in enclosed parantheses
On Thu, Jan 15, 2015 at 01:32:39PM +0100, Simone Weiss wrote: > dpacompat.h and digi.h partly define the same macros, so it is necessary to > change them both. I also removed some defines as they were unnecessary, > because they were already defined, or because they were never used. Thanks for checking on this. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v4 4/6] dgnc: checkpatch: macros in enclosed parantheses
dpacompat.h and digi.h partly define the same macros, so it is necessary to
change them both. I also removed some defines as they were unnecessary,
because they were already defined, or because they were never used.
Signed-off-by: Simone Weiss
Signed-off-by: Helene Gsaenger
---
drivers/staging/dgnc/digi.h | 59 +++-
drivers/staging/dgnc/dpacompat.h | 8 ++
2 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 3181a35..56466a7 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -38,8 +38,8 @@
#if !defined(TIOCMODG)
-#defineTIOCMODG('d'<<8) | 250 /* get modem ctrl state
*/
-#defineTIOCMODS('d'<<8) | 251 /* set modem ctrl state
*/
+#defineTIOCMODG(('d'<<8) | 250)/* get modem ctrl state
*/
+#defineTIOCMODS(('d'<<8) | 251)/* set modem ctrl state
*/
#ifndef TIOCM_LE
#defineTIOCM_LE0x01/* line enable
*/
@@ -58,44 +58,41 @@
#endif
#if !defined(TIOCMSET)
-#defineTIOCMSET('d'<<8) | 252 /* set modem ctrl state
*/
-#defineTIOCMGET('d'<<8) | 253 /* set modem ctrl state
*/
+#defineTIOCMSET(('d'<<8) | 252)/* set modem ctrl state
*/
+#defineTIOCMGET(('d'<<8) | 253)/* set modem ctrl state
*/
#endif
#if !defined(TIOCMBIC)
-#defineTIOCMBIC('d'<<8) | 254 /* set modem ctrl state
*/
-#defineTIOCMBIS('d'<<8) | 255 /* set modem ctrl state
*/
+#defineTIOCMBIC(('d'<<8) | 254)/* set modem ctrl state
*/
+#defineTIOCMBIS(('d'<<8) | 255)/* set modem ctrl state
*/
#endif
#if !defined(TIOCSDTR)
-#defineTIOCSDTR('e'<<8) | 0/* set DTR
*/
-#defineTIOCCDTR('e'<<8) | 1/* clear DTR
*/
+#defineTIOCSDTR(('e'<<8) | 0) /* set DTR
*/
+#defineTIOCCDTR(('e'<<8) | 1) /* clear DTR
*/
#endif
/
* Ioctl command arguments for DIGI parameters.
/
-#define DIGI_GETA ('e'<<8) | 94 /* Read params */
+#define DIGI_GETA (('e'<<8) | 94) /* Read params */
-#define DIGI_SETA ('e'<<8) | 95 /* Set params */
-#define DIGI_SETAW ('e'<<8) | 96 /* Drain & set params */
-#define DIGI_SETAF ('e'<<8) | 97 /* Drain, flush & set params */
+#define DIGI_SETA (('e'<<8) | 95) /* Set params */
+#define DIGI_SETAW (('e'<<8) | 96) /* Drain & set params */
+#define DIGI_SETAF (('e'<<8) | 97) /* Drain, flush & set params */
-#define DIGI_KME ('e'<<8) | 98 /* Read/Write Host */
- /* Adapter Memory */
-
-#defineDIGI_GETFLOW('e'<<8) | 99 /* Get startc/stopc
flow */
+#defineDIGI_GETFLOW(('e'<<8) | 99) /* Get startc/stopc
flow */
/* control characters*/
-#defineDIGI_SETFLOW('e'<<8) | 100 /* Set startc/stopc
flow */
+#defineDIGI_SETFLOW(('e'<<8) | 100)/* Set startc/stopc
flow */
/* control characters*/
-#defineDIGI_GETAFLOW ('e'<<8) | 101 /* Get Aux.
startc/stopc */
+#defineDIGI_GETAFLOW (('e'<<8) | 101)/* Get Aux.
startc/stopc */
/* flow control chars*/
-#defineDIGI_SETAFLOW ('e'<<8) | 102 /* Set Aux.
startc/stopc */
+#defineDIGI_SETAFLOW (('e'<<8) | 102)/* Set Aux.
startc/stopc */
/* flow control chars*/
-#define DIGI_GEDELAY ('d'<<8) | 246 /* Get edelay */
-#define DIGI_SEDELAY ('d'<<8) | 247 /* Set edelay */
+#define DIGI_GEDELAY (('d'<<8) | 246)/* Get edelay */
+#define DIGI_SEDELAY (('d'<<8) | 247)/* Set edelay */
struct digiflow_t {
unsigned char startc; /* flow cntl start char
*/
@@ -104,8 +101,8 @@ struct digiflow_t {
#ifdef FLOW_2200
-#defineF2200_GETA ('e'<<8) | 104 /* Get 2x36 flow cntl
flags */
-#defineF2200_SETAW ('e'<<8) | 105 /* Set 2x36 flow cntl
flags */
+#defineF2200_GETA (('e'<<8) | 104)/* Get 2x36 flow cntl
flags */
+#defineF2200_SETAW (('e'<<8) | 105)/* Set 2x36 flow cntl
flags */
[PATCH v4 4/6] dgnc: checkpatch: macros in enclosed parantheses
dpacompat.h and digi.h partly define the same macros, so it is necessary to
change them both. I also removed some defines as they were unnecessary,
because they were already defined, or because they were never used.
Signed-off-by: Simone Weiss simone.we...@fau.de
Signed-off-by: Helene Gsaenger helene.gsaen...@studium.fau.de
---
drivers/staging/dgnc/digi.h | 59 +++-
drivers/staging/dgnc/dpacompat.h | 8 ++
2 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 3181a35..56466a7 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -38,8 +38,8 @@
#if !defined(TIOCMODG)
-#defineTIOCMODG('d'8) | 250 /* get modem ctrl state
*/
-#defineTIOCMODS('d'8) | 251 /* set modem ctrl state
*/
+#defineTIOCMODG(('d'8) | 250)/* get modem ctrl state
*/
+#defineTIOCMODS(('d'8) | 251)/* set modem ctrl state
*/
#ifndef TIOCM_LE
#defineTIOCM_LE0x01/* line enable
*/
@@ -58,44 +58,41 @@
#endif
#if !defined(TIOCMSET)
-#defineTIOCMSET('d'8) | 252 /* set modem ctrl state
*/
-#defineTIOCMGET('d'8) | 253 /* set modem ctrl state
*/
+#defineTIOCMSET(('d'8) | 252)/* set modem ctrl state
*/
+#defineTIOCMGET(('d'8) | 253)/* set modem ctrl state
*/
#endif
#if !defined(TIOCMBIC)
-#defineTIOCMBIC('d'8) | 254 /* set modem ctrl state
*/
-#defineTIOCMBIS('d'8) | 255 /* set modem ctrl state
*/
+#defineTIOCMBIC(('d'8) | 254)/* set modem ctrl state
*/
+#defineTIOCMBIS(('d'8) | 255)/* set modem ctrl state
*/
#endif
#if !defined(TIOCSDTR)
-#defineTIOCSDTR('e'8) | 0/* set DTR
*/
-#defineTIOCCDTR('e'8) | 1/* clear DTR
*/
+#defineTIOCSDTR(('e'8) | 0) /* set DTR
*/
+#defineTIOCCDTR(('e'8) | 1) /* clear DTR
*/
#endif
/
* Ioctl command arguments for DIGI parameters.
/
-#define DIGI_GETA ('e'8) | 94 /* Read params */
+#define DIGI_GETA (('e'8) | 94) /* Read params */
-#define DIGI_SETA ('e'8) | 95 /* Set params */
-#define DIGI_SETAW ('e'8) | 96 /* Drain set params */
-#define DIGI_SETAF ('e'8) | 97 /* Drain, flush set params */
+#define DIGI_SETA (('e'8) | 95) /* Set params */
+#define DIGI_SETAW (('e'8) | 96) /* Drain set params */
+#define DIGI_SETAF (('e'8) | 97) /* Drain, flush set params */
-#define DIGI_KME ('e'8) | 98 /* Read/Write Host */
- /* Adapter Memory */
-
-#defineDIGI_GETFLOW('e'8) | 99 /* Get startc/stopc
flow */
+#defineDIGI_GETFLOW(('e'8) | 99) /* Get startc/stopc
flow */
/* control characters*/
-#defineDIGI_SETFLOW('e'8) | 100 /* Set startc/stopc
flow */
+#defineDIGI_SETFLOW(('e'8) | 100)/* Set startc/stopc
flow */
/* control characters*/
-#defineDIGI_GETAFLOW ('e'8) | 101 /* Get Aux.
startc/stopc */
+#defineDIGI_GETAFLOW (('e'8) | 101)/* Get Aux.
startc/stopc */
/* flow control chars*/
-#defineDIGI_SETAFLOW ('e'8) | 102 /* Set Aux.
startc/stopc */
+#defineDIGI_SETAFLOW (('e'8) | 102)/* Set Aux.
startc/stopc */
/* flow control chars*/
-#define DIGI_GEDELAY ('d'8) | 246 /* Get edelay */
-#define DIGI_SEDELAY ('d'8) | 247 /* Set edelay */
+#define DIGI_GEDELAY (('d'8) | 246)/* Get edelay */
+#define DIGI_SEDELAY (('d'8) | 247)/* Set edelay */
struct digiflow_t {
unsigned char startc; /* flow cntl start char
*/
@@ -104,8 +101,8 @@ struct digiflow_t {
#ifdef FLOW_2200
-#defineF2200_GETA ('e'8) | 104 /* Get 2x36 flow cntl
flags */
-#defineF2200_SETAW ('e'8) | 105 /* Set 2x36 flow cntl
flags */
+#defineF2200_GETA (('e'8) | 104)/* Get 2x36 flow cntl
flags */
+#defineF2200_SETAW (('e'8) | 105)/* Set 2x36 flow cntl
flags */
#defineF2200_MASK
Re: [PATCH v4 4/6] dgnc: checkpatch: macros in enclosed parantheses
On Thu, Jan 15, 2015 at 01:32:39PM +0100, Simone Weiss wrote: dpacompat.h and digi.h partly define the same macros, so it is necessary to change them both. I also removed some defines as they were unnecessary, because they were already defined, or because they were never used. Thanks for checking on this. regards, dan carpenter -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
