nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

hwmon: Replace probe_new to probe for Linux6.6

Browse Source 
The probe_new is removed from the Linux 6.6. in
following change:
---
commit 5eb1e6e459cfa025f79c43014f66ff62a55542f1
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    i2c: Drop legacy callback .probe_new()
----

Bug 4346767

Change-Id: Idf90cd0f6536bb4e886467679b71c37f97e009a5
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3007384
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
This commit is contained in:
Laxman Dewangan
2023-10-31 12:52:20 +00:00
committed by mobile promotions
parent 007b4eb4ae
commit c9b1539c37
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -31,6 +31,9 @@ ifeq ($(shell test $(LINUX_VERSION) -ge $(LINUX_VERSION_6_6); echo $$?),0)
# Move probe to DAI Ops. # Move probe to DAI Ops.
export CONFIG_SND_SOC_MOVE_DAI_PROBE_TO_OPS=y export CONFIG_SND_SOC_MOVE_DAI_PROBE_TO_OPS=y
subdir-ccflags-y += -DNV_SND_SOC_DAI_OPS_STRUCT_HAS_PROBE_ARG subdir-ccflags-y += -DNV_SND_SOC_DAI_OPS_STRUCT_HAS_PROBE_ARG
# probe_new is removed from i2c driver structure
subdir-ccflags-y += -DNV_I2C_LEGACY_PROBE_NEW_REMOVED
endif endif
ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y) ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)

4
drivers/hwmon/f75308.c
View File

@@ -1256,7 +1256,11 @@ static struct i2c_driver f75308_driver = {
.of_match_table = of_match_ptr(f75308_match_table), .of_match_table = of_match_ptr(f75308_match_table),
}, },
.detect = f75308_detect, .detect = f75308_detect,
#if defined(NV_I2C_LEGACY_PROBE_NEW_REMOVED)
.probe = f75308_probe,
#else
.probe_new = f75308_probe, .probe_new = f75308_probe,
#endif
.remove = f75308_remove, .remove = f75308_remove,
.address_list = f75308_addr, .address_list = f75308_addr,
.id_table = f75308_id, .id_table = f75308_id,