Menu
▾
▴
[Acx100-devel] [PATCH 06/29] style: fix // comments in a bunch of headers
|
From: Jim C. <jim...@gm...> - 2012-05-12 06:26:05
|
skips a few where conversion (by script) creates compile errs.
Signed-off-by: Jim Cromie <jim...@gm...>
---
acx.h | 5 +++--
acx_compat.h | 2 +-
interrupt-masks.h | 12 ++++++------
io-acx.h | 5 +++--
mem-inlines.h | 2 +-
mem.h | 7 ++++---
pci.h | 26 ++++++++++++++------------
7 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/acx.h b/acx.h
index 5550efc..5f764a8 100644
--- a/acx.h
+++ b/acx.h
@@ -19,8 +19,9 @@
#define _ACX_H_
#define NONESSENTIAL_FEATURES 1 // acx_show_card_eeprom_id()
-//#define UNUSED 0 // lots of errs ifdefd
-//#define CONFIG_PM 0 // in include/generated/autoconf.h
+/* #define UNUSED 0 // lots of errs if defd
+ * #define CONFIG_PM 0 // in include/generated/autoconf.h
+ */
#include "acx_compat.h"
#include "acx_config.h"
diff --git a/acx_compat.h b/acx_compat.h
index c25d837..f839a06 100644
--- a/acx_compat.h
+++ b/acx_compat.h
@@ -13,7 +13,7 @@ do { \
#endif
-// may get into 3.4
+/* to be submitted to LKML */
#ifndef BUILD_BUG_DECL
#define BUILD_BUG_DECL(name, condition) \
static __initdata struct { \
diff --git a/interrupt-masks.h b/interrupt-masks.h
index 87947ca..db0912a 100644
--- a/interrupt-masks.h
+++ b/interrupt-masks.h
@@ -99,7 +99,7 @@ inline void interrupt_sanity_checks(void) {}
const char *devtype_names[] = { "PCI", "USB", "MEM" };
const char *chiptype_names[] = { "", "ACX100", "ACX111" };
-// defd to textually match #define table in acx-struct-hw (then reordered)
+/* defd to textually match #define table in acx-struct-hw (then reordered) */
struct interrupt_desc {
int flagval;
char *name;
@@ -166,17 +166,17 @@ void interrupt_show_flags(u16 flagval, u16 versus)
{
int i, mask, flagdiffs;
- // pr_info("flagval:0x%x versus:0x%x\n", flagval, versus);
+ /* pr_info("flagval:0x%x versus:0x%x\n", flagval, versus); */
flagdiffs = flagval ^ versus;
- // pr_info("flagdiffs:0x%x\n", flagdiffs);
+ /* pr_info("flagdiffs:0x%x\n", flagdiffs); */
if (!flagdiffs) return;
flagdiffs = ~flagdiffs; // flags are active low
- // pr_info("~flagdiffs:0x%x\n", flagdiffs);
+ /* pr_info("~flagdiffs:0x%x\n", flagdiffs); */
for (i = 0; i < 16; i++) {
mask = 1 << i;
@@ -200,7 +200,7 @@ inline void interrupt_sanity_checks(acx_device_t *adev)
for (d = 0; d < DEVTYPE_MAX; d++) {
for (c = 0; c < CHIPTYPE_MAX; c++) {
- // skip non-devices or no-flags (same condition really)
+ /* skip non-devices or no-flags (same condition really) */
if (!interrupt_masks[d][c]) continue;
if (!chiptype_names[c]) continue;
@@ -210,7 +210,7 @@ inline void interrupt_sanity_checks(acx_device_t *adev)
interrupt_show_flags(interrupt_masks[d][c], 0);
- // continue;
+ /* continue; */
/* see diffs */
pr_info("vs devtype:%d:%s chip:%d:%s val:0x%x\n",
diff --git a/io-acx.h b/io-acx.h
index 6213832..f120ea3 100644
--- a/io-acx.h
+++ b/io-acx.h
@@ -1,6 +1,7 @@
-// ick: shouldnt declare things in headers
-// cuz including it 2x is bad
+/* ick: shouldnt declare things in headers
+ * cuz including it 2x is bad
+ */
static const u16 IO_ACX100[] = {
0x0000, /* IO_ACX_SOFT_RESET */
diff --git a/mem-inlines.h b/mem-inlines.h
index 36cbfa9..a9052b6 100644
--- a/mem-inlines.h
+++ b/mem-inlines.h
@@ -84,7 +84,7 @@
#define acx_writel(v, r) writel((v), (r))
#define acx_writew(v, r) writew((v), (r))
-// This controls checking of spin-locking in the mem-interface
+/* This controls checking of spin-locking in the mem-interface */
#define ACXMEM_SPIN_CHECK 0
#if ACXMEM_SPIN_CHECK
diff --git a/mem.h b/mem.h
index 25f823d..a701f7e 100644
--- a/mem.h
+++ b/mem.h
@@ -14,7 +14,7 @@
#define DUMP_MEM_DEFINED 1 // to insure export of dump* fns too
-// Logging
+/* Logging */
#if DUMP_MEM_DEFINED > 0
void acxmem_dump_mem(acx_device_t *adev, u32 start, int length);
@@ -71,8 +71,9 @@ static inline void acxmem_chaincopy_from_slavemem(acx_device_t *adev,
u8 *destination, u32 source, int count)
{ }
-//inline int acxmem_upload_radio(acx_device_t *adev)
-//{ return 0; }
+/* inline int acxmem_upload_radio(acx_device_t *adev)
+ * { return 0; }
+ */
static inline int acxmem_write_fw(acx_device_t *adev,
const firmware_image_t *fw_image, u32 offset)
diff --git a/pci.h b/pci.h
index eca8a7f..50a6ae6 100644
--- a/pci.h
+++ b/pci.h
@@ -7,12 +7,12 @@
#define STATick /* ick - suppress static, and thus a raft of warnings
let linker find the fns in mem.o, pci.o */
-// Logging
+/* Logging */
void acxpci_free_coherent(struct pci_dev *hwdev, size_t size,
void *vaddr, dma_addr_t dma_handle);
-// Firmware, EEPROM, Phy
+/* Firmware, EEPROM, Phy */
int acxpci_upload_radio(acx_device_t *adev);
int acxpci_write_fw(acx_device_t *adev, const firmware_image_t *fw_image,
@@ -21,33 +21,35 @@ int acxpci_validate_fw(acx_device_t *adev, const firmware_image_t *fw_image,
u32 offset);
int acxpci_upload_fw(acx_device_t *adev);
-// CMDs (Control Path)
+/* CMDs (Control Path) */
int acxpci_issue_cmd_timeo_debug(acx_device_t *adev, unsigned cmd,
void *buffer, unsigned buflen, unsigned cmd_timeout,
const char *cmdstr);
void acxpci_init_mboxes(acx_device_t *adev);
-// Init, Configuration (Control Path)
+/* Init, Configuration (Control Path) */
int acxpci_reset_dev(acx_device_t *adev);
void acxpci_reset_mac(acx_device_t *adev);
-// Other (Control Path)
+/* Other (Control Path) */
-// Proc, Debug
+/* Proc, Debug */
int acxpci_proc_diag_output(struct seq_file *file, acx_device_t *adev);
-// Rx Path
-// Tx Path
+/* Rx Path
+ * Tx Path
+ */
tx_t *acxpci_alloc_tx(acx_device_t *adev);
-// Irq Handling, Timer
+/* Irq Handling, Timer */
-// Helpers
+/* Helpers */
void acxpci_power_led(acx_device_t *adev, int enable);
-// Ioctls
-// Driver, Module
+/* Ioctls
+ * Driver, Module
+ */
int __init acxpci_init_module(void);
void __exit acxpci_cleanup_module(void);
--
1.7.10.1.487.ga3935e6
|