aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Niethe <jniethe5@gmail.com>2019-08-08 16:11:42 +1000
committerOliver O'Halloran <oohall@gmail.com>2019-08-16 15:51:55 +1000
commit851ce56cadff529174ee031e7d528b919a584940 (patch)
tree0b1fb135a8f42e278f9525ea44ce62aea029ffa8
parent41f6c806091627dff980d6d0d96f04f19517394d (diff)
downloadskiboot-851ce56cadff529174ee031e7d528b919a584940.zip
skiboot-851ce56cadff529174ee031e7d528b919a584940.tar.gz
skiboot-851ce56cadff529174ee031e7d528b919a584940.tar.bz2
ipmi: Use standard MIN() macro definition
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@gmail.com> Acked-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
-rw-r--r--hw/ipmi/ipmi-fru.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ipmi/ipmi-fru.c b/hw/ipmi/ipmi-fru.c
index c66f2e1..10f4325 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);
}