[Skiboot] [PATCH] ipmi: Use standard MIN() macro definition

Jordan Niethe jniethe5 at gmail.com
Thu Aug 8 16:11:42 AEST 2019


There is a MIN() macro definition in skiboot.h. Remove the redundant
definition from here and use that one.

Signed-off-by: Jordan Niethe <jniethe5 at gmail.com>
---
 hw/ipmi/ipmi-fru.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/ipmi/ipmi-fru.c b/hw/ipmi/ipmi-fru.c
index c66f2e14c458..10f432589772 100644
--- a/hw/ipmi/ipmi-fru.c
+++ b/hw/ipmi/ipmi-fru.c
@@ -33,8 +33,6 @@ struct common_header {
 	u8 checksum;
 } __packed;
 
-#define min(x,y) ((x) < (y) ? x : y)
-
 /* The maximum amount of FRU data we can store. */
 #define FRU_DATA_SIZE 256
 
@@ -220,7 +218,7 @@ static int fru_write(void)
 	/* Three bytes for the actual FRU Data Command */
 	msg->data[WRITE_INDEX] = 0;
 	msg->data[REMAINING] = len;
-	msg->req_size = min(len + 3, IPMI_MAX_REQ_SIZE);
+	msg->req_size = MIN(len + 3, IPMI_MAX_REQ_SIZE);
 	return ipmi_queue_msg(msg);
 }
 
-- 
2.20.1



More information about the Skiboot mailing list