OSDN Git Service

s390: qeth_core_mpc: Use ARRAY_SIZE instead of reimplementing its function
authorzhong jiang <zhongjiang@huawei.com>
Wed, 26 Sep 2018 16:07:09 +0000 (18:07 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Sep 2018 17:27:26 +0000 (10:27 -0700)
Use the common code ARRAY_SIZE macro instead of a private implementation.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_core_mpc.c

index 5bcb8da..e8263de 100644 (file)
@@ -222,8 +222,7 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = {
 char *qeth_get_ipa_msg(enum qeth_ipa_return_codes rc)
 {
        int x = 0;
-       qeth_ipa_rc_msg[sizeof(qeth_ipa_rc_msg) /
-                       sizeof(struct ipa_rc_msg) - 1].rc = rc;
+       qeth_ipa_rc_msg[ARRAY_SIZE(qeth_ipa_rc_msg) - 1].rc = rc;
        while (qeth_ipa_rc_msg[x].rc != rc)
                x++;
        return qeth_ipa_rc_msg[x].msg;
@@ -270,9 +269,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = {
 char *qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd)
 {
        int x = 0;
-       qeth_ipa_cmd_names[
-               sizeof(qeth_ipa_cmd_names) /
-                       sizeof(struct ipa_cmd_names)-1].cmd = cmd;
+       qeth_ipa_cmd_names[ARRAY_SIZE(qeth_ipa_cmd_names) - 1].cmd = cmd;
        while (qeth_ipa_cmd_names[x].cmd != cmd)
                x++;
        return qeth_ipa_cmd_names[x].name;