From 289d111efdb8da9ddc98b66f4b20eb7293fa944d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 2 Jul 2019 19:11:25 +0200 Subject: [PATCH] Revert "MFC: r338304" This reverts commit c02d19727f0e58807fbda77045fc60037517731d. --- sys/dev/mmc/mmcbrvar.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h index 502d96208073..c8cf0020e2bf 100644 --- a/sys/dev/mmc/mmcbrvar.h +++ b/sys/dev/mmc/mmcbrvar.h @@ -95,6 +95,7 @@ MMCBR_ACCESSOR(host_ocr, HOST_OCR, int) MMCBR_ACCESSOR(mode, MODE, int) MMCBR_ACCESSOR(ocr, OCR, int) MMCBR_ACCESSOR(power_mode, POWER_MODE, int) +MMCBR_ACCESSOR(retune_req, RETUNE_REQ, int) MMCBR_ACCESSOR(vdd, VDD, int) MMCBR_ACCESSOR(vccq, VCCQ, int) MMCBR_ACCESSOR(caps, CAPS, int) @@ -102,20 +103,6 @@ MMCBR_ACCESSOR(timing, TIMING, int) MMCBR_ACCESSOR(max_data, MAX_DATA, int) MMCBR_ACCESSOR(max_busy_timeout, MAX_BUSY_TIMEOUT, u_int) -static int __inline -mmcbr_get_retune_req(device_t dev) -{ - uintptr_t v; - - if (__predict_false(BUS_READ_IVAR(device_get_parent(dev), dev, - MMCBR_IVAR_RETUNE_REQ, &v) != 0)) - return (retune_req_none); - return ((int)v); -} - -/* - * Convenience wrappers for the mmcbr interface - */ static int __inline mmcbr_update_ios(device_t dev) {