mtd: fix build with GCC 14
[openwrt/openwrt.git] / target / linux / generic / backport-6.1 / 811-v6.4-0008-nvmem-cell-drop-global-cell_post_process.patch
1 From 011e40a166fdaa65fb9946b7cd91efec85b70dbb Mon Sep 17 00:00:00 2001
2 From: Michael Walle <michael@walle.cc>
3 Date: Tue, 4 Apr 2023 18:21:27 +0100
4 Subject: [PATCH] nvmem: cell: drop global cell_post_process
5
6 There are no users anymore for the global cell_post_process callback
7 anymore. New users should use proper nvmem layouts.
8
9 Signed-off-by: Michael Walle <michael@walle.cc>
10 Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
11 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
12 Link: https://lore.kernel.org/r/20230404172148.82422-20-srinivas.kandagatla@linaro.org
13 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
14 ---
15 drivers/nvmem/core.c | 9 ---------
16 include/linux/nvmem-provider.h | 2 --
17 2 files changed, 11 deletions(-)
18
19 --- a/drivers/nvmem/core.c
20 +++ b/drivers/nvmem/core.c
21 @@ -39,7 +39,6 @@ struct nvmem_device {
22 unsigned int nkeepout;
23 nvmem_reg_read_t reg_read;
24 nvmem_reg_write_t reg_write;
25 - nvmem_cell_post_process_t cell_post_process;
26 struct gpio_desc *wp_gpio;
27 struct nvmem_layout *layout;
28 void *priv;
29 @@ -903,7 +902,6 @@ struct nvmem_device *nvmem_register(cons
30 nvmem->type = config->type;
31 nvmem->reg_read = config->reg_read;
32 nvmem->reg_write = config->reg_write;
33 - nvmem->cell_post_process = config->cell_post_process;
34 nvmem->keepout = config->keepout;
35 nvmem->nkeepout = config->nkeepout;
36 if (config->of_node)
37 @@ -1575,13 +1573,6 @@ static int __nvmem_cell_read(struct nvme
38 if (rc)
39 return rc;
40 }
41 -
42 - if (nvmem->cell_post_process) {
43 - rc = nvmem->cell_post_process(nvmem->priv, id, index,
44 - cell->offset, buf, cell->bytes);
45 - if (rc)
46 - return rc;
47 - }
48
49 if (len)
50 *len = cell->bytes;
51 --- a/include/linux/nvmem-provider.h
52 +++ b/include/linux/nvmem-provider.h
53 @@ -85,7 +85,6 @@ struct nvmem_cell_info {
54 * @no_of_node: Device should not use the parent's of_node even if it's !NULL.
55 * @reg_read: Callback to read data.
56 * @reg_write: Callback to write data.
57 - * @cell_post_process: Callback for vendor specific post processing of cell data
58 * @size: Device size.
59 * @word_size: Minimum read/write access granularity.
60 * @stride: Minimum read/write access stride.
61 @@ -118,7 +117,6 @@ struct nvmem_config {
62 bool no_of_node;
63 nvmem_reg_read_t reg_read;
64 nvmem_reg_write_t reg_write;
65 - nvmem_cell_post_process_t cell_post_process;
66 int size;
67 int word_size;
68 int stride;