Skip to content

Commit

Permalink
i2c: designware: Unify the firmware type checks
Browse files Browse the repository at this point in the history
Instead of asymmetrical checks for the firmware type use
the is_*_node() calls.

Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
  • Loading branch information
Andy Shevchenko authored and Andi Shyti committed Sep 9, 2024
1 parent ebe508e commit 1bc7bb8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/i2c/busses/i2c-designware-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/pm_runtime.h>
#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/swab.h>
#include <linux/types.h>
Expand Down Expand Up @@ -372,14 +373,15 @@ int i2c_dw_fw_parse_and_configure(struct dw_i2c_dev *dev)
{
struct i2c_timings *t = &dev->timings;
struct device *device = dev->dev;
struct fwnode_handle *fwnode = dev_fwnode(device);

i2c_parse_fw_timings(device, t, false);

i2c_dw_adjust_bus_speed(dev);

if (device->of_node)
if (is_of_node(fwnode))
i2c_dw_of_configure(device);
if (has_acpi_companion(device))
else if (is_acpi_node(fwnode))
i2c_dw_acpi_configure(device);

return i2c_dw_validate_speed(dev);
Expand Down

0 comments on commit 1bc7bb8

Please sign in to comment.