From e021ac7673b73bfb8a74e0f7f57295283f09cd32 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 10 Jun 2021 08:01:58 -0500 Subject: [PATCH] device: remove deprecated DEVICE_INIT/DEVICE_AND_API_INIT macros The macros have been deprecated for 2 releases so remove the code associated with them. Signed-off-by: Kumar Gala --- doc/releases/release-notes-2.7.rst | 1 + include/device.h | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/doc/releases/release-notes-2.7.rst b/doc/releases/release-notes-2.7.rst index a67f6caa6d9..74262c11e7e 100644 --- a/doc/releases/release-notes-2.7.rst +++ b/doc/releases/release-notes-2.7.rst @@ -33,6 +33,7 @@ Changes in this release Removed APIs in this release +* Removed support for the deprecated ``DEVICE_INIT`` and ``DEVICE_AND_API_INIT`` macros. ============================ diff --git a/include/device.h b/include/device.h index 1bb12b423a9..b51f94d1148 100644 --- a/include/device.h +++ b/include/device.h @@ -94,31 +94,6 @@ typedef int16_t device_handle_t; pm_control_fn, \ NULL, NULL, level, prio, NULL) -/** - * @def DEVICE_INIT - * - * @brief Invoke DEVICE_DEFINE() with no power management support (@p - * pm_control_fn) and no API (@p api_ptr). - */ -#define DEVICE_INIT(dev_name, drv_name, init_fn, \ - data_ptr, cfg_ptr, level, prio) \ - __DEPRECATED_MACRO \ - DEVICE_DEFINE(dev_name, drv_name, init_fn, NULL, \ - data_ptr, cfg_ptr, level, prio, NULL) - -/** - * @def DEVICE_AND_API_INIT - * - * @brief Invoke DEVICE_DEFINE() with no power management support (@p - * pm_control_fn). - */ -#define DEVICE_AND_API_INIT(dev_name, drv_name, init_fn, \ - data_ptr, cfg_ptr, level, prio, api_ptr) \ - __DEPRECATED_MACRO \ - DEVICE_DEFINE(dev_name, drv_name, init_fn, \ - NULL, \ - data_ptr, cfg_ptr, level, prio, api_ptr) - /** * @def DEVICE_DEFINE *