change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/iio/light/bh1780.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * ROHM 1780GLI Ambient Light Sensor Driver
3
4
  *
..
..
@@ -12,7 +13,7 @@
12
13
 #include <linux/platform_device.h>
13
14
 #include <linux/delay.h>
14
15
 #include <linux/module.h>
15
-#include <linux/of.h>
16
+#include <linux/mod_devicetable.h>
16
17
 #include <linux/pm_runtime.h>
17
18
 #include <linux/iio/iio.h>
18
19
 #include <linux/iio/sysfs.h>
..
..
@@ -145,7 +146,7 @@
145
146
 {
146
147
 	int ret;
147
148
 	struct bh1780_data *bh1780;
148
-	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
149
+	struct i2c_adapter *adapter = client->adapter;
149
150
 	struct iio_dev *indio_dev;
150
151
 
151
152
 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
..
..
@@ -184,7 +185,6 @@
184
185
 	pm_runtime_use_autosuspend(&client->dev);
185
186
 	pm_runtime_put(&client->dev);
186
187
 
187
-	indio_dev->dev.parent = &client->dev;
188
188
 	indio_dev->info = &bh1780_info;
189
189
 	indio_dev->name = "bh1780";
190
190
 	indio_dev->channels = bh1780_channels;
..
..
@@ -272,13 +272,11 @@
272
272
 
273
273
 MODULE_DEVICE_TABLE(i2c, bh1780_id);
274
274
 
275
-#ifdef CONFIG_OF
276
275
 static const struct of_device_id of_bh1780_match[] = {
277
276
 	{ .compatible = "rohm,bh1780gli", },
278
277
 	{},
279
278
 };
280
279
 MODULE_DEVICE_TABLE(of, of_bh1780_match);
281
-#endif
282
280
 
283
281
 static struct i2c_driver bh1780_driver = {
284
282
 	.probe		= bh1780_probe,
..
..
@@ -287,7 +285,7 @@
287
285
 	.driver = {
288
286
 		.name = "bh1780",
289
287
 		.pm = &bh1780_dev_pm_ops,
290
-		.of_match_table = of_match_ptr(of_bh1780_match),
288
+		.of_match_table = of_bh1780_match,
291
289
 	},
292
290
 };
293
291