[PATCH 0/3] A few #define TRUE/FALSE removals

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/3] A few #define TRUE/FALSE removals
@ 2010-01-13  6:59 Joe Perches
  2010-01-13  6:59 ` [PATCH 1/3] drivers/net/tlan: Remove TRUE/FALSE defines, use bool Joe Perches
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Joe Perches @ 2010-01-13  6:59 UTC (permalink / raw)
  To: linux-kernel
  Cc: Karsten Keil, Mauro Carvalho Chehab, Samuel Chessman, linux-media,
	netdev

Joe Perches (3):
  drivers/net/tlan: Remove TRUE/FALSE defines, use bool
  drivers/isdn/mISDN/dsp_ecdis.h: Remove #define TRUE/FALSE, use bool
  drivers/media/dvb/frontends/si21xx.c: Remove #define TRUE/FALSE, use bool

 drivers/isdn/mISDN/dsp_ecdis.h       |   20 +++++++----------
 drivers/media/dvb/frontends/si21xx.c |   38 ++++++++++++++-------------------
 drivers/net/tlan.c                   |   28 ++++++++++++------------
 drivers/net/tlan.h                   |    3 --
 4 files changed, 38 insertions(+), 51 deletions(-)


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] drivers/net/tlan: Remove TRUE/FALSE defines, use bool
  2010-01-13  6:59 [PATCH 0/3] A few #define TRUE/FALSE removals Joe Perches
@ 2010-01-13  6:59 ` Joe Perches
  2010-01-14  4:40   ` David Miller
  2010-01-13  6:59 ` [PATCH 2/3] drivers/isdn/mISDN/dsp_ecdis.h: Remove #define TRUE/FALSE, " Joe Perches
  2010-01-13  6:59 ` [PATCH 3/3] drivers/media/dvb/frontends/si21xx.c: " Joe Perches
  2 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2010-01-13  6:59 UTC (permalink / raw)
  To: linux-kernel; +Cc: Samuel Chessman, netdev

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/net/tlan.c |   28 ++++++++++++++--------------
 drivers/net/tlan.h |    3 ---
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index fabaeff..bbcac3b 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -338,7 +338,7 @@ static int	TLan_PhyInternalService( struct net_device * );
 static int	TLan_PhyDp83840aCheck( struct net_device * );
 */
 
-static int	TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );
+static bool	TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );
 static void	TLan_MiiSendData( u16, u32, unsigned );
 static void	TLan_MiiSync( u16 );
 static void	TLan_MiiWriteReg( struct net_device *, u16, u16, u16 );
@@ -2204,7 +2204,7 @@ TLan_ResetAdapter( struct net_device *dev )
 	u32		data;
 	u8		data8;
 
-	priv->tlanFullDuplex = FALSE;
+	priv->tlanFullDuplex = false;
 	priv->phyOnline=0;
 	netif_carrier_off(dev);
 
@@ -2259,7 +2259,7 @@ TLan_ResetAdapter( struct net_device *dev )
 			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x0a );
 		} else if ( priv->duplex == TLAN_DUPLEX_FULL ) {
 			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x00 );
-			priv->tlanFullDuplex = TRUE;
+			priv->tlanFullDuplex = true;
 		} else {
 			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x08 );
 		}
@@ -2651,14 +2651,14 @@ static void TLan_PhyStartLink( struct net_device *dev )
 			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0000);
 		} else if ( priv->speed == TLAN_SPEED_10 &&
 			    priv->duplex == TLAN_DUPLEX_FULL) {
-			priv->tlanFullDuplex = TRUE;
+			priv->tlanFullDuplex = true;
 			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0100);
 		} else if ( priv->speed == TLAN_SPEED_100 &&
 			    priv->duplex == TLAN_DUPLEX_HALF) {
 			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2000);
 		} else if ( priv->speed == TLAN_SPEED_100 &&
 			    priv->duplex == TLAN_DUPLEX_FULL) {
-			priv->tlanFullDuplex = TRUE;
+			priv->tlanFullDuplex = true;
 			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2100);
 		} else {
 
@@ -2695,7 +2695,7 @@ static void TLan_PhyStartLink( struct net_device *dev )
                 	tctl &= ~TLAN_TC_AUISEL;
 			if ( priv->duplex == TLAN_DUPLEX_FULL ) {
 				control |= MII_GC_DUPLEX;
-				priv->tlanFullDuplex = TRUE;
+				priv->tlanFullDuplex = true;
 			}
 			if ( priv->speed == TLAN_SPEED_100 ) {
 				control |= MII_GC_SPEEDSEL;
@@ -2750,9 +2750,9 @@ static void TLan_PhyFinishAutoNeg( struct net_device *dev )
 	TLan_MiiReadReg( dev, phy, MII_AN_LPA, &an_lpa );
 	mode = an_adv & an_lpa & 0x03E0;
 	if ( mode & 0x0100 ) {
-		priv->tlanFullDuplex = TRUE;
+		priv->tlanFullDuplex = true;
 	} else if ( ! ( mode & 0x0080 ) && ( mode & 0x0040 ) ) {
-		priv->tlanFullDuplex = TRUE;
+		priv->tlanFullDuplex = true;
 	}
 
 	if ( ( ! ( mode & 0x0180 ) ) &&
@@ -2855,8 +2855,8 @@ void TLan_PhyMonitor( struct net_device *dev )
 	 *	TLan_MiiReadReg
 	 *
 	 *	Returns:
-	 *		0	if ack received ok
-	 *		1	otherwise.
+	 *		false	if ack received ok
+	 *		true	if no ack received or other error
 	 *
 	 *	Parms:
 	 *		dev		The device structure containing
@@ -2875,17 +2875,17 @@ void TLan_PhyMonitor( struct net_device *dev )
 	 *
 	 **************************************************************/
 
-static int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
+static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
 {
 	u8	nack;
 	u16	sio, tmp;
  	u32	i;
-	int	err;
+	bool	err;
 	int	minten;
 	TLanPrivateInfo *priv = netdev_priv(dev);
 	unsigned long flags = 0;
 
-	err = FALSE;
+	err = false;
 	outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
 	sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
 
@@ -2918,7 +2918,7 @@ static int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
 			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
 		}
 		tmp = 0xffff;
-		err = TRUE;
+		err = true;
 	} else {					/* ACK, so read data */
 		for (tmp = 0, i = 0x8000; i; i >>= 1) {
 			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
diff --git a/drivers/net/tlan.h b/drivers/net/tlan.h
index 4b82f28..d13ff12 100644
--- a/drivers/net/tlan.h
+++ b/drivers/net/tlan.h
@@ -31,9 +31,6 @@
 	 *
 	 ****************************************************************/
 
-#define FALSE			0
-#define TRUE			1
-
 #define TLAN_MIN_FRAME_SIZE	64
 #define TLAN_MAX_FRAME_SIZE	1600
 
-- 
1.6.6.rc0.57.gad7a


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/3] drivers/net/tlan: Remove TRUE/FALSE defines, use bool
  2010-01-13  6:59 ` [PATCH 1/3] drivers/net/tlan: Remove TRUE/FALSE defines, use bool Joe Perches
