Commit 1bc7bb89 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Andi Shyti

i2c: designware: Unify the firmware type checks

Instead of asymmetrical checks for the firmware type use
the is_*_node() calls.
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent ebe508e4
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/property.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/swab.h> #include <linux/swab.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -372,14 +373,15 @@ int i2c_dw_fw_parse_and_configure(struct dw_i2c_dev *dev) ...@@ -372,14 +373,15 @@ int i2c_dw_fw_parse_and_configure(struct dw_i2c_dev *dev)
{ {
struct i2c_timings *t = &dev->timings; struct i2c_timings *t = &dev->timings;
struct device *device = dev->dev; struct device *device = dev->dev;
struct fwnode_handle *fwnode = dev_fwnode(device);
i2c_parse_fw_timings(device, t, false); i2c_parse_fw_timings(device, t, false);
i2c_dw_adjust_bus_speed(dev); i2c_dw_adjust_bus_speed(dev);
if (device->of_node) if (is_of_node(fwnode))
i2c_dw_of_configure(device); i2c_dw_of_configure(device);
if (has_acpi_companion(device)) else if (is_acpi_node(fwnode))
i2c_dw_acpi_configure(device); i2c_dw_acpi_configure(device);
return i2c_dw_validate_speed(dev); return i2c_dw_validate_speed(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment