[PATCH 01/10]arch:mips:sibyte:sb1250:setup.c Remove pointless "@" from various parts of the kernel

[PATCH 01/10]arch:mips:sibyte:sb1250:setup.c Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is becomeing bloated, might as well diet! even if its a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 arch/mips/sibyte/sb1250/setup.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c
index 92da315..81f9b74 100644
--- a/arch/mips/sibyte/sb1250/setup.c
+++ b/arch/mips/sibyte/sb1250/setup.c
@@ -202,9 +202,9 @@ void __init sb1250_setup(void)
 	switch (war_pass) {
 	case K_SYS_REVISION_BCM1250_PASS1:
 #ifndef CONFIG_SB1_PASS_1_WORKAROUNDS
-		printk("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, "
+		printk("This is a BCM1250 A0-A2 (Pass 1) board, "
 		            "and the kernel doesn't have the proper "
-		            "workarounds compiled in. @@@@\n");
+		            "workarounds compiled in.\n");
 		bad_config = 1;
 #endif
 		break;
@@ -212,29 +212,28 @@ void __init sb1250_setup(void)
 		/* Pass 2 - easiest as default for now - so many numbers */
 #if !defined(CONFIG_SB1_PASS_2_WORKAROUNDS) || \
     !defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS)
-		printk("@@@@ This is a BCM1250 A3-A10 board, and the "
+		printk("This is a BCM1250 A3-A10 board, and the "
 		            "kernel doesn't have the proper workarounds "
-		            "compiled in. @@@@\n");
+		            "compiled in.\n");
 		bad_config = 1;
 #endif
 #ifdef CONFIG_CPU_HAS_PREFETCH
-		printk("@@@@ Prefetches may be enabled in this kernel, "
-		            "but are buggy on this board.  @@@@\n");
+		printk("Prefetches may be enabled in this kernel, "
+		            "but are buggy on this board.\n");
 		bad_config = 1;
 #endif
 		break;
 	case K_SYS_REVISION_BCM1250_PASS2_2:
 #ifndef CONFIG_SB1_PASS_2_WORKAROUNDS
-		printk("@@@@ This is a BCM1250 B1/B2. board, and the "
+		printk("This is a BCM1250 B1/B2. board, and the "
 		            "kernel doesn't have the proper workarounds "
-		            "compiled in. @@@@\n");
+		            "compiled in.\n");
 		bad_config = 1;
 #endif
 #if defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) || \
     !defined(CONFIG_CPU_HAS_PREFETCH)
-		printk("@@@@ This is a BCM1250 B1/B2, but the kernel is "
-		            "conservatively configured for an 'A' stepping. "
-		            "@@@@\n");
+		printk("This is a BCM1250 B1/B2, but the kernel is "
+		            "conservatively configured for an 'A' stepping.\n");
 #endif
 		break;
 	default:
-- 
1.7.6

[PATCH 02/10]arch:powerpc:kernel:rtasd.c Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 arch/powerpc/kernel/rtasd.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 481ef06..64d83ab 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -210,7 +210,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
 		break;
 	case ERR_TYPE_KERNEL_PANIC:
 	default:
-		WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
+		WARN_ON_ONCE(!irqs_disabled()); /* DEBUG */
 		spin_unlock_irqrestore(&rtasd_log_lock, s);
 		return;
 	}
@@ -232,7 +232,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
 	/* Check to see if we need to or have stopped logging */
 	if (fatal || !logging_enabled) {
 		logging_enabled = 0;
-		WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
+		WARN_ON_ONCE(!irqs_disabled()); /* DEBUG */
 		spin_unlock_irqrestore(&rtasd_log_lock, s);
 		return;
 	}
@@ -255,13 +255,13 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
 		else
 			rtas_log_start += 1;
 
-		WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
+		WARN_ON_ONCE(!irqs_disabled()); /* DEBUG */
 		spin_unlock_irqrestore(&rtasd_log_lock, s);
 		wake_up_interruptible(&rtas_log_wait);
 		break;
 	case ERR_TYPE_KERNEL_PANIC:
 	default:
-		WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
+		WARN_ON_ONCE(!irqs_disabled()); /* DEBUG */
 		spin_unlock_irqrestore(&rtasd_log_lock, s);
 		return;
 	}
-- 
1.7.6

[PATCH 03/10]Documentation:usb:linux.inf Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 Documentation/usb/linux.inf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/usb/linux.inf b/Documentation/usb/linux.inf
index 4ffa715b0..8240a1e 100644
--- a/Documentation/usb/linux.inf
+++ b/Documentation/usb/linux.inf
@@ -28,7 +28,7 @@ DriverVer           = 06/21/2006,6.0.6000.16384
 [LinuxDevices.NTia64]
 %LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d6b&PID_0104&MI_00
 
-;@@@ This is the common setting for setup
+; This is the common setting for setup
 [ControlFlags]
 ExcludeFromSelect=*
 
-- 
1.7.6

[PATCH 04/10]drivers:atm Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 drivers/atm/atmtcp.c  |    2 +-
 drivers/atm/eni.c     |   16 ++++++++--------
 drivers/atm/horizon.c |    2 +-
 drivers/atm/iphase.c  |    2 +-
 drivers/atm/zatm.c    |   23 +++++++++++------------
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index b22d71c..63237bf 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -409,7 +409,7 @@ static int atmtcp_attach(struct atm_vcc *vcc,int itf)
 	set_bit(ATM_VF_META,&vcc->flags);
 	set_bit(ATM_VF_READY,&vcc->flags);
 	vcc->dev_data = dev;
