qcacld-3.0: Update hdd_vdev_sync to use device

The hdd_vdev_sync APIs currently use wiphy as a proxy for a PSOC.
However, hdd_psoc_sync has recently moved to keying off of device.
Update the hdd_vdev_sync APIs to match by using device instead of wiphy.

Change-Id: I50d2597fd96a7a09dfa32152b00106b8ee7ab51a
CRs-Fixed: 2392093

core/hdd/inc/wlan_hdd_dsc.h

@@ -37,14 +37,6 @@ void hdd_dsc_init(void);
  */
 void hdd_dsc_deinit(void);
 
-/**
- * hdd_dsc_psoc_from_wiphy() - get dsc psoc from wiphy
- * @wiphy: Pointer to wireless hardware description
- *
- * Return: dsc_psoc on success, NULL on failure
- */
-struct dsc_psoc *hdd_dsc_psoc_from_wiphy(struct wiphy *wiphy);
-
 /**
  * struct hdd_psoc_sync - opaque synchronization handle for a psoc
  */
@@ -208,28 +200,28 @@ struct hdd_vdev_sync;
 
 /**
  * hdd_vdev_sync_create() - create a vdev synchronization context
- * @wiphy: parent wiphy to the vdev
+ * @dev: parent device to the vdev
  * @out_vdev_sync: out parameter for the new synchronization context
  *
  * Return: Errno
  */
 qdf_must_check int
-hdd_vdev_sync_create(struct wiphy *wiphy, struct hdd_vdev_sync **out_vdev_sync);
+hdd_vdev_sync_create(struct device *dev, struct hdd_vdev_sync **out_vdev_sync);
 
 /**
  * hdd_vdev_sync_create_with_trans() - create a vdev synchronization context
- * @wiphy: parent wiphy to the vdev
+ * @dev: parent device to the vdev
  * @out_vdev_sync: out parameter for the new synchronization context
  *
  * For protecting the net_device creation process.
  *
  * Return: Errno
  */
-#define hdd_vdev_sync_create_with_trans(wiphy, out_vdev_sync) \
-	__hdd_vdev_sync_create_with_trans(wiphy, out_vdev_sync, __func__)
+#define hdd_vdev_sync_create_with_trans(dev, out_vdev_sync) \
+	__hdd_vdev_sync_create_with_trans(dev, out_vdev_sync, __func__)
 
 qdf_must_check int
-__hdd_vdev_sync_create_with_trans(struct wiphy *wiphy,
+__hdd_vdev_sync_create_with_trans(struct device *dev,
 				  struct hdd_vdev_sync **out_vdev_sync,
 				  const char *desc);
 

core/hdd/src/wlan_hdd_dsc.c

@@ -374,32 +374,43 @@ static void hdd_vdev_sync_put(struct hdd_vdev_sync *vdev_sync)
 	qdf_mem_zero(vdev_sync, sizeof(*vdev_sync));
 }
 
-int hdd_vdev_sync_create(struct wiphy *wiphy,
+static QDF_STATUS hdd_vdev_dsc_create(struct device *dev,
+				      struct dsc_vdev **out_dsc_vdev)
+{
+	struct hdd_psoc_sync *psoc_sync;
+
+	hdd_psoc_sync_lock_assert();
+
+	psoc_sync = hdd_psoc_sync_lookup(dev);
+	if (!psoc_sync)
+		return QDF_STATUS_E_INVAL;
+
+	return dsc_vdev_create(psoc_sync->dsc_psoc, out_dsc_vdev);
+}
+
+int hdd_vdev_sync_create(struct device *dev,
 			 struct hdd_vdev_sync **out_vdev_sync)
 {
-	QDF_STATUS status;
-	struct dsc_psoc *dsc_psoc;
 	struct hdd_vdev_sync *vdev_sync;
+	QDF_STATUS status;
 
-	QDF_BUG(wiphy);
-	if (!wiphy)
+	QDF_BUG(dev);
+	if (!dev)
 		return -EINVAL;
 
 	QDF_BUG(out_vdev_sync);
 	if (!out_vdev_sync)
 		return -EINVAL;
 
-	dsc_psoc = hdd_dsc_psoc_from_wiphy(wiphy);
-	if (!dsc_psoc)
-		return -EINVAL;
-
 	hdd_vdev_sync_lock();
 	vdev_sync = hdd_vdev_sync_get();
 	hdd_vdev_sync_unlock();
 	if (!vdev_sync)
 		return -ENOMEM;
 
-	status = dsc_vdev_create(dsc_psoc, &vdev_sync->dsc_vdev);
+	hdd_psoc_sync_lock();
+	status = hdd_vdev_dsc_create(dev, &vdev_sync->dsc_vdev);
+	hdd_psoc_sync_unlock();
 	if (QDF_IS_STATUS_ERROR(status))
 		goto sync_put;
 
@@ -415,7 +426,7 @@ sync_put:
 	return qdf_status_to_os_return(status);
 }
 
-int __hdd_vdev_sync_create_with_trans(struct wiphy *wiphy,
+int __hdd_vdev_sync_create_with_trans(struct device *dev,
 				      struct hdd_vdev_sync **out_vdev_sync,
 				      const char *desc)
 {
@@ -423,7 +434,7 @@ int __hdd_vdev_sync_create_with_trans(struct wiphy *wiphy,
 	QDF_STATUS status;
 	int errno;
 
-	errno = hdd_vdev_sync_create(wiphy, &vdev_sync);
+	errno = hdd_vdev_sync_create(dev, &vdev_sync);
 	if (errno)
 		return errno;
 
@@ -595,23 +606,3 @@ void hdd_dsc_deinit(void)
 	hdd_psoc_sync_lock_destroy();
 }
 
-struct dsc_psoc *hdd_dsc_psoc_from_wiphy(struct wiphy *wiphy)
-{
-	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
-	struct hdd_psoc_sync *psoc_sync;
-	struct dsc_psoc *dsc_psoc = NULL;
-
-	if (!hdd_ctx)
-		return NULL;
-
-	hdd_psoc_sync_lock();
-
-	psoc_sync = hdd_psoc_sync_lookup(hdd_ctx->parent_dev);
-	if (psoc_sync)
-		dsc_psoc = psoc_sync->dsc_psoc;
-
-	hdd_psoc_sync_unlock();
-
-	return dsc_psoc;
-}
-

core/hdd/src/wlan_hdd_main.c

@@ -11641,7 +11641,7 @@ static QDF_STATUS hdd_open_adapter_no_trans(struct hdd_context *hdd_ctx,
 
 	QDF_BUG(rtnl_is_locked());
 
-	errno = hdd_vdev_sync_create(hdd_ctx->wiphy, &vdev_sync);
+	errno = hdd_vdev_sync_create(hdd_ctx->parent_dev, &vdev_sync);
 	if (errno)
 		return qdf_status_from_os_return(errno);
 

core/hdd/src/wlan_hdd_p2p.c

@@ -752,7 +752,7 @@ _wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	struct hdd_vdev_sync *vdev_sync;
 	int errno;
 
-	errno = hdd_vdev_sync_create_with_trans(wiphy, &vdev_sync);
+	errno = hdd_vdev_sync_create_with_trans(wiphy_dev(wiphy), &vdev_sync);
 	if (errno)
 		return ERR_PTR(errno);