@ 2010-01-14  4:40   ` David Miller
  0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2010-01-14  4:40 UTC (permalink / raw)
  To: joe; +Cc: linux-kernel, chessman, netdev

From: Joe Perches <joe@perches.com>
Date: Tue, 12 Jan 2010 22:59:13 -0800

> Signed-off-by: Joe Perches <joe@perches.com>

Applied.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/3] drivers/isdn/mISDN/dsp_ecdis.h: Remove #define TRUE/FALSE, use bool
  2010-01-13  6:59 [PATCH 0/3] A few #define TRUE/FALSE removals Joe Perches
  2010-01-13  6:59 ` [PATCH 1/3] drivers/net/tlan: Remove TRUE/FALSE defines, use bool Joe Perches
@ 2010-01-13  6:59 ` Joe Perches
  2010-01-13  6:59 ` [PATCH 3/3] drivers/media/dvb/frontends/si21xx.c: " Joe Perches
  2 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2010-01-13  6:59 UTC (permalink / raw)
  To: linux-kernel; +Cc: Karsten Keil

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/isdn/mISDN/dsp_ecdis.h |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/isdn/mISDN/dsp_ecdis.h b/drivers/isdn/mISDN/dsp_ecdis.h
index 21dbd15..4a927b3 100644
--- a/drivers/isdn/mISDN/dsp_ecdis.h
+++ b/drivers/isdn/mISDN/dsp_ecdis.h
@@ -33,16 +33,12 @@ struct ec_disable_detector_state {
 	struct biquad2_state notch;
 	int notch_level;
 	int channel_level;
-	int tone_present;
+	bool tone_present;
+	bool hit;
 	int tone_cycle_duration;
 	int good_cycles;
-	int hit;
 };
 