-	(void) atm_init_aal5(vcc); /* @@@ losing AAL in transit ... */
+	(void) atm_init_aal5(vcc); /* losing AAL in transit... */
 	vcc->stats = &atmtcp_control_dev.stats.aal5;
 	return dev->number;
 }
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 9307141..3921c8eb 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -370,7 +370,7 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb,
 		ATM_SKB(skb)->vcc = vcc;
 	}
 	j = 0;
-	if ((eff && skip) || 1) { /* @@@ actually, skip is always == 1 ... */
+	if ((eff && skip) || 1) { /* actually, skip is always == 1... */
 		here = (eni_vcc->descr+skip) & (eni_vcc->words-1);
 		dma[j++] = (here << MID_DMA_COUNT_SHIFT) | (vcc->vci
 		    << MID_DMA_VCI_SHIFT) | MID_DT_JK;
@@ -461,7 +461,7 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb,
 	 * Can I move the dma_wr pointer by 2j+1 positions without overwriting
 	 * data that hasn't been read (position of dma_rd) yet ?
 	 */
-	if (!NEPMOK(dma_wr,j+j+1,dma_rd,NR_DMA_RX)) { /* @@@ +1 is ugly */
+	if (!NEPMOK(dma_wr,j+j+1,dma_rd,NR_DMA_RX)) { /* +1 is ugly */
 		printk(KERN_WARNING DEV_LABEL "(itf %d): RX DMA full\n",
 		    vcc->dev->number);
 		goto trouble;
@@ -694,7 +694,7 @@ static void get_service(struct atm_dev *dev)
 			printk(KERN_CRIT DEV_LABEL "(itf %d): VCI %ld not "
 			    "found\n",dev->number,vci);
 			continue; /* nasty but we try to go on anyway */
-			/* @@@ nope, doesn't work */
+			/* nope, doesn't work */
 		}
 		EVENT("getting from service\n",0,0);
 		if (ENI_VCC(vcc)->next != ENI_VCC_NOS) {
@@ -1126,7 +1126,7 @@ DPRINTK("iovcnt = %d\n",skb_shinfo(skb)->nr_frags);
 		if (aal5) put_dma(tx->index,eni_dev->dma,&j,paddr,skb->len);
 		else put_dma(tx->index,eni_dev->dma,&j,paddr+4,skb->len-4);
 	else {
-DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */
+DPRINTK("doing direct send\n"); /* well, this doesn't work anyway */
 		for (i = -1; i < skb_shinfo(skb)->nr_frags; i++)
 			if (i == -1)
 				put_dma(tx->index,eni_dev->dma,&j,(unsigned long)
@@ -1150,7 +1150,7 @@ DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */
 	    (aal5 ? MID_SEG_AAL5 : 0) | (tx->prescaler << MID_SEG_PR_SHIFT) |
 	    (tx->resolution << MID_SEG_RATE_SHIFT) |
 	    (size/(ATM_CELL_PAYLOAD/4)),tx->send+tx->tx_pos*4);
-/*printk("dsc = 0x%08lx\n",(unsigned long) readl(tx->send+tx->tx_pos*4));*/
+	/*printk("dsc = 0x%08lx\n",(unsigned long) readl(tx->send+tx->tx_pos*4));*/
 	writel((vcc->vci << MID_SEG_VCI_SHIFT) |
             (aal5 ? 0 : (skb->data[3] & 0xf)) |
 	    (ATM_SKB(skb)->atm_options & ATM_ATMOPT_CLP ? MID_SEG_CLP : 0),
@@ -1728,7 +1728,7 @@ static int __devinit eni_do_init(struct atm_dev *dev)
 		return error;
 	}
 	eni_dev->base_diff = real_base - (unsigned long) base;
-	/* id may not be present in ASIC Tonga boards - check this @@@ */
+	/* id may not be present in ASIC Tonga boards - check this */
 	if (!eni_dev->asic) {
 		eprom = (base+EPROM_SIZE-sizeof(struct midway_eprom));
 		if (readl(&eprom->magic) != ENI155_MAGIC) {
@@ -1936,7 +1936,7 @@ static int eni_open(struct atm_vcc *vcc)
 		return error;
 	}
 	set_bit(ATM_VF_READY,&vcc->flags);
-	/* should power down SUNI while !ref_count @@@ */
+	/* should power down SUNI while !ref_count */
 	return 0;
 }
 
@@ -2300,6 +2300,6 @@ static int __init eni_init(void)
 
 
 module_init(eni_init);
-/* @@@ since exit routine not defined, this module can not be unloaded */
+/* since exit routine not defined, this module can not be unloaded */
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index b812103..5f78419 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -1729,7 +1729,7 @@ static int hrz_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
     if (tx_iovcnt) {
       // scatter gather transfer
       dev->tx_regions = tx_iovcnt;
-      dev->tx_iovec = NULL;		/* @@@ needs rewritten */
+      dev->tx_iovec = NULL;		/* needs rewritten */
       dev->tx_bytes = 0;
       PRINTD (DBG_TX|DBG_BUS, "TX start scatter-gather transfer (iovec %p, len %d)",
 	      skb->data, tx_len);
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index cb90f7a..2794343 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2482,7 +2482,7 @@ static int __devinit ia_start(struct atm_dev *dev)
 		error = -EAGAIN;
 		goto err_out;
         }  
-        /* @@@ should release IRQ on error */  
+        /* should release IRQ on error */  
 	/* enabling memory + master */  
         if ((error = pci_write_config_word(iadev->pci,   
 				PCI_COMMAND,   
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index d889f56..8d975b7 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -544,7 +544,7 @@ static int open_rx_second(struct atm_vcc *vcc)
 	zatm_vcc = ZATM_VCC(vcc);
 	if (!zatm_vcc->rx_chan) return 0;
 	spin_lock_irqsave(&zatm_dev->lock, flags);
-	/* should also handle VPI @@@ */
+	/* should also handle VPI */
 	pos = vcc->vci >> 1;
 	shift = (1-(vcc->vci & 1)) << 4;
 	zpokel(zatm_dev,(zpeekl(zatm_dev,pos) & ~(0xffff << shift)) |
@@ -677,7 +677,7 @@ printk("NONONONOO!!!!\n");
 				dev_kfree_skb_irq(skb);
 			return -EAGAIN;
 		}
-		/* @@@ should check alignment */
+		/* should check alignment */
 		put = dsc+8;
 		dsc[0] = uPD98401_TXPD_V | uPD98401_TXPD_DP |
 		    (vcc->aal == ATM_AAL5 ? uPD98401_TXPD_AAL5 : 0 |
@@ -720,10 +720,10 @@ static inline void dequeue_tx(struct atm_vcc *vcc)
 		    "txing\n",vcc->dev->number);
 		return;
 	}
-#if 0 /* @@@ would fail on CLP */
-if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
-  uPD98401_TXPD_SM | uPD98401_TXPD_AAL5)) printk("@#*$!!!!  (%08x)\n",
-  *ZATM_PRV_DSC(skb));
+#if 0 /* would fail on CLP */
+	if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
+  		uPD98401_TXPD_SM | uPD98401_TXPD_AAL5)) printk("@#*$!!!!  (%08x)\n",
+  		*ZATM_PRV_DSC(skb));
 #endif
 	*ZATM_PRV_DSC(skb) = 0; /* mark as invalid */
 	zatm_vcc->txing--;
@@ -831,7 +831,7 @@ static int alloc_shaper(struct atm_dev *dev,int *pcr,int min,int max,int ubr)
 			m = i;
 		}
 		*pcr = i*ATM_OC3_PCR/m;
-		c = 20; /* @@@ should use max_cdv ! */
+		c = 20; /* should use max_cdv! */
 		if ((min && *pcr < min) || (max && *pcr > max)) return -EINVAL;
 		if (zatm_dev->tx_bw < *pcr) return -EAGAIN;
 		zatm_dev->tx_bw -= *pcr;
@@ -1078,7 +1078,7 @@ static irqreturn_t zatm_int(int irq,void *dev_id)
 			    "(0x%x)\n",dev->number,(reason & uPD98401_INT_MF)
 			    >> uPD98401_INT_MF_SHIFT);
 			event_dump();
-			    /* @@@ should try to recover */
+			    /* should try to recover */
 		}
 		if (reason & uPD98401_INT_MM) {
 			if (reason & 1) poll_rx(dev,0);
@@ -1086,7 +1086,7 @@ static irqreturn_t zatm_int(int irq,void *dev_id)
 			if (reason & 4) poll_tx(dev,2);
 			if (reason & 8) poll_tx(dev,3);
 		}
