update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/i2c/muxes/i2c-mux-reg.c
..
..
@@ -1,13 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * I2C multiplexer using a single register
3
4
  *
4
5
  * Copyright 2015 Freescale Semiconductor
5
6
  * York Sun  <yorksun@freescale.com>
6
- *
7
- * This program is free software; you can redistribute it and/or modify it
8
- * under the terms of the GNU General Public License as published by the
9
- * Free Software Foundation; either version 2 of the License, or (at your
10
- * option) any later version.
11
7
  */
12
8
 
13
9
 #include <linux/i2c.h>
..
..
@@ -175,13 +171,9 @@
175
171
 			sizeof(mux->data));
176
172
 	} else {
177
173
 		ret = i2c_mux_reg_probe_dt(mux, pdev);
178
-		if (ret == -EPROBE_DEFER)
179
-			return ret;
180
-
181
-		if (ret < 0) {
182
-			dev_err(&pdev->dev, "Error parsing device tree");
183
-			return ret;
184
-		}
174
+		if (ret < 0)
175
+			return dev_err_probe(&pdev->dev, ret,
176
+					     "Error parsing device tree");
185
177
 	}
186
178
 
187
179
 	parent = i2c_get_adapter(mux->data.parent);
..
..
@@ -191,13 +183,12 @@
191
183
 	if (!mux->data.reg) {
192
184
 		dev_info(&pdev->dev,
193
185
 			"Register not set, using platform resource\n");
194
-		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
195
-		mux->data.reg_size = resource_size(res);
196
-		mux->data.reg = devm_ioremap_resource(&pdev->dev, res);
186
+		mux->data.reg = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
197
187
 		if (IS_ERR(mux->data.reg)) {
198
188
 			ret = PTR_ERR(mux->data.reg);
199
189
 			goto err_put_parent;
200
190
 		}
191
+		mux->data.reg_size = resource_size(res);
201
192
 	}
202
193
 
203
194
 	if (mux->data.reg_size != 4 && mux->data.reg_size != 2 &&