Author: kib
Date: Tue Sep 11 18:31:57 2018
New Revision: 338592
URL: https://svnweb.freebsd.org/changeset/base/338592
Log:
MFC r338433:
Normalize use of semicolon with EFI_TIME_LOCK macros.
Modified:
stable/11/sys/amd64/include/efi.h
stable/11/sys/dev/efidev/efirt.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/amd64/include/efi.h
==============================================================================
--- stable/11/sys/amd64/include/efi.h Tue Sep 11 17:09:16 2018
(r338591)
+++ stable/11/sys/amd64/include/efi.h Tue Sep 11 18:31:57 2018
(r338592)
@@ -48,9 +48,9 @@
#ifdef _KERNEL
#include <isa/rtc.h>
-#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock);
-#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock);
-#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED);
+#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock)
+#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock)
+#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED)
#endif
#endif /* __AMD64_INCLUDE_EFI_H_ */
Modified: stable/11/sys/dev/efidev/efirt.c
==============================================================================
--- stable/11/sys/dev/efidev/efirt.c Tue Sep 11 17:09:16 2018
(r338591)
+++ stable/11/sys/dev/efidev/efirt.c Tue Sep 11 18:31:57 2018
(r338592)
@@ -305,7 +305,7 @@ efi_get_time_locked(struct efi_tm *tm, struct efi_tmca
efi_status status;
int error;
- EFI_TIME_OWNED()
+ EFI_TIME_OWNED();
error = efi_enter();
if (error != 0)
return (error);
@@ -323,7 +323,7 @@ efi_get_time(struct efi_tm *tm)
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
/*
* UEFI spec states that the Capabilities argument to GetTime is
* optional, but some UEFI implementations choke when passed a NULL
@@ -331,7 +331,7 @@ efi_get_time(struct efi_tm *tm)
* to workaround such implementations.
*/
error = efi_get_time_locked(tm, &dummy);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
@@ -343,9 +343,9 @@ efi_get_time_capabilities(struct efi_tmcap *tmcap)
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
error = efi_get_time_locked(&dummy, tmcap);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
@@ -385,9 +385,9 @@ efi_set_time(struct efi_tm *tm)
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
error = efi_set_time_locked(tm);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
