ether_addr_copy(msg_addr, addr);
 
        ret_val = ixgbevf_write_msg_read_ack(hw, msgbuf, msgbuf,
-                                            sizeof(msgbuf) / sizeof(u32));
+                                            ARRAY_SIZE(msgbuf));
        if (!ret_val) {
                msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS;
 
        ether_addr_copy(msg_addr, addr);
 
        ret_val = ixgbevf_write_msg_read_ack(hw, msgbuf, msgbuf,
-                                            sizeof(msgbuf) / sizeof(u32));
-
+                                            ARRAY_SIZE(msgbuf));
        msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS;
 
        /* if nacked the address was rejected, use "perm_addr" */
        msgbuf[1] = xcast_mode;
 
        err = ixgbevf_write_msg_read_ack(hw, msgbuf, msgbuf,
-                                        sizeof(msgbuf) / sizeof(u32));
+                                        ARRAY_SIZE(msgbuf));
        if (err)
                return err;
 
        msgbuf[0] |= vlan_on << IXGBE_VT_MSGINFO_SHIFT;
 
        err = ixgbevf_write_msg_read_ack(hw, msgbuf, msgbuf,
-                                        sizeof(msgbuf) / sizeof(u32));
+                                        ARRAY_SIZE(msgbuf));
        if (err)
                goto mbx_err;
 
        msgbuf[1] = max_size;
 
        ret_val = ixgbevf_write_msg_read_ack(hw, msgbuf, msgbuf,
-                                            sizeof(msgbuf) / sizeof(u32));
+                                            ARRAY_SIZE(msgbuf));
        if (ret_val)
                return ret_val;
        if ((msgbuf[0] & IXGBE_VF_SET_LPE) &&
        msg[1] = api;
        msg[2] = 0;
 
-       err = ixgbevf_write_msg_read_ack(hw, msg, msg,
-                                        sizeof(msg) / sizeof(u32));
+       err = ixgbevf_write_msg_read_ack(hw, msg, msg, ARRAY_SIZE(msg));
        if (!err) {
                msg[0] &= ~IXGBE_VT_MSGTYPE_CTS;
 
        msg[0] = IXGBE_VF_GET_QUEUE;
        msg[1] = msg[2] = msg[3] = msg[4] = 0;
 
-       err = ixgbevf_write_msg_read_ack(hw, msg, msg,
-                                        sizeof(msg) / sizeof(u32));
+       err = ixgbevf_write_msg_read_ack(hw, msg, msg, ARRAY_SIZE(msg));
        if (!err) {
                msg[0] &= ~IXGBE_VT_MSGTYPE_CTS;