Update to FreeBSD head 2017-10-01

Git mirror commit b2f0376b45428f13151d229c5ae9d4d8f74acbd1.

Update #3472.

1 files changed, 20 insertions, 20 deletions

diff --git a/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h b/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h
index 7910f1f3..e9e61557 100644
--- a/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h
@@ -17,65 +17,65 @@
 /** @brief Unique descriptor for the MMCBUS_RETUNE_PAUSE() method */
 extern struct kobjop_desc mmcbus_retune_pause_desc;
 /** @brief A function implementing the MMCBUS_RETUNE_PAUSE() method */
-typedef void mmcbus_retune_pause_t(device_t brdev, device_t reqdev,
+typedef void mmcbus_retune_pause_t(device_t busdev, device_t reqdev,
                                    bool retune);
 
-static __inline void MMCBUS_RETUNE_PAUSE(device_t brdev, device_t reqdev,
+static __inline void MMCBUS_RETUNE_PAUSE(device_t busdev, device_t reqdev,
                                          bool retune)
 {
 	kobjop_t _m;
-	KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_retune_pause);
-	((mmcbus_retune_pause_t *) _m)(brdev, reqdev, retune);
+	KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_retune_pause);
+	((mmcbus_retune_pause_t *) _m)(busdev, reqdev, retune);
 }
 
 /** @brief Unique descriptor for the MMCBUS_RETUNE_UNPAUSE() method */
 extern struct kobjop_desc mmcbus_retune_unpause_desc;
 /** @brief A function implementing the MMCBUS_RETUNE_UNPAUSE() method */
-typedef void mmcbus_retune_unpause_t(device_t brdev, device_t reqdev);
+typedef void mmcbus_retune_unpause_t(device_t busdev, device_t reqdev);
 
-static __inline void MMCBUS_RETUNE_UNPAUSE(device_t brdev, device_t reqdev)
+static __inline void MMCBUS_RETUNE_UNPAUSE(device_t busdev, device_t reqdev)
 {
 	kobjop_t _m;
-	KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_retune_unpause);
-	((mmcbus_retune_unpause_t *) _m)(brdev, reqdev);
+	KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_retune_unpause);
+	((mmcbus_retune_unpause_t *) _m)(busdev, reqdev);
 }
 
 /** @brief Unique descriptor for the MMCBUS_WAIT_FOR_REQUEST() method */
 extern struct kobjop_desc mmcbus_wait_for_request_desc;
 /** @brief A function implementing the MMCBUS_WAIT_FOR_REQUEST() method */
-typedef int mmcbus_wait_for_request_t(device_t brdev, device_t reqdev,
+typedef int mmcbus_wait_for_request_t(device_t busdev, device_t reqdev,
                                       struct mmc_request *req);
 
-static __inline int MMCBUS_WAIT_FOR_REQUEST(device_t brdev, device_t reqdev,
+static __inline int MMCBUS_WAIT_FOR_REQUEST(device_t busdev, device_t reqdev,
                                             struct mmc_request *req)
 {
 	kobjop_t _m;
-	KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_wait_for_request);
-	return ((mmcbus_wait_for_request_t *) _m)(brdev, reqdev, req);
+	KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_wait_for_request);
+	return ((mmcbus_wait_for_request_t *) _m)(busdev, reqdev, req);
 }
 
 /** @brief Unique descriptor for the MMCBUS_ACQUIRE_BUS() method */
 extern struct kobjop_desc mmcbus_acquire_bus_desc;
 /** @brief A function implementing the MMCBUS_ACQUIRE_BUS() method */
-typedef int mmcbus_acquire_bus_t(device_t brdev, device_t reqdev);
+typedef int mmcbus_acquire_bus_t(device_t busdev, device_t reqdev);
 
-static __inline int MMCBUS_ACQUIRE_BUS(device_t brdev, device_t reqdev)
+static __inline int MMCBUS_ACQUIRE_BUS(device_t busdev, device_t reqdev)
 {
 	kobjop_t _m;
-	KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_acquire_bus);
-	return ((mmcbus_acquire_bus_t *) _m)(brdev, reqdev);
+	KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_acquire_bus);
+	return ((mmcbus_acquire_bus_t *) _m)(busdev, reqdev);
 }
 
 /** @brief Unique descriptor for the MMCBUS_RELEASE_BUS() method */
 extern struct kobjop_desc mmcbus_release_bus_desc;
 /** @brief A function implementing the MMCBUS_RELEASE_BUS() method */
-typedef int mmcbus_release_bus_t(device_t brdev, device_t reqdev);
+typedef int mmcbus_release_bus_t(device_t busdev, device_t reqdev);
 
-static __inline int MMCBUS_RELEASE_BUS(device_t brdev, device_t reqdev)
+static __inline int MMCBUS_RELEASE_BUS(device_t busdev, device_t reqdev)
 {
 	kobjop_t _m;
-	KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_release_bus);
-	return ((mmcbus_release_bus_t *) _m)(brdev, reqdev);
+	KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_release_bus);
+	return ((mmcbus_release_bus_t *) _m)(busdev, reqdev);
 }
 
 #endif /* _mmcbus_if_h_ */