-
-#define FALSE 0
-#define TRUE (!FALSE)
-
 static inline void
 echo_can_disable_detector_init(struct ec_disable_detector_state *det)
 {
@@ -58,10 +54,10 @@ echo_can_disable_detector_init(struct ec_disable_detector_state *det)
 
 	det->channel_level = 0;
 	det->notch_level = 0;
-	det->tone_present = FALSE;
+	det->tone_present = false;
+	det->hit = false;
 	det->tone_cycle_duration = 0;
 	det->good_cycles = 0;
-	det->hit = 0;
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -91,16 +87,16 @@ int16_t amp)
 					&& det->tone_cycle_duration <= 475*8) {
 					det->good_cycles++;
 					if (det->good_cycles > 2)
-						det->hit = TRUE;
+						det->hit = true;
 				}
 				det->tone_cycle_duration = 0;
 			}
-			det->tone_present = TRUE;
+			det->tone_present = true;
 		} else
-			det->tone_present = FALSE;
+			det->tone_present = false;
 		det->tone_cycle_duration++;
 	} else {
-		det->tone_present = FALSE;
+		det->tone_present = false;
 		det->tone_cycle_duration = 0;
 		det->good_cycles = 0;
 	}
-- 
1.6.6.rc0.57.gad7a


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] drivers/media/dvb/frontends/si21xx.c: Remove #define TRUE/FALSE, use bool
  2010-01-13  6:59 [PATCH 0/3] A few #define TRUE/FALSE removals Joe Perches
  2010-01-13  6:59 ` [PATCH 1/3] drivers/net/tlan: Remove TRUE/FALSE defines, use bool Joe Perches
  2010-01-13  6:59 ` [PATCH 2/3] drivers/isdn/mISDN/dsp_ecdis.h: Remove #define TRUE/FALSE, " Joe Perches