-		/* @@@ handle RCRn */
+		/* handle RCRn */
 	}
 	return IRQ_RETVAL(handled);
 }
@@ -1284,7 +1284,7 @@ static int __devinit zatm_start(struct atm_dev *dev)
 	    (2*VC_SIZE+RX_SIZE);
 	ld = -1;
 	for (rx = 1; rx < vccs; rx <<= 1) ld++;
-	dev->ci_range.vpi_bits = 0; /* @@@ no VPI for now */
+	dev->ci_range.vpi_bits = 0; /* no VPI for now */
 	dev->ci_range.vci_bits = ld;
 	dev->link_rate = ATM_OC3_PCR;
 	zatm_dev->chans = vccs; /* ??? */
@@ -1395,7 +1395,7 @@ static int zatm_open(struct atm_vcc *vcc)
 		vcc->dev_data = NULL;
 	if (vci != ATM_VPI_UNSPEC && vpi != ATM_VCI_UNSPEC)
 		set_bit(ATM_VF_ADDR,&vcc->flags);
-	if (vcc->qos.aal != ATM_AAL5) return -EINVAL; /* @@@ AAL0 */
+	if (vcc->qos.aal != ATM_AAL5) return -EINVAL; /* AAL0 */
 	DPRINTK(DEV_LABEL "(itf %d): open %d.%d\n",vcc->dev->number,vcc->vpi,
 	    vcc->vci);
 	if (!test_bit(ATM_VF_PARTIAL,&vcc->flags)) {
@@ -1433,7 +1433,6 @@ static int zatm_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flags)
 {
 	printk("Not yet implemented\n");
 	return -ENOSYS;
-	/* @@@ */
 }
 
 
-- 
1.7.6

[PATCH 05/10]drivers:media Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 drivers/media/dvb/frontends/au8522_priv.h |    2 +-
 drivers/media/video/au0828/au0828-video.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb/frontends/au8522_priv.h b/drivers/media/dvb/frontends/au8522_priv.h
index 751e17d..7da60b6 100644
--- a/drivers/media/dvb/frontends/au8522_priv.h
+++ b/drivers/media/dvb/frontends/au8522_priv.h
@@ -373,7 +373,7 @@ void au8522_release_state(struct au8522_state *state);
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_PAL		0x01
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_FM		0x01
 
