Merge branch '14-clean-up-preprocessor-conditions' into 'master'

Resolve "clean up preprocessor conditions"

Closes #14

See merge request be-cem-edl/fec/hardware-modules/fmc!9

drivers/fmc/fmc-eeprom.c

@@ -70,11 +70,11 @@ static void fmc_slot_eeprom_init_default(struct fmc_slot *slot,
 {
 	memset(info, 0, sizeof(*info));
 	fmc_slot_eeprom_init(slot, info, FMC_EEPROM_TYPE_DEFAULT);
-#if KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE
+#if KERNEL_VERSION(4, 6, 0) <= LINUX_VERSION_CODE
+	memcpy(slot->at24_data, &at24_24c02, sizeof(slot->at24_data));
+#else
 	memcpy(&slot->at24_data, &at24_24c02, sizeof(slot->at24_data));
 	slot->at24_data.context = slot;
-#else
-	memcpy(slot->at24_data, &at24_24c02, sizeof(slot->at24_data));
 #endif
 }
 
@@ -287,10 +287,10 @@ int fmc_slot_eeprom_type_set(struct fmc_slot *slot, const char *type)
 
 
 	memset(&i2c_info, 0, sizeof(i2c_info));
-#if KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE
-	memset(&slot->at24_data, 0, sizeof(slot->at24_data));
-#else
+#if KERNEL_VERSION(4, 6, 0) <= LINUX_VERSION_CODE
 	memset(slot->at24_data, 0, sizeof(slot->at24_data));
+#else
+	memset(&slot->at24_data, 0, sizeof(slot->at24_data));
 #endif
 
 	len = (len * 1024) / 8;
@@ -303,7 +303,15 @@ int fmc_slot_eeprom_type_set(struct fmc_slot *slot, const char *type)
 
 	fmc_slot_eeprom_init(slot, &i2c_info, type);
 
-#if KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE
+#if KERNEL_VERSION(4, 6, 0) <= LINUX_VERSION_CODE
+	slot->at24_data[0] = PROPERTY_ENTRY_U32("size", len);
+	slot->at24_data[1] = PROPERTY_ENTRY_U32("pagesize", 1);
+	if (len > 4096) /* 32K 4KiB */
+		slot->at24_data[2] = PROPERTY_ENTRY_U32("address-width", 16);
+
+	dev_dbg(&slot->dev, "%s 0x%x %d\n",
+		i2c_info.type, i2c_info.addr, len);
+#else
 	if (len > 4096) /* 32K 4KiB */
 		slot->at24_data.flags = AT24_FLAG_ADDR16;
 	slot->at24_data.byte_len = len;
@@ -315,14 +323,6 @@ int fmc_slot_eeprom_type_set(struct fmc_slot *slot, const char *type)
 		i2c_info.type, i2c_info.addr,
 		slot->at24_data.byte_len, slot->at24_data.page_size,
 		slot->at24_data.flags);
-#else
-	slot->at24_data[0] = PROPERTY_ENTRY_U32("size", len);
-	slot->at24_data[1] = PROPERTY_ENTRY_U32("pagesize", 1);
-	if (len > 4096) /* 32K 4KiB */
-		slot->at24_data[2] = PROPERTY_ENTRY_U32("address-width", 16);
-
-	dev_dbg(&slot->dev, "%s 0x%x %d\n",
-		i2c_info.type, i2c_info.addr, len);
 #endif
 	return fmc_slot_eeprom_replace(slot, &i2c_info);
 }