@ 2010-01-13  6:59 ` Joe Perches
  2 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2010-01-13  6:59 UTC (permalink / raw)
  To: linux-kernel; +Cc: Mauro Carvalho Chehab, linux-media

And a little code refactoring/neatening around the removals

Reduces object size a little bit:

new:
$ size drivers/media/dvb/frontends/si21xx.o
   text	   data	    bss	    dec	    hex	filename
   8984	     56	   1816	  10856	   2a68	drivers/media/dvb/frontends/si21xx.o
old:
$ size drivers/media/dvb/frontends/si21xx.o
   text	   data	    bss	    dec	    hex	filename
   9084	     56	   1792	  10932	   2ab4	drivers/media/dvb/frontends/si21xx.o

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/media/dvb/frontends/si21xx.c |   38 ++++++++++++++-------------------
 1 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/drivers/media/dvb/frontends/si21xx.c b/drivers/media/dvb/frontends/si21xx.c
index 9552a22..d21a327 100644
--- a/drivers/media/dvb/frontends/si21xx.c
+++ b/drivers/media/dvb/frontends/si21xx.c
@@ -97,8 +97,6 @@
 #define	LNB_SUPPLY_CTRL_REG_4		0xce
 #define	LNB_SUPPLY_STATUS_REG		0xcf
 
-#define FALSE	0
-#define TRUE	1
 #define FAIL	-1
 #define PASS	0
 
@@ -718,7 +716,7 @@ static int si21xx_set_frontend(struct dvb_frontend *fe,
 	int fine_tune_freq;
 	unsigned char sample_rate = 0;
 	/* boolean */
-	unsigned int inband_interferer_ind;
+	bool inband_interferer_ind;
 
 	/* INTERMEDIATE VALUES */
 	int icoarse_tune_freq; /* MHz */
@@ -728,15 +726,8 @@ static int si21xx_set_frontend(struct dvb_frontend *fe,
 	unsigned int x1;
 	unsigned int x2;
 	int i;
-	unsigned int inband_interferer_div2[ALLOWABLE_FS_COUNT] = {
-			FALSE, FALSE, FALSE, FALSE, FALSE,
-			FALSE, FALSE, FALSE, FALSE, FALSE
-	};
-	unsigned int inband_interferer_div4[ALLOWABLE_FS_COUNT] = {
-			FALSE, FALSE, FALSE, FALSE, FALSE,
-			FALSE, FALSE, FALSE, FALSE, FALSE
-	};
-
+	bool inband_interferer_div2[ALLOWABLE_FS_COUNT];
+	bool inband_interferer_div4[ALLOWABLE_FS_COUNT];
 	int status;
 
 	/* allowable sample rates for ADC in MHz */
@@ -762,7 +753,7 @@ static int si21xx_set_frontend(struct dvb_frontend *fe,
 	}
 
 	for (i = 0; i < ALLOWABLE_FS_COUNT; ++i)
-		inband_interferer_div2[i] = inband_interferer_div4[i] = FALSE;
+		inband_interferer_div2[i] = inband_interferer_div4[i] = false;
 
 	if_limit_high = -700000;
 	if_limit_low = -100000;
@@ -798,7 +789,7 @@ static int si21xx_set_frontend(struct dvb_frontend *fe,
 
 		if (((band_low < x1) && (x1 < band_high)) ||
 					((band_low < x2) && (x2 < band_high)))
-					inband_interferer_div4[i] = TRUE;
+					inband_interferer_div4[i] = true;
 
 	}
 
@@ -811,25 +802,28 @@ static int si21xx_set_frontend(struct dvb_frontend *fe,
 
 		if (((band_low < x1) && (x1 < band_high)) ||
 					((band_low < x2) && (x2 < band_high)))
-					inband_interferer_div2[i] = TRUE;
+					inband_interferer_div2[i] = true;
 	}
 
-	inband_interferer_ind = TRUE;
-	for (i = 0; i < ALLOWABLE_FS_COUNT; ++i)
-		inband_interferer_ind &= inband_interferer_div2[i] |
-						inband_interferer_div4[i];
+	inband_interferer_ind = true;
+	for (i = 0; i < ALLOWABLE_FS_COUNT; ++i) {
+		if (inband_interferer_div2[i] || inband_interferer_div4[i]) {
+			inband_interferer_ind = false;
+			break;
+		}
+	}
 
 	if (inband_interferer_ind) {
 		for (i = 0; i < ALLOWABLE_FS_COUNT; ++i) {
-			if (inband_interferer_div2[i] == FALSE) {
+			if (!inband_interferer_div2[i]) {
 				sample_rate = (u8) afs[i];
 				break;
 			}
 		}
 	} else {
 		for (i = 0; i < ALLOWABLE_FS_COUNT; ++i) {
-			if ((inband_interferer_div2[i] |
-					inband_interferer_div4[i]) == FALSE) {
+			if ((inband_interferer_div2[i] ||
+			     !inband_interferer_div4[i])) {
 				sample_rate = (u8) afs[i];
 				break;
 			}
-- 
1.6.6.rc0.57.gad7a


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-01-14  4:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-13  6:59 [PATCH 0/3] A few #define TRUE/FALSE removals Joe Perches
2010-01-13  6:59 ` [PATCH 1/3] drivers/net/tlan: Remove TRUE/FALSE defines, use bool Joe Perches
2010-01-14  4:40   ` David Miller
2010-01-13  6:59 ` [PATCH 2/3] drivers/isdn/mISDN/dsp_ecdis.h: Remove #define TRUE/FALSE, " Joe Perches
2010-01-13  6:59 ` [PATCH 3/3] drivers/media/dvb/frontends/si21xx.c: " Joe Perches

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox