* [PATCH] nvmem: Convert to using %pOFn instead of device_node.name
@ 2018-10-03 17:47 Srinivas Kandagatla
0 siblings, 0 replies; 4+ messages in thread
From: Srinivas Kandagatla @ 2018-10-03 17:47 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, robh, Srinivas Kandagatla
From: Rob Herring <robh@kernel.org>
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
[srinivas: rebased on top of next]
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
drivers/nvmem/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index cc815bb2eebd..b4c09bc20b67 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -298,6 +298,7 @@ static void nvmem_cell_drop(struct nvmem_cell *cell)
mutex_lock(&nvmem_mutex);
list_del(&cell->node);
mutex_unlock(&nvmem_mutex);
+ kfree(cell->name);
kfree(cell);
}
@@ -547,7 +548,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
cell->nvmem = nvmem;
cell->offset = be32_to_cpup(addr++);
cell->bytes = be32_to_cpup(addr);
- cell->name = child->name;
+ cell->name = kasprintf(GFP_KERNEL, "%pOFn", child);
addr = of_get_property(child, "bits", &len);
if (addr && len == (2 * sizeof(u32))) {
@@ -564,6 +565,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
dev_err(dev, "cell %s unaligned to nvmem stride %d\n",
cell->name, nvmem->stride);
/* Cells already added will be freed later. */
+ kfree(cell->name);
kfree(cell);
return -EINVAL;
}
--
2.19.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] nvmem: Convert to using %pOFn instead of device_node.name
2018-09-28 22:06 ` Rob Herring
@ 2018-10-01 9:05 ` Srinivas Kandagatla
0 siblings, 0 replies; 4+ messages in thread
From: Srinivas Kandagatla @ 2018-10-01 9:05 UTC (permalink / raw)
To: Rob Herring; +Cc: linux-kernel
On 28/09/18 23:06, Rob Herring wrote:
> On Mon, Aug 27, 2018 at 8:55 PM Rob Herring <robh@kernel.org> wrote:
>>
>> In preparation to remove the node name pointer from struct device_node,
>> convert printf users to use the %pOFn format specifier.
>>
>> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>> Signed-off-by: Rob Herring <robh@kernel.org>
>> ---
>> drivers/nvmem/core.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> Ping. This has no dependencies, so please apply.
Sorry, Looks like I missed this one!
I already re-based it. I will send it with other fixes to Greg KH soon!
thanks,
--srini
>
> Rob
>
>>
>> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
>> index aa1657831b70..6988ee9f11ba 100644
>> --- a/drivers/nvmem/core.c
>> +++ b/drivers/nvmem/core.c
>> @@ -304,6 +304,7 @@ static void nvmem_cell_drop(struct nvmem_cell *cell)
>> mutex_lock(&nvmem_cells_mutex);
>> list_del(&cell->node);
>> mutex_unlock(&nvmem_cells_mutex);
>> + kfree(cell->name);
>> kfree(cell);
>> }
>>
>> @@ -879,7 +880,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
>> cell->nvmem = nvmem;
>> cell->offset = be32_to_cpup(addr++);
>> cell->bytes = be32_to_cpup(addr);
>> - cell->name = cell_np->name;
>> + cell->name = kasprintf(GFP_KERNEL, "%pOFn", cell_np);
>>
>> addr = of_get_property(cell_np, "bits", &len);
>> if (addr && len == (2 * sizeof(u32))) {
>> @@ -904,6 +905,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
>> return cell;
>>
>> err_sanity:
>> + kfree(cell->name);
>> kfree(cell);
>>
>> err_mem:
>> --
>> 2.17.1
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] nvmem: Convert to using %pOFn instead of device_node.name
2018-08-28 1:52 ` [PATCH] nvmem: " Rob Herring
@ 2018-09-28 22:06 ` Rob Herring
2018-10-01 9:05 ` Srinivas Kandagatla
0 siblings, 1 reply; 4+ messages in thread
From: Rob Herring @ 2018-09-28 22:06 UTC (permalink / raw)
To: Srinivas Kandagatla; +Cc: linux-kernel
On Mon, Aug 27, 2018 at 8:55 PM Rob Herring <robh@kernel.org> wrote:
>
> In preparation to remove the node name pointer from struct device_node,
> convert printf users to use the %pOFn format specifier.
>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> drivers/nvmem/core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Ping. This has no dependencies, so please apply.
Rob
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index aa1657831b70..6988ee9f11ba 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -304,6 +304,7 @@ static void nvmem_cell_drop(struct nvmem_cell *cell)
> mutex_lock(&nvmem_cells_mutex);
> list_del(&cell->node);
> mutex_unlock(&nvmem_cells_mutex);
> + kfree(cell->name);
> kfree(cell);
> }
>
> @@ -879,7 +880,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
> cell->nvmem = nvmem;
> cell->offset = be32_to_cpup(addr++);
> cell->bytes = be32_to_cpup(addr);
> - cell->name = cell_np->name;
> + cell->name = kasprintf(GFP_KERNEL, "%pOFn", cell_np);
>
> addr = of_get_property(cell_np, "bits", &len);
> if (addr && len == (2 * sizeof(u32))) {
> @@ -904,6 +905,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
> return cell;
>
> err_sanity:
> + kfree(cell->name);
> kfree(cell);
>
> err_mem:
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] nvmem: Convert to using %pOFn instead of device_node.name
2018-08-28 1:52 [PATCH] ARM: omap: " Rob Herring
@ 2018-08-28 1:52 ` Rob Herring
2018-09-28 22:06 ` Rob Herring
0 siblings, 1 reply; 4+ messages in thread
From: Rob Herring @ 2018-08-28 1:52 UTC (permalink / raw)
To: linux-kernel; +Cc: Srinivas Kandagatla
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/nvmem/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index aa1657831b70..6988ee9f11ba 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -304,6 +304,7 @@ static void nvmem_cell_drop(struct nvmem_cell *cell)
mutex_lock(&nvmem_cells_mutex);
list_del(&cell->node);
mutex_unlock(&nvmem_cells_mutex);
+ kfree(cell->name);
kfree(cell);
}
@@ -879,7 +880,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
cell->nvmem = nvmem;
cell->offset = be32_to_cpup(addr++);
cell->bytes = be32_to_cpup(addr);
- cell->name = cell_np->name;
+ cell->name = kasprintf(GFP_KERNEL, "%pOFn", cell_np);
addr = of_get_property(cell_np, "bits", &len);
if (addr && len == (2 * sizeof(u32))) {
@@ -904,6 +905,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
return cell;
err_sanity:
+ kfree(cell->name);
kfree(cell);
err_mem:
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-10-03 17:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-03 17:47 [PATCH] nvmem: Convert to using %pOFn instead of device_node.name Srinivas Kandagatla
-- strict thread matches above, loose matches on Subject: below --
2018-08-28 1:52 [PATCH] ARM: omap: " Rob Herring
2018-08-28 1:52 ` [PATCH] nvmem: " Rob Herring
2018-09-28 22:06 ` Rob Herring
2018-10-01 9:05 ` Srinivas Kandagatla
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.