kernel: bump 5.10 to 5.10.169

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 813-v6.3-0002-nvmem-core-add-an-index-parameter-to-the-cell.patch

diff --git a/target/linux/generic/backport-5.10/813-v6.3-0002-nvmem-core-add-an-index-parameter-to-the-cell.patch b/target/linux/generic/backport-5.10/813-v6.3-0002-nvmem-core-add-an-index-parameter-to-the-cell.patch
index b51208559845442a35b9e0ee3aa6acf2ee1c754b..454d3bf0ed1a4b31fa601c51903700b23f944b63 100644 (file)
--- a/target/linux/generic/backport-5.10/813-v6.3-0002-nvmem-core-add-an-index-parameter-to-the-cell.patch
+++ b/target/linux/generic/backport-5.10/813-v6.3-0002-nvmem-core-add-an-index-parameter-to-the-cell.patch
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  };
  
  static DEFINE_MUTEX(nvmem_mutex);
-@@ -1127,7 +1128,8 @@ struct nvmem_device *devm_nvmem_device_g
+@@ -1122,7 +1123,8 @@ struct nvmem_device *devm_nvmem_device_g
  }
  EXPORT_SYMBOL_GPL(devm_nvmem_device_get);
  
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
        struct nvmem_cell *cell;
        const char *name = NULL;
-@@ -1146,6 +1148,7 @@ static struct nvmem_cell *nvmem_create_c
+@@ -1141,6 +1143,7 @@ static struct nvmem_cell *nvmem_create_c
  
        cell->id = name;
        cell->entry = entry;
@@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        return cell;
  }
-@@ -1184,7 +1187,7 @@ nvmem_cell_get_from_lookup(struct device
+@@ -1179,7 +1182,7 @@ nvmem_cell_get_from_lookup(struct device
                                __nvmem_device_put(nvmem);
                                cell = ERR_PTR(-ENOENT);
                        } else {
@@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                                if (IS_ERR(cell))
                                        __nvmem_device_put(nvmem);
                        }
-@@ -1232,15 +1235,27 @@ struct nvmem_cell *of_nvmem_cell_get(str
+@@ -1227,15 +1230,27 @@ struct nvmem_cell *of_nvmem_cell_get(str
        struct nvmem_device *nvmem;
        struct nvmem_cell_entry *cell_entry;
        struct nvmem_cell *cell;
@@ -105,7 +105,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        nvmem_np = of_get_parent(cell_np);
        if (!nvmem_np) {
-@@ -1262,7 +1277,7 @@ struct nvmem_cell *of_nvmem_cell_get(str
+@@ -1257,7 +1272,7 @@ struct nvmem_cell *of_nvmem_cell_get(str
                return ERR_PTR(-ENOENT);
        }
  
@@ -114,7 +114,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (IS_ERR(cell))
                __nvmem_device_put(nvmem);
  
-@@ -1415,8 +1430,8 @@ static void nvmem_shift_read_buffer_in_p
+@@ -1410,8 +1425,8 @@ static void nvmem_shift_read_buffer_in_p
  }
  
  static int __nvmem_cell_read(struct nvmem_device *nvmem,
@@ -125,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
        int rc;
  
-@@ -1430,7 +1445,7 @@ static int __nvmem_cell_read(struct nvme
+@@ -1425,7 +1440,7 @@ static int __nvmem_cell_read(struct nvme
                nvmem_shift_read_buffer_in_place(cell, buf);
  
        if (nvmem->cell_post_process) {
@@ -134,7 +134,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                                              cell->offset, buf, cell->bytes);
                if (rc)
                        return rc;
-@@ -1465,7 +1480,7 @@ void *nvmem_cell_read(struct nvmem_cell
+@@ -1460,7 +1475,7 @@ void *nvmem_cell_read(struct nvmem_cell
        if (!buf)
                return ERR_PTR(-ENOMEM);
  
@@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (rc) {
                kfree(buf);
                return ERR_PTR(rc);
-@@ -1778,7 +1793,7 @@ ssize_t nvmem_device_cell_read(struct nv
+@@ -1773,7 +1788,7 @@ ssize_t nvmem_device_cell_read(struct nv
        if (rc)
                return rc;