diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2023-01-18 10:20:58 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-19 18:55:30 -0800 |
| commit | ff31a0c496b8eb6728fdfb8091df50653523aa19 (patch) | |
| tree | 92eb6c65617f3d08cca6d7065ca8422845796727 | |
| parent | 3ef4a8c8963b29813170177899f84ffb93f1a8f1 (diff) | |
| download | lwn-ff31a0c496b8eb6728fdfb8091df50653523aa19.tar.gz lwn-ff31a0c496b8eb6728fdfb8091df50653523aa19.zip | |
net: sfp: use i2c_get_adapter_by_fwnode()
Use the newly introduced i2c_get_adapter_by_fwnode() API, so that we
can retrieve the I2C adapter in a firmware independent manner once we
have the fwnode handle for the adapter.
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/phy/sfp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 83b99d95b278..aa2f7ebbdebc 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -2644,10 +2644,8 @@ static void sfp_cleanup(void *data) static int sfp_i2c_get(struct sfp *sfp) { - struct acpi_handle *acpi_handle; struct fwnode_handle *h; struct i2c_adapter *i2c; - struct device_node *np; int err; h = fwnode_find_reference(dev_fwnode(sfp->dev), "i2c-bus", 0); @@ -2656,16 +2654,7 @@ static int sfp_i2c_get(struct sfp *sfp) return -ENODEV; } - if (is_acpi_device_node(h)) { - acpi_handle = ACPI_HANDLE_FWNODE(h); - i2c = i2c_acpi_find_adapter_by_handle(acpi_handle); - } else if ((np = to_of_node(h)) != NULL) { - i2c = of_find_i2c_adapter_by_node(np); - } else { - err = -EINVAL; - goto put; - } - + i2c = i2c_get_adapter_by_fwnode(h); if (!i2c) { err = -EPROBE_DEFER; goto put; |