ipmi: kcs_bmc: Rename {read,write}_{status,data}() functions

Rename the functions in preparation for separating the IPMI chardev out
from the KCS BMC core.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Zev Weiss <zweiss@equinix.com>
Message-Id: <20210608104757.582199-4-andrew@aj.id.au>
Signed-off-by: Corey Minyard <cminyard@mvista.com>

diff --git a/drivers/char/ipmi/kcs_bmc.c b/drivers/char/ipmi/kcs_bmc.c
index 58fb1a7..c4336c1 100644 (file)
--- a/drivers/char/ipmi/kcs_bmc.c
+++ b/drivers/char/ipmi/kcs_bmc.c
@@ -45,42 +45,42 @@ enum kcs_states {
 #define KCS_CMD_WRITE_END         0x62
 #define KCS_CMD_READ_BYTE         0x68
 
-static inline u8 read_data(struct kcs_bmc *kcs_bmc)
+static inline u8 kcs_bmc_read_data(struct kcs_bmc *kcs_bmc)
 {
        return kcs_bmc->io_inputb(kcs_bmc, kcs_bmc->ioreg.idr);
 }
 
-static inline void write_data(struct kcs_bmc *kcs_bmc, u8 data)
+static inline void kcs_bmc_write_data(struct kcs_bmc *kcs_bmc, u8 data)
 {
        kcs_bmc->io_outputb(kcs_bmc, kcs_bmc->ioreg.odr, data);
 }
 
-static inline u8 read_status(struct kcs_bmc *kcs_bmc)
+static inline u8 kcs_bmc_read_status(struct kcs_bmc *kcs_bmc)
 {
        return kcs_bmc->io_inputb(kcs_bmc, kcs_bmc->ioreg.str);
 }
 
-static inline void write_status(struct kcs_bmc *kcs_bmc, u8 data)
+static inline void kcs_bmc_write_status(struct kcs_bmc *kcs_bmc, u8 data)
 {
        kcs_bmc->io_outputb(kcs_bmc, kcs_bmc->ioreg.str, data);
 }
 
-static void update_status_bits(struct kcs_bmc *kcs_bmc, u8 mask, u8 val)
+static void kcs_bmc_update_status(struct kcs_bmc *kcs_bmc, u8 mask, u8 val)
 {
        kcs_bmc->io_updateb(kcs_bmc, kcs_bmc->ioreg.str, mask, val);
 }
 
 static inline void set_state(struct kcs_bmc *kcs_bmc, u8 state)
 {
-       update_status_bits(kcs_bmc, KCS_STATUS_STATE_MASK,
+       kcs_bmc_update_status(kcs_bmc, KCS_STATUS_STATE_MASK,
                                        KCS_STATUS_STATE(state));
 }
 
 static void kcs_force_abort(struct kcs_bmc *kcs_bmc)
 {
        set_state(kcs_bmc, ERROR_STATE);
-       read_data(kcs_bmc);
-       write_data(kcs_bmc, KCS_ZERO_DATA);
+       kcs_bmc_read_data(kcs_bmc);
+       kcs_bmc_write_data(kcs_bmc, KCS_ZERO_DATA);
 
        kcs_bmc->phase = KCS_PHASE_ERROR;
        kcs_bmc->data_in_avail = false;
@@ -99,9 +99,9 @@ static void kcs_bmc_handle_data(struct kcs_bmc *kcs_bmc)
        case KCS_PHASE_WRITE_DATA:
                if (kcs_bmc->data_in_idx < KCS_MSG_BUFSIZ) {
                        set_state(kcs_bmc, WRITE_STATE);
-                       write_data(kcs_bmc, KCS_ZERO_DATA);
+                       kcs_bmc_write_data(kcs_bmc, KCS_ZERO_DATA);
                        kcs_bmc->data_in[kcs_bmc->data_in_idx++] =
-                                               read_data(kcs_bmc);
+                                               kcs_bmc_read_data(kcs_bmc);
                } else {
                        kcs_force_abort(kcs_bmc);
                        kcs_bmc->error = KCS_LENGTH_ERROR;
@@ -112,7 +112,7 @@ static void kcs_bmc_handle_data(struct kcs_bmc *kcs_bmc)
                if (kcs_bmc->data_in_idx < KCS_MSG_BUFSIZ) {
                        set_state(kcs_bmc, READ_STATE);
                        kcs_bmc->data_in[kcs_bmc->data_in_idx++] =
-                                               read_data(kcs_bmc);
+                                               kcs_bmc_read_data(kcs_bmc);
                        kcs_bmc->phase = KCS_PHASE_WRITE_DONE;
                        kcs_bmc->data_in_avail = true;
                        wake_up_interruptible(&kcs_bmc->queue);
@@ -126,34 +126,34 @@ static void kcs_bmc_handle_data(struct kcs_bmc *kcs_bmc)
                if (kcs_bmc->data_out_idx == kcs_bmc->data_out_len)
                        set_state(kcs_bmc, IDLE_STATE);
 
-               data = read_data(kcs_bmc);
+               data = kcs_bmc_read_data(kcs_bmc);
                if (data != KCS_CMD_READ_BYTE) {
                        set_state(kcs_bmc, ERROR_STATE);
-                       write_data(kcs_bmc, KCS_ZERO_DATA);
+                       kcs_bmc_write_data(kcs_bmc, KCS_ZERO_DATA);
                        break;
                }
 
                if (kcs_bmc->data_out_idx == kcs_bmc->data_out_len) {
-                       write_data(kcs_bmc, KCS_ZERO_DATA);
+                       kcs_bmc_write_data(kcs_bmc, KCS_ZERO_DATA);
                        kcs_bmc->phase = KCS_PHASE_IDLE;
                        break;
                }
 
-               write_data(kcs_bmc,
+               kcs_bmc_write_data(kcs_bmc,
                        kcs_bmc->data_out[kcs_bmc->data_out_idx++]);
                break;
 
        case KCS_PHASE_ABORT_ERROR1:
                set_state(kcs_bmc, READ_STATE);
-               read_data(kcs_bmc);
-               write_data(kcs_bmc, kcs_bmc->error);
+               kcs_bmc_read_data(kcs_bmc);
+               kcs_bmc_write_data(kcs_bmc, kcs_bmc->error);
                kcs_bmc->phase = KCS_PHASE_ABORT_ERROR2;
                break;
 
        case KCS_PHASE_ABORT_ERROR2:
                set_state(kcs_bmc, IDLE_STATE);
-               read_data(kcs_bmc);
-               write_data(kcs_bmc, KCS_ZERO_DATA);
+               kcs_bmc_read_data(kcs_bmc);
+               kcs_bmc_write_data(kcs_bmc, KCS_ZERO_DATA);
                kcs_bmc->phase = KCS_PHASE_IDLE;
                break;
 
@@ -168,9 +168,9 @@ static void kcs_bmc_handle_cmd(struct kcs_bmc *kcs_bmc)
        u8 cmd;
 
        set_state(kcs_bmc, WRITE_STATE);
-       write_data(kcs_bmc, KCS_ZERO_DATA);
+       kcs_bmc_write_data(kcs_bmc, KCS_ZERO_DATA);
 
-       cmd = read_data(kcs_bmc);
+       cmd = kcs_bmc_read_data(kcs_bmc);
        switch (cmd) {
        case KCS_CMD_WRITE_START:
                kcs_bmc->phase = KCS_PHASE_WRITE_START;
@@ -212,7 +212,7 @@ int kcs_bmc_handle_event(struct kcs_bmc *kcs_bmc)
 
        spin_lock_irqsave(&kcs_bmc->lock, flags);
 
-       status = read_status(kcs_bmc);
+       status = kcs_bmc_read_status(kcs_bmc);
        if (status & KCS_STATUS_IBF) {
                if (!kcs_bmc->running)
                        kcs_force_abort(kcs_bmc);
@@ -350,7 +350,7 @@ static ssize_t kcs_bmc_write(struct file *filp, const char __user *buf,
                kcs_bmc->data_out_idx = 1;
                kcs_bmc->data_out_len = count;
                memcpy(kcs_bmc->data_out, kcs_bmc->kbuffer, count);
-               write_data(kcs_bmc, kcs_bmc->data_out[0]);
+               kcs_bmc_write_data(kcs_bmc, kcs_bmc->data_out[0]);
                ret = count;
        } else {
                ret = -EINVAL;
@@ -373,13 +373,11 @@ static long kcs_bmc_ioctl(struct file *filp, unsigned int cmd,
 
        switch (cmd) {
        case IPMI_BMC_IOCTL_SET_SMS_ATN:
-               update_status_bits(kcs_bmc, KCS_STATUS_SMS_ATN,
-                                  KCS_STATUS_SMS_ATN);
+               kcs_bmc_update_status(kcs_bmc, KCS_STATUS_SMS_ATN, KCS_STATUS_SMS_ATN);
                break;
 
        case IPMI_BMC_IOCTL_CLEAR_SMS_ATN:
-               update_status_bits(kcs_bmc, KCS_STATUS_SMS_ATN,
-                                  0);
+               kcs_bmc_update_status(kcs_bmc, KCS_STATUS_SMS_ATN, 0);
                break;
 
        case IPMI_BMC_IOCTL_FORCE_ABORT: