From c0591c0308686ed0950aa85847d997f12934aff7 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Wed, 27 Feb 2019 16:20:23 -0800 Subject: [PATCH] qcacld-3.0: Rename osif_*_sync_create_with_trans() Rename the osif_*_sync_create_with_trans() to a slightly more appropriate osid_*_sync_create_and_trans(), to help convey the fact that the transition does not end when the function returns. Change-Id: I5606fb613d786d65de773dae49fe8ad431b5342f CRs-Fixed: 2406713 --- core/hdd/src/wlan_hdd_driver_ops.c | 2 +- core/hdd/src/wlan_hdd_p2p.c | 2 +- core/hdd/src/wlan_hdd_sap_cond_chan_switch.c | 4 ++-- os_if/nan/src/os_if_nan.c | 2 +- os_if/sync/inc/osif_psoc_sync.h | 12 ++++++------ os_if/sync/inc/osif_vdev_sync.h | 12 ++++++------ os_if/sync/src/osif_psoc_sync.c | 6 +++--- os_if/sync/src/osif_vdev_sync.c | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 9738195f9761..337880430492 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -459,7 +459,7 @@ static int hdd_soc_probe(struct device *dev, hdd_info("probing driver"); - errno = osif_psoc_sync_create_with_trans(dsc_driver, &psoc_sync); + errno = osif_psoc_sync_create_and_trans(dsc_driver, &psoc_sync); if (errno) return errno; diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 11b0adbe4e30..909593fbb714 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -769,7 +769,7 @@ _wlan_hdd_add_virtual_intf(struct wiphy *wiphy, struct osif_vdev_sync *vdev_sync; int errno; - errno = osif_vdev_sync_create_with_trans(wiphy_dev(wiphy), &vdev_sync); + errno = osif_vdev_sync_create_and_trans(wiphy_dev(wiphy), &vdev_sync); if (errno) return ERR_PTR(errno); diff --git a/core/hdd/src/wlan_hdd_sap_cond_chan_switch.c b/core/hdd/src/wlan_hdd_sap_cond_chan_switch.c index 4378627abac2..ef71c8f2bea1 100644 --- a/core/hdd/src/wlan_hdd_sap_cond_chan_switch.c +++ b/core/hdd/src/wlan_hdd_sap_cond_chan_switch.c @@ -400,8 +400,8 @@ int wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx, uint8_t channel) struct osif_vdev_sync *vdev_sync; int errno; - errno = osif_vdev_sync_create_with_trans(hdd_ctx->parent_dev, - &vdev_sync); + errno = osif_vdev_sync_create_and_trans(hdd_ctx->parent_dev, + &vdev_sync); if (errno) return errno; diff --git a/os_if/nan/src/os_if_nan.c b/os_if/nan/src/os_if_nan.c index 055248d8bc6b..bd8a404bbed0 100644 --- a/os_if/nan/src/os_if_nan.c +++ b/os_if/nan/src/os_if_nan.c @@ -297,7 +297,7 @@ static int os_if_nan_process_ndi_create(struct wlan_objmgr_psoc *psoc, if (errno) return errno; - errno = osif_vdev_sync_create_with_trans(dev, &vdev_sync); + errno = osif_vdev_sync_create_and_trans(dev, &vdev_sync); if (errno) return errno; diff --git a/os_if/sync/inc/osif_psoc_sync.h b/os_if/sync/inc/osif_psoc_sync.h index f7ec75671fee..38969f912084 100644 --- a/os_if/sync/inc/osif_psoc_sync.h +++ b/os_if/sync/inc/osif_psoc_sync.h @@ -40,7 +40,7 @@ osif_psoc_sync_create(struct dsc_driver *dsc_driver, struct osif_psoc_sync **out_psoc_sync); /** - * osif_psoc_sync_create_with_trans() - create a psoc synchronization context + * osif_psoc_sync_create_and_trans() - create a psoc synchronization context * @dsc_driver: parent dsc_driver to the psoc * @out_psoc_sync: out parameter for the new synchronization context * @@ -48,13 +48,13 @@ osif_psoc_sync_create(struct dsc_driver *dsc_driver, * * Return: Errno */ -#define osif_psoc_sync_create_with_trans(dsc_driver, out_psoc_sync) \ - __osif_psoc_sync_create_with_trans(dsc_driver, out_psoc_sync, __func__) +#define osif_psoc_sync_create_and_trans(dsc_driver, out_psoc_sync) \ + __osif_psoc_sync_create_and_trans(dsc_driver, out_psoc_sync, __func__) qdf_must_check int -__osif_psoc_sync_create_with_trans(struct dsc_driver *dsc_driver, - struct osif_psoc_sync **out_psoc_sync, - const char *desc); +__osif_psoc_sync_create_and_trans(struct dsc_driver *dsc_driver, + struct osif_psoc_sync **out_psoc_sync, + const char *desc); /** * osif_psoc_sync_destroy() - destroy a psoc synchronization context diff --git a/os_if/sync/inc/osif_vdev_sync.h b/os_if/sync/inc/osif_vdev_sync.h index fef5514fc37b..0993cb037e13 100644 --- a/os_if/sync/inc/osif_vdev_sync.h +++ b/os_if/sync/inc/osif_vdev_sync.h @@ -40,7 +40,7 @@ osif_vdev_sync_create(struct device *dev, struct osif_vdev_sync **out_vdev_sync); /** - * osif_vdev_sync_create_with_trans() - create a vdev synchronization context + * osif_vdev_sync_create_and_trans() - create a vdev synchronization context * @dev: parent device to the vdev * @out_vdev_sync: out parameter for the new synchronization context * @@ -48,13 +48,13 @@ osif_vdev_sync_create(struct device *dev, * * Return: Errno */ -#define osif_vdev_sync_create_with_trans(dev, out_vdev_sync) \ - __osif_vdev_sync_create_with_trans(dev, out_vdev_sync, __func__) +#define osif_vdev_sync_create_and_trans(dev, out_vdev_sync) \ + __osif_vdev_sync_create_and_trans(dev, out_vdev_sync, __func__) qdf_must_check int -__osif_vdev_sync_create_with_trans(struct device *dev, - struct osif_vdev_sync **out_vdev_sync, - const char *desc); +__osif_vdev_sync_create_and_trans(struct device *dev, + struct osif_vdev_sync **out_vdev_sync, + const char *desc); /** * osif_vdev_sync_destroy() - destroy a vdev synchronization context diff --git a/os_if/sync/src/osif_psoc_sync.c b/os_if/sync/src/osif_psoc_sync.c index 0392b610059f..e889b9111379 100644 --- a/os_if/sync/src/osif_psoc_sync.c +++ b/os_if/sync/src/osif_psoc_sync.c @@ -126,9 +126,9 @@ sync_put: return qdf_status_to_os_return(status); } -int __osif_psoc_sync_create_with_trans(struct dsc_driver *dsc_driver, - struct osif_psoc_sync **out_psoc_sync, - const char *desc) +int __osif_psoc_sync_create_and_trans(struct dsc_driver *dsc_driver, + struct osif_psoc_sync **out_psoc_sync, + const char *desc) { struct osif_psoc_sync *psoc_sync; QDF_STATUS status; diff --git a/os_if/sync/src/osif_vdev_sync.c b/os_if/sync/src/osif_vdev_sync.c index 163a03b68e28..0b5416d5433a 100644 --- a/os_if/sync/src/osif_vdev_sync.c +++ b/os_if/sync/src/osif_vdev_sync.c @@ -125,9 +125,9 @@ sync_put: return qdf_status_to_os_return(status); } -int __osif_vdev_sync_create_with_trans(struct device *dev, - struct osif_vdev_sync **out_vdev_sync, - const char *desc) +int __osif_vdev_sync_create_and_trans(struct device *dev, + struct osif_vdev_sync **out_vdev_sync, + const char *desc) { struct osif_vdev_sync *vdev_sync; QDF_STATUS status;