nv->firmware_options[1] = BIT_7 | BIT_5;
                        nv->add_firmware_options[0] = BIT_5;
                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
-                       nv->frame_payload_size = __constant_cpu_to_le16(2048);
+                       nv->frame_payload_size = 2048;
                        nv->special_options[1] = BIT_7;
                } else if (IS_QLA2200(ha)) {
                        nv->firmware_options[0] = BIT_2 | BIT_1;
                        nv->firmware_options[1] = BIT_7 | BIT_5;
                        nv->add_firmware_options[0] = BIT_5;
                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
-                       nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                       nv->frame_payload_size = 1024;
                } else if (IS_QLA2100(ha)) {
                        nv->firmware_options[0] = BIT_3 | BIT_1;
                        nv->firmware_options[1] = BIT_5;
-                       nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                       nv->frame_payload_size = 1024;
                }
 
                nv->max_iocb_allocation = __constant_cpu_to_le16(256);
         * are valid.
         */
        if (ia64_platform_is("sn2")) {
-               nv->frame_payload_size = __constant_cpu_to_le16(2048);
+               nv->frame_payload_size = 2048;
                if (IS_QLA23XX(ha))
                        nv->special_options[1] = BIT_7;
        }
                memset(nv, 0, ha->nvram_size);
                nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
                nv->version = __constant_cpu_to_le16(ICB_VERSION);
-               nv->frame_payload_size = __constant_cpu_to_le16(2048);
+               nv->frame_payload_size = 2048;
                nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
                nv->exchange_count = __constant_cpu_to_le16(0);
                nv->hard_address = __constant_cpu_to_le16(124);
                memset(nv, 0, ha->nvram_size);
                nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
                nv->version = __constant_cpu_to_le16(ICB_VERSION);
-               nv->frame_payload_size = __constant_cpu_to_le16(2048);
+               nv->frame_payload_size = 2048;
                nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
                nv->exchange_count = __constant_cpu_to_le16(0);
                nv->port_name[0] = 0x21;