[PATCH] tpm: Fix concerns with TPM driver -- use enums

Convert #defines to named enums where that preference has been indicated by
other kernel developers.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 31 insertions, 23 deletions

diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index 6e5ffcacea60..24832abe0b2d 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -22,34 +22,42 @@
 #include "tpm.h"
 
 /* National definitions */
-#define TPM_NSC_BASE                    0x360
-#define TPM_NSC_IRQ                     0x07
+enum tpm_nsc_addr {
+        TPM_NSC_BASE = 0x360,
+        TPM_NSC_IRQ = 0x07
+};
 
-#define NSC_LDN_INDEX                   0x07
-#define NSC_SID_INDEX                   0x20
-#define NSC_LDC_INDEX                   0x30
-#define NSC_DIO_INDEX                   0x60
-#define NSC_CIO_INDEX                   0x62
-#define NSC_IRQ_INDEX                   0x70
-#define NSC_ITS_INDEX                   0x71
+enum tpm_nsc_index {
+        NSC_LDN_INDEX = 0x07,
+        NSC_SID_INDEX = 0x20,
+        NSC_LDC_INDEX = 0x30,
+        NSC_DIO_INDEX = 0x60,
+        NSC_CIO_INDEX = 0x62,
+        NSC_IRQ_INDEX = 0x70,
+        NSC_ITS_INDEX = 0x71
+};
 
-#define NSC_STATUS                      0x01
-#define NSC_COMMAND                     0x01
-#define NSC_DATA                        0x00
+enum tpm_nsc_status_loc {
+        NSC_STATUS = 0x01,
+        NSC_COMMAND = 0x01,
+        NSC_DATA = 0x00
+};
 
 /* status bits */
-#define NSC_STATUS_OBF                  0x01    /* output buffer full */
-#define NSC_STATUS_IBF                  0x02    /* input buffer full */
-#define NSC_STATUS_F0                   0x04    /* F0 */
-#define NSC_STATUS_A2                   0x08    /* A2 */
-#define NSC_STATUS_RDY                  0x10    /* ready to receive command */
-#define NSC_STATUS_IBR                  0x20    /* ready to receive data */
-
+enum tpm_nsc_status{
+        NSC_STATUS_OBF = 0x01,  /* output buffer full */
+        NSC_STATUS_IBF = 0x02,  /* input buffer full */
+        NSC_STATUS_F0 = 0x04,   /* F0 */
+        NSC_STATUS_A2 = 0x08,   /* A2 */
+        NSC_STATUS_RDY = 0x10,  /* ready to receive command */
+        NSC_STATUS_IBR = 0x20   /* ready to receive data */
+};
 /* command bits */
-#define NSC_COMMAND_NORMAL              0x01    /* normal mode */
-#define NSC_COMMAND_EOC                 0x03
-#define NSC_COMMAND_CANCEL              0x22
-
+enum tpm_nsc_cmd_mode {
+        NSC_COMMAND_NORMAL = 0x01,      /* normal mode */
+        NSC_COMMAND_EOC = 0x03,
+        NSC_COMMAND_CANCEL = 0x22
+};
 /*
  * Wait for a certain status to appear
  */