-/* STILL NEED TO BE REFACTORED @@@@@@@@@@@@@@ */
+/* STILL NEED TO BE REFACTORED */
 #define AU8522_TVDEC_CONTRAST_REG00BH_CVBS			0x79
 #define AU8522_TVDEC_SATURATION_CB_REG00CH_CVBS			0x80
 #define AU8522_TVDEC_SATURATION_CR_REG00DH_CVBS			0x80
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index 0b3e481..c184bc2 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -340,7 +340,7 @@ static void au0828_copy_video(struct au0828_dev *dev,
 {
 	void *fieldstart, *startwrite, *startread;
 	int  linesdone, currlinedone, offset, lencopy, remain;
-	int bytesperline = dev->width << 1; /* Assumes 16-bit depth @@@@ */
+	int bytesperline = dev->width << 1; /* Assumes 16-bit depth */
 
 	if (len == 0)
 		return;
-- 
1.7.6

[PATCH 06/10]drivers:staging Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 drivers/staging/vt6655/wpactl.c |    2 +-
 drivers/staging/vt6656/rf.c     |    6 +++---
 drivers/staging/vt6656/wpactl.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c
index a0f994e..472f0bc 100644
--- a/drivers/staging/vt6655/wpactl.c
+++ b/drivers/staging/vt6655/wpactl.c
@@ -627,7 +627,7 @@ static int wpa_get_scan(PSDevice pDevice,
 
     if (ptempBSS == NULL) {
 
-       printk("bubble sort kmalloc memory fail@@@\n");
+       printk("bubble sort kmalloc memory fail\n");
 
         ret = -ENOMEM;
 
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 3fd0478..c327f45 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -899,16 +899,16 @@ BOOL        bResult = TRUE;
                 bResult &= IFRFbWriteEmbeded(pDevice, 0x03C6A200+(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW);
                 if (pDevice->sMgmtObj.eScanState != WMAC_NO_SCANNING) {
                     // scanning, the channel number is pDevice->uScanChannel
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"@@@@ RFbRawSetPower> 11B mode uCurrChannel[%d]\n", pDevice->sMgmtObj.uScanChannel);
+                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RFbRawSetPower> 11B mode uCurrChannel[%d]\n", pDevice->sMgmtObj.uScanChannel);
                     bResult &= IFRFbWriteEmbeded(pDevice, dwVT3226D0LoCurrentTable[pDevice->sMgmtObj.uScanChannel-1]); //RobertYu:20060420, sometimes didn't change channel just set power with different rate
                 } else {
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"@@@@ RFbRawSetPower> 11B mode uCurrChannel[%d]\n", pDevice->sMgmtObj.uCurrChannel);
+                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RFbRawSetPower> 11B mode uCurrChannel[%d]\n", pDevice->sMgmtObj.uCurrChannel);
                     bResult &= IFRFbWriteEmbeded(pDevice, dwVT3226D0LoCurrentTable[pDevice->sMgmtObj.uCurrChannel-1]); //RobertYu:20060420, sometimes didn't change channel just set power with different rate
                 }
 
                 bResult &= IFRFbWriteEmbeded(pDevice, 0x015C0800+(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW); //RobertYu:20060420, ok now, new switching power (mini-pci can have bigger power consumption)
             } else {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"@@@@ RFbRawSetPower> 11G mode\n");
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RFbRawSetPower> 11G mode\n");
                 dwVT3226Pwr = ((0x3F-pDevice->byCurPwr) << 20 ) | ( 0x7 << 8 ) /* Reg7 */ |   //RobertYu:20060420, TWIF 1.10
                                (BY_VT3226_REG_LEN << 3 )  | IFREGCTL_REGW;
                 bResult &= IFRFbWriteEmbeded(pDevice, dwVT3226Pwr);
diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c
index 9216df0..e796c82 100644
--- a/drivers/staging/vt6656/wpactl.c
+++ b/drivers/staging/vt6656/wpactl.c
@@ -634,7 +634,7 @@ static int wpa_get_scan(PSDevice pDevice,
 
     if (ptempBSS == NULL) {
 
-       printk("bubble sort kmalloc memory fail@@@\n");
+       printk("bubble sort kmalloc memory fail\n");
 
         ret = -ENOMEM;
 
-- 
1.7.6

[PATCH 07/10]drivers:net Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 drivers/net/arm/ep93xx_eth.c  |    2 +-
 drivers/net/ixp2000/enp2611.c |    8 ++++----
 drivers/net/ixp2000/ixpdev.c  |   10 +++++-----
 drivers/net/ixp2000/pm3386.c  |    6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 4317af8..a259680 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -787,7 +787,7 @@ static int ep93xx_eth_remove(struct platform_device *pdev)
 
 	ep = netdev_priv(dev);
 
-	/* @@@ Force down.  */
+	/* Force down. */
 	unregister_netdev(dev);
 	ep93xx_free_buffers(ep);
 
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index 34a6cfd..68e4fea 100644
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
@@ -122,8 +122,8 @@ static struct ixp2400_msf_parameters enp2611_msf_parameters =
 static struct net_device *nds[3];
 static struct timer_list link_check_timer;
 
-/* @@@ Poll the SFP moddef0 line too.  */
-/* @@@ Try to use the pm3386 DOOL interrupt as well.  */
+/* Poll the SFP moddef0 line too. */
+/* Try to use the pm3386 DOOL interrupt as well. */
 static void enp2611_check_link_status(unsigned long __dummy)
 {
 	int i;
@@ -138,7 +138,7 @@ static void enp2611_check_link_status(unsigned long __dummy)
 
 		status = pm3386_is_link_up(i);
 		if (status && !netif_carrier_ok(dev)) {
-			/* @@@ Should report autonegotiation status.  */
+			/* Should report autonegotiation status. */
 			printk(KERN_INFO "%s: NIC Link is Up\n", dev->name);
 
 			pm3386_enable_tx(i);
@@ -167,7 +167,7 @@ static void enp2611_set_port_admin_status(int port, int up)
 	} else {
 		caleb_disable_tx(port);
 		pm3386_disable_tx(port);
-		/* @@@ Flush out pending packets.  */
+		/* Flush out pending packets. */
 		pm3386_set_carrier(port, 0);
 
 		pm3386_disable_rx(port);
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index e122493..a319c81 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -47,7 +47,7 @@ static int ixpdev_xmit(struct sk_buff *skb, struct net_device *dev)
 	unsigned long flags;
 
 	if (unlikely(skb->len > PAGE_SIZE)) {
-		/* @@@ Count drops.  */
+		/* Count drops. */
 		dev_kfree_skb(skb);
 		return NETDEV_TX_OK;
 	}
@@ -103,7 +103,7 @@ static int ixpdev_rx(struct net_device *dev, int processed, int budget)
 			goto err;
 		}
 
-		/* @@@ Make FCS stripping configurable.  */
+		/* Make FCS stripping configurable. */
 		desc->pkt_length -= 4;
 
 		if (unlikely(!netif_running(nds[desc->channel])))
@@ -163,7 +163,7 @@ static void ixpdev_tx_complete(void)
 		if (desc == 0)
 			break;
 
-		/* @@@ Check whether entries come back in order.  */
+		/* Check whether entries come back in order. */
 		entry = (desc - TX_BUF_DESC_BASE) / sizeof(struct ixpdev_tx_desc);
 		channel = tx_desc[entry].channel;
 
@@ -343,7 +343,7 @@ int ixpdev_init(int __nds_count, struct net_device **__nds,
 		rx_desc[i].buf_length = PAGE_SIZE;
 	}
 
-	/* @@@ Maybe we shouldn't be preallocating TX buffers.  */
+	/* Maybe we shouldn't be preallocating TX buffers.  */
 	for (i = 0; i < TX_BUF_COUNT; i++) {
 		void *buf;
 
@@ -423,7 +423,7 @@ void ixpdev_deinit(void)
 {
 	int i;
 
-	/* @@@ Flush out pending packets.  */
+	/* Flush out pending packets. */
 
 	for (i = 0; i < nds_count; i++)
 		unregister_netdev(nds[i]);
diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ixp2000/pm3386.c
index e08d3f9..bedf822 100644
--- a/drivers/net/ixp2000/pm3386.c
+++ b/drivers/net/ixp2000/pm3386.c
@@ -166,7 +166,7 @@ void pm3386_init_port(int port)
 
 	/*
 	 * Initialise narrowbanding mode.  See application note 2010486
-	 * for more information.  (@@@ We also need to issue a reset
+	 * for more information.  (We also need to issue a reset
 	 * when ROOL or DOOL are detected.)
 	 */
 	pm3386_port_reg_write(port, 0x708, 0x10, 0xd055);
@@ -231,7 +231,7 @@ void pm3386_init_port(int port)
 	 */
 	pm3386_port_reg_write(port, 0x336, 0x100, 9018);
 
-	/* @@@ Should set 0x337/0x437 (RX forwarding threshold.)  */
+	/* Should set 0x337/0x437 (RX forwarding threshold.)  */
 
 	/*
 	 * Set autonegotiation parameters to 'no PAUSE, full duplex.'
@@ -294,7 +294,7 @@ void pm3386_get_stats(int port, struct net_device_stats *stats)
 	stats->tx_packets = pm3386_get_stat(port, 0x590);
 	stats->rx_bytes = pm3386_get_stat(port, 0x514);
 	stats->tx_bytes = pm3386_get_stat(port, 0x594);
-	/* @@@ Add other stats.  */
+	/* Add other stats. */
 }
 
 void pm3386_set_carrier(int port, int state)
-- 
1.7.6

[PATCH 08/10]fs Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 fs/ext3/balloc.c      |    6 +++---
 fs/ext3/inode.c       |    2 +-
 fs/ext3/namei.c       |    2 +-
 fs/ext3/super.c       |    4 ++--
 fs/ext4/super.c       |    2 +-
 fs/jbd/commit.c       |    2 +-
 fs/jbd/transaction.c  |    6 +++---
 fs/jbd2/commit.c      |    2 +-
 fs/jbd2/transaction.c |    4 ++--
 fs/ocfs2/suballoc.c   |    2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 6386d76..afc0637 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -564,7 +564,7 @@ do_more:
 	 * We are about to start releasing blocks in the bitmap,
 	 * so we need undo access.
 	 */
-	/* @@@ check errors */
+	/* check errors */
 	BUFFER_TRACE(bitmap_bh, "getting undo access");
 	err = ext3_journal_get_undo_access(handle, bitmap_bh);
 	if (err)
@@ -607,7 +607,7 @@ do_more:
 			cond_resched();
 			jbd_lock_bh_state(bitmap_bh);
 		}
-		/* @@@ This prevents newly-allocated data from being
+		/* This prevents newly-allocated data from being
 		 * freed and then reallocated within the same
 		 * transaction.
 		 *
@@ -714,7 +714,7 @@ void ext3_free_blocks(handle_t *handle, struct inode *inode,
  * This would lead to corruption if we crashed between overwriting the
  * data and committing the delete.
  *
- * @@@ We may want to make this allocation behaviour conditional on
+ * We may want to make this allocation behaviour conditional on
  * data-writes at some point, and disable it for metadata allocations or
  * sync-data inodes.
  */
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 04da6ac..cb259e5 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1582,7 +1582,7 @@ static int buffer_unmapped(handle_t *handle, struct buffer_head *bh)
  * 16May01: If we're reentered then journal_current_handle() will be
  *	    non-zero. We simply *return*.
  *
- * 1 July 2001: @@@ FIXME:
+ * 1 July 2001: FIXME:
  *   In journalled data mode, a data buffer may be metadata against the
  *   current transaction.  But the same file is part of a shared mapping
  *   and someone does a writepage() on it.
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 6e18a0b..ff31566 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1949,7 +1949,7 @@ int ext3_orphan_add(handle_t *handle, struct inode *inode)
 	/* Orphan handling is only valid for files with data blocks
 	 * being truncated, or files being unlinked. */
 
-	/* @@@ FIXME: Observation from aviro:
+	/* FIXME: Observation from aviro:
 	 * I think I can trigger J_ASSERT in ext3_orphan_add().  We block
 	 * here (on s_orphan_lock), so race with ext3_link() which might bump
 	 * ->i_nlink. For, say it, character device. Not a regular file,
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 7beb69a..4a5a899 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1089,7 +1089,7 @@ static int parse_options (char *options, struct super_block *sb,
 			clear_opt(sbi->s_mount_opt, RESERVATION);
 			break;
 		case Opt_journal_update:
-			/* @@@ FIXME */
+			/* FIXME */
 			/* Eventually we will want to be able to create
 			   a journal file here.  For now, only allow the
 			   user to specify an existing inode to be the
@@ -1350,7 +1350,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,
 			"warning: checktime reached, "
 			"running e2fsck is recommended");
 #if 0
-		/* @@@ We _will_ want to clear the valid bit if we find
+		/* We _will_ want to clear the valid bit if we find
                    inconsistencies, to force a fsck at reboot.  But for
                    a plain journaled filesystem we can keep it set as
                    valid forever! :) */
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4687fea..3a468b4 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1600,7 +1600,7 @@ static int parse_options(char *options, struct super_block *sb,
 			break;
 #endif
 		case Opt_journal_update:
-			/* @@@ FIXME */
+			/* FIXME */
 			/* Eventually we will want to be able to create
 			   a journal file here.  For now, only allow the
 			   user to specify an existing inode to be the
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 8799207..007d897 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -578,7 +578,7 @@ void journal_commit_transaction(journal_t *journal)
 		commit_transaction->t_outstanding_credits--;
 
 		/* Bump b_count to prevent truncate from stumbling over
-                   the shadowed buffer!  @@@ This can go if we ever get
+                   the shadowed buffer! This can go if we ever get
                    rid of the BJ_IO/BJ_Shadow pairing of buffers. */
 		get_bh(jh2bh(jh));
 
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index 7e59c6e..c6e9370 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -202,7 +202,7 @@ repeat_locked:
 	 */
 
 	/*
-	 * @@@ AKPM: This seems rather over-defensive.  We're giving commit
+	 * AKPM: This seems rather over-defensive.  We're giving commit
 	 * a _lot_ of headroom: 1/4 of the journal plus the size of
 	 * the committing transaction.  Really, we only need to give it
 	 * committing_transaction->t_outstanding_credits plus "enough" for
@@ -533,7 +533,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
 repeat:
 	bh = jh2bh(jh);
 
-	/* @@@ Need to check for errors here at some point. */
+	/* Need to check for errors here at some point. */
 
 	lock_buffer(bh);
 	jbd_lock_bh_state(bh);
@@ -995,7 +995,7 @@ int journal_dirty_data(handle_t *handle, struct buffer_head *bh)
 			J_ASSERT_JH(jh, jh->b_transaction ==
 					journal->j_committing_transaction);
 
-			/* @@@ IS THIS TRUE  ? */
+			/* IS THIS TRUE  ? */
 			/*
 			 * Not any more.  Scenario: someone does a write()
 			 * in data=journal mode.  The buffer's transaction has
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index eef6979..e5b362d 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -571,7 +571,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 		atomic_dec(&commit_transaction->t_outstanding_credits);
 
 		/* Bump b_count to prevent truncate from stumbling over
-                   the shadowed buffer!  @@@ This can go if we ever get
+                   the shadowed buffer! This can go if we ever get
                    rid of the BJ_IO/BJ_Shadow pairing of buffers. */
 		atomic_inc(&jh2bh(jh)->b_count);
 
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 2d71094..933d8b7 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -250,7 +250,7 @@ repeat:
 	 */
 
 	/*
-	 * @@@ AKPM: This seems rather over-defensive.  We're giving commit
+	 * AKPM: This seems rather over-defensive.  We're giving commit
 	 * a _lot_ of headroom: 1/4 of the journal plus the size of
 	 * the committing transaction.  Really, we only need to give it
 	 * committing_transaction->t_outstanding_credits plus "enough" for
@@ -602,7 +602,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
 repeat:
 	bh = jh2bh(jh);
 
-	/* @@@ Need to check for errors here at some point. */
+	/* Need to check for errors here at some point. */
 
 	lock_buffer(bh);
 	jbd_lock_bh_state(bh);
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index ba5d97e..55da3c1 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -1252,7 +1252,7 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb,
  * This would lead to corruption if we crashed between overwriting the
  * data and committing the delete.
  *
- * @@@ We may want to make this allocation behaviour conditional on
+ * We may want to make this allocation behaviour conditional on
  * data-writes at some point, and disable it for metadata allocations or
  * sync-data inodes."
  *
-- 
1.7.6

[PATCH 09/10]net Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock  <justinmattock@gmail.com>

---
 net/atm/clip.c            |    4 ++--
 net/atm/common.c          |    4 ++--
 net/atm/svc.c             |    4 ++--
 net/dsa/mv88e6060.c       |    2 +-
 net/dsa/mv88e6123_61_65.c |    4 ++--
 net/dsa/mv88e6131.c       |    2 +-
 net/sched/sch_atm.c       |    6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/net/atm/clip.c b/net/atm/clip.c
index 8523940..82d1877 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -76,7 +76,7 @@ static void link_vcc(struct clip_vcc *clip_vcc, struct atmarp_entry *entry)
 {
 	pr_debug("%p to entry %p (neigh %p)\n", clip_vcc, entry, entry->neigh);
 	clip_vcc->entry = entry;
-	clip_vcc->xoff = 0;	/* @@@ may overrun buffer by one packet */
+	clip_vcc->xoff = 0;	/* may overrun buffer by one packet */
 	clip_vcc->next = entry->vccs;
 	entry->vccs = clip_vcc;
 	entry->neigh->used = jiffies;
@@ -343,7 +343,7 @@ static struct neigh_table clip_tbl = {
 	.gc_thresh3 	= 1024,
 };
 
-/* @@@ copy bh locking from arp.c -- need to bh-enable atm code before */
+/* copy bh locking from arp.c -- need to bh-enable atm code before */
 
 /*
  * We play with the resolve flag: 0 and 1 have the usual meaning, but -1 means
diff --git a/net/atm/common.c b/net/atm/common.c
index 14ff9fe..5164849 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -551,7 +551,7 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
 		goto out;
 	}
 	if (m->msg_iovlen != 1) {
-		error = -ENOSYS; /* fix this later @@@ */
+		error = -ENOSYS; /* fix this later */
 		goto out;
 	}
 	buff = m->msg_iov->iov_base;
@@ -675,7 +675,7 @@ static int atm_change_qos(struct atm_vcc *vcc, struct atm_qos *qos)
 
 static int check_tp(const struct atm_trafprm *tp)
 {
-	/* @@@ Should be merged with adjust_tp */
+	/* Should be merged with adjust_tp */
 	if (!tp->traffic_class || tp->traffic_class == ATM_ANYCLASS)
 		return 0;
 	if (tp->traffic_class != ATM_UBR && !tp->min_pcr && !tp->pcr &&
diff --git a/net/atm/svc.c b/net/atm/svc.c
index 754ee47..852edd3 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -117,8 +117,8 @@ static int svc_bind(struct socket *sock, struct sockaddr *sockaddr,
 		goto out;
 	}
 	clear_bit(ATM_VF_BOUND, &vcc->flags);
-	    /* failing rebind will kill old binding */
-	/* @@@ check memory (de)allocation on rebind */
+	/* failing rebind will kill old binding */
+	/* check memory (de)allocation on rebind */
 	if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) {
 		error = -EBADFD;
 		goto out;
diff --git a/net/dsa/mv88e6060.c b/net/dsa/mv88e6060.c
index 8f4ff5a..a9c522b 100644
--- a/net/dsa/mv88e6060.c
+++ b/net/dsa/mv88e6060.c
@@ -163,7 +163,7 @@ static int mv88e6060_setup(struct dsa_switch *ds)
 	if (ret < 0)
 		return ret;
 
-	/* @@@ initialise atu */
+	/* initialise atu */
 
 	ret = mv88e6060_setup_global(ds);
 	if (ret < 0)
diff --git a/net/dsa/mv88e6123_61_65.c b/net/dsa/mv88e6123_61_65.c
index 52faaa2..1c2fa39 100644
--- a/net/dsa/mv88e6123_61_65.c
+++ b/net/dsa/mv88e6123_61_65.c
@@ -175,7 +175,7 @@ static int mv88e6123_61_65_setup_global(struct dsa_switch *ds)
 	for (i = 0; i < 16; i++)
 		REG_WRITE(REG_GLOBAL2, 0x0f, 0x8000 | (i << 8));
 
-	/* @@@ initialise AVB (22/23) watchdog (27) sdet (29) registers */
+	/* initialise AVB (22/23) watchdog (27) sdet (29) registers */
 
 	return 0;
 }
@@ -329,7 +329,7 @@ static int mv88e6123_61_65_setup(struct dsa_switch *ds)
 	if (ret < 0)
 		return ret;
 
-	/* @@@ initialise vtu and atu */
+	/* initialise vtu and atu */
 
 	ret = mv88e6123_61_65_setup_global(ds);
 	if (ret < 0)
diff --git a/net/dsa/mv88e6131.c b/net/dsa/mv88e6131.c
index 9bd1061..caef6ea 100644
--- a/net/dsa/mv88e6131.c
+++ b/net/dsa/mv88e6131.c
@@ -325,7 +325,7 @@ static int mv88e6131_setup(struct dsa_switch *ds)
 	if (ret < 0)
 		return ret;
 
-	/* @@@ initialise vtu and atu */
+	/* initialise vtu and atu */
 
 	ret = mv88e6131_setup_global(ds);
 	if (ret < 0)
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index e25e490..547dd4c 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -16,7 +16,7 @@
 #include <net/netlink.h>
 #include <net/pkt_sched.h>
 
-extern struct socket *sockfd_lookup(int fd, int *err);	/* @@@ fix this */
+extern struct socket *sockfd_lookup(int fd, int *err);	/* fix this */
 
 /*
  * The ATM queuing discipline provides a framework for invoking classifiers
@@ -248,7 +248,7 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
 		error = -EPROTOTYPE;
 		goto err_out;
 	}
-	/* @@@ should check if the socket is really operational or we'll crash
+	/* should check if the socket is really operational or we'll crash
 	   on vcc->send */
 	if (classid) {
 		if (TC_H_MAJ(classid ^ sch->handle)) {
@@ -393,7 +393,7 @@ done:
 	} else {
 		if (flow->vcc)
 			ATM_SKB(skb)->atm_options = flow->vcc->atm_options;
-		/*@@@ looks good ... but it's not supposed to work :-) */
+		/* looks good ... but it's not supposed to work :-) */
 #ifdef CONFIG_NET_CLS_ACT
 		switch (result) {
 		case TC_ACT_QUEUED:
-- 
1.7.6

[PATCH 10/10]include:linux Remove pointless "@" from various parts of the kernel

[Justin P. Mattock]

From: "Justin P. Mattock" <justinmattock@gmail.com>

The patch series below removes some pointless "@"'s in various parts of the kernel.
Note: some might be useful, but then again, some just seemed a waste of space.
(and since the kernel is become bloated, might as well diet! even if it's a few bits)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 include/linux/jbd.h      |    2 +-
 include/linux/jbd2.h     |    2 +-
 include/linux/rcupdate.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index e6a5e34..7f3b109 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -273,7 +273,7 @@ typedef struct journal_superblock_s
 enum jbd_state_bits {
 	BH_JBD			/* Has an attached ext3 journal_head */
 	  = BH_PrivateStart,
-	BH_JWrite,		/* Being written to log (@@@ DEBUGGING) */
+	BH_JWrite,		/* Being written to log DEBUGGING */
 	BH_Freed,		/* Has been freed (truncated) */
 	BH_Revoked,		/* Has been revoked from the log */
 	BH_RevokeValid,		/* Revoked flag is valid */
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 38f307b..4a7ad4b 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -305,7 +305,7 @@ typedef struct journal_superblock_s
 enum jbd_state_bits {
 	BH_JBD			/* Has an attached ext3 journal_head */
 	  = BH_PrivateStart,
-	BH_JWrite,		/* Being written to log (@@@ DEBUGGING) */
+	BH_JWrite,		/* Being written to log DEBUGGING */
 	BH_Freed,		/* Has been freed (truncated) */
 	BH_Revoked,		/* Has been revoked from the log */
 	BH_RevokeValid,		/* Revoked flag is valid */
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 8f4f881..cfb5d7b 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -443,7 +443,7 @@ extern int rcu_my_thread_group_empty(void);
 	__rcu_dereference_check((p), rcu_read_lock_sched_held() || (c), \
 				__rcu)
 
-#define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /*@@@ needed? @@@*/
+#define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /* needed? */
 
 /**
  * rcu_access_index() - fetch RCU index with no dereferencing
-- 
1.7.6

Re: [PATCH 04/10]drivers:atm Remove pointless "@" from various parts of the kernel

[David Miller]

From: "Justin P. Mattock" <justinmattock@gmail.com>
Date: Fri, 12 Aug 2011 17:27:09 -0700

> From: "Justin P. Mattock" <justinmattock@gmail.com>
> 
> The patch series below removes some pointless "@"'s in various parts of the kernel.
> Note: some might be useful, but then again, some just seemed a waste of space.
> (and since the kernel is become bloated, might as well diet! even if it's a few bits)
> 
> Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

These are like "XXX" markers in comments, used so you can quickly look
for areas that knowingly need improvement in the code.

I really think these patches are a waste of time and make things worse
not better, the side effect of your patch is that we'll be losing
information.

Re: [PATCH 10/10]include:linux Remove pointless "@" from various parts of the kernel

[Paul E. McKenney]

On Fri, Aug 12, 2011 at 05:27:15PM -0700, Justin P. Mattock wrote:
> From: "Justin P. Mattock" <justinmattock@gmail.com>
> 
> The patch series below removes some pointless "@"'s in various parts of the kernel.
> Note: some might be useful, but then again, some just seemed a waste of space.
> (and since the kernel is become bloated, might as well diet! even if it's a few bits)

I would like to keep the RCU "@@@", please!

							Thanx, Paul

> Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
> 
> ---
>  include/linux/jbd.h      |    2 +-
>  include/linux/jbd2.h     |    2 +-
>  include/linux/rcupdate.h |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/jbd.h b/include/linux/jbd.h
> index e6a5e34..7f3b109 100644
> --- a/include/linux/jbd.h
> +++ b/include/linux/jbd.h
> @@ -273,7 +273,7 @@ typedef struct journal_superblock_s
>  enum jbd_state_bits {
>  	BH_JBD			/* Has an attached ext3 journal_head */
>  	  = BH_PrivateStart,
> -	BH_JWrite,		/* Being written to log (@@@ DEBUGGING) */
> +	BH_JWrite,		/* Being written to log DEBUGGING */
>  	BH_Freed,		/* Has been freed (truncated) */
>  	BH_Revoked,		/* Has been revoked from the log */
>  	BH_RevokeValid,		/* Revoked flag is valid */
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index 38f307b..4a7ad4b 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -305,7 +305,7 @@ typedef struct journal_superblock_s
>  enum jbd_state_bits {
>  	BH_JBD			/* Has an attached ext3 journal_head */
>  	  = BH_PrivateStart,
> -	BH_JWrite,		/* Being written to log (@@@ DEBUGGING) */
> +	BH_JWrite,		/* Being written to log DEBUGGING */
>  	BH_Freed,		/* Has been freed (truncated) */
>  	BH_Revoked,		/* Has been revoked from the log */
>  	BH_RevokeValid,		/* Revoked flag is valid */
> diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
> index 8f4f881..cfb5d7b 100644
> --- a/include/linux/rcupdate.h
> +++ b/include/linux/rcupdate.h
> @@ -443,7 +443,7 @@ extern int rcu_my_thread_group_empty(void);
>  	__rcu_dereference_check((p), rcu_read_lock_sched_held() || (c), \
>  				__rcu)
> 
> -#define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /*@@@ needed? @@@*/
> +#define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /* needed? */
> 
>  /**
>   * rcu_access_index() - fetch RCU index with no dereferencing
> -- 
> 1.7.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 10/10]include:linux Remove pointless "@" from various parts of the kernel

[Jiri Kosina]

On Mon, 15 Aug 2011, Paul E. McKenney wrote:

> > The patch series below removes some pointless "@"'s in various parts of the kernel.
> > Note: some might be useful, but then again, some just seemed a waste of space.
> > (and since the kernel is become bloated, might as well diet! even if it's a few bits)
> 
> I would like to keep the RCU "@@@", please!

Don't worry, I am not taking this whole patchset.

Justin, you are not really going to save any space in .text by removing 
comments anyway.

-- 
Jiri Kosina
SUSE Labs