From: Simon Glass Date: Wed, 30 Nov 2016 22:30:49 +0000 (-0700) Subject: spl: Use a single underscore in the SPL_LOAD_IMAGE_METHOD() macro X-Git-Tag: v2017.01-rc2~33 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0d3b05913140353f8116781dcb82ba9c09ff0bfe;p=u-boot spl: Use a single underscore in the SPL_LOAD_IMAGE_METHOD() macro A double underscore is normally reserved for compiler predefines. Use a single underscore instead. Signed-off-by: Simon Glass --- diff --git a/include/spl.h b/include/spl.h index c727eb76d4..9d221c1b55 100644 --- a/include/spl.h +++ b/include/spl.h @@ -172,15 +172,15 @@ struct spl_image_loader { ll_entry_declare(struct spl_image_loader, __name, spl_image_loader) /* - * __priority is the priority of this method, 0 meaning it will be the top + * _priority is the priority of this method, 0 meaning it will be the top * choice for this device, 9 meaning it is the bottom choice. - * __boot_device is the BOOT_DEVICE_... value - * __method is the load_image function to call + * _boot_device is the BOOT_DEVICE_... value + * _method is the load_image function to call */ -#define SPL_LOAD_IMAGE_METHOD(__priority, __boot_device, __method) \ - SPL_LOAD_IMAGE(__method ## __priority ## __boot_device) = { \ - .boot_device = __boot_device, \ - .load_image = __method, \ +#define SPL_LOAD_IMAGE_METHOD(_priority, _boot_device, _method) \ + SPL_LOAD_IMAGE(_method ## _priority ## _boot_device) = { \ + .boot_device = _boot_device, \ + .load_image = _method, \ } /* SPL FAT image functions */