Skip to contentSkip to conversation

wifi: ath10k: use non devm for nvmem_cell_get

PATCH In review Rosen Penev 2 participants 2 messages Feb 23 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: ath10k: use non devm for nvmem_cell_get

There's absolutely no need to extend the lifetime of cell to post removal of the driver. It's only used in this function.

---
 drivers/net/wireless/ath/ath10k/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +2 -1
index 5c5bd5ef7175..38c5f5f95433 100644
@@ -1981,13 +1981,14 @@ static int ath10k_download_cal_nvmem(struct ath10k *ar, const char *cell_name)
 	size_t len;
 	int ret;
 
-	cell = devm_nvmem_cell_get(ar->dev, cell_name);
+	cell = nvmem_cell_get(ar->dev, cell_name);
 	if (IS_ERR(cell)) {
 		ret = PTR_ERR(cell);
 		return ret;
 	}
 
 	buf = nvmem_cell_read(cell, &len);
+	nvmem_cell_put(cell);
 	if (IS_ERR(buf))
 		return PTR_ERR(buf);
 

--
2.53.0

Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Rosen Penev

There's absolutely no need to extend the lifetime of cell to post removal of the driver. It's only used in this function.

Quoted 28 lines
---
 drivers/net/wireless/ath/ath10k/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +2 -2
index 5c5bd5ef7175..38c5f5f95433 100644
@@ -1981,13 +1981,14 @@ static int ath10k_download_cal_nvmem(struct ath10k *ar, const char *cell_name)
        size_t len;
        int ret;
 
-       cell = devm_nvmem_cell_get(ar->dev, cell_name);
+       cell = nvmem_cell_get(ar->dev, cell_name);
        if (IS_ERR(cell)) {
                ret = PTR_ERR(cell);
                return ret;
        }
 
        buf = nvmem_cell_read(cell, &len);
+       nvmem_cell_put(cell);
        if (IS_ERR(buf))
                return PTR_ERR(buf);
 
--

2.53.0