Index: head/sys/dev/usb/usb_core.h
===================================================================
--- head/sys/dev/usb/usb_core.h
+++ head/sys/dev/usb/usb_core.h
@@ -58,11 +58,11 @@
 
 /* helper for converting pointers to integers */
 #define	USB_P2U(ptr) \
-  (((const uint8_t *)(ptr)) - ((const uint8_t *)0))
+  ((uintptr_t)(ptr))
 
 /* helper for computing offsets */
 #define	USB_ADD_BYTES(ptr,size) \
-  ((void *)(USB_P2U(ptr) + (size)))
+  ((void *)(__DECONST(char *, (ptr)) + (size)))
 
 /* debug macro */
 #define	USB_ASSERT KASSERT