2024-04-25 00:27:20

by Florian Fainelli

Subject: [PATCH v2 3/4] mfd: intel_quark_i2c_gpio: Utilize i2c-designware.h

Rather than open code the i2c_designware string, utilize the newly
defined constant in i2c-designware.h.

Signed-off-by: Florian Fainelli <[email protected]>
---
drivers/mfd/intel_quark_i2c_gpio.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
index 9b9c76bd067b..08e296fc56f3 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -17,6 +17,7 @@
#include <linux/clk-provider.h>
#include <linux/dmi.h>
#include <linux/i2c.h>
+#include <linux/platform_data/i2c-designware.h>
#include <linux/property.h>

/* PCI BAR for register base address */
@@ -30,7 +31,7 @@
#define INTEL_QUARK_IORES_MEM 0
#define INTEL_QUARK_IORES_IRQ 1

-#define INTEL_QUARK_I2C_CONTROLLER_CLK "i2c_designware.0"
+#define INTEL_QUARK_I2C_CONTROLLER_CLK I2C_DESIGNWARE_NAME ".0"

/* The Quark I2C controller source clock */
#define INTEL_QUARK_I2C_CLK_HZ 33000000
@@ -136,7 +137,7 @@ static const struct software_node *intel_quark_gpio_node_group[] = {
static struct mfd_cell intel_quark_mfd_cells[] = {
[MFD_I2C_BAR] = {
.id = MFD_I2C_BAR,
- .name = "i2c_designware",
+ .name = I2C_DESIGNWARE_NAME,
.acpi_match = &intel_quark_acpi_match_i2c,
.num_resources = ARRAY_SIZE(intel_quark_i2c_res),
.resources = intel_quark_i2c_res,
--
2.34.1

2024-04-25 10:01:56

by Andy Shevchenko

Subject: Re: [PATCH v2 3/4] mfd: intel_quark_i2c_gpio: Utilize i2c-designware.h

On Wed, Apr 24, 2024 at 05:26:41PM -0700, Florian Fainelli wrote:
> Rather than open code the i2c_designware string, utilize the newly
> defined constant in i2c-designware.h.

..

> +++ b/drivers/mfd/intel_quark_i2c_gpio.c
> @@ -17,6 +17,7 @@
> #include <linux/clk-provider.h>
> #include <linux/dmi.h>
> #include <linux/i2c.h>

> +#include <linux/platform_data/i2c-designware.h>

Make it a separate group after linux/* ...

> #include <linux/property.h>
>

..here.

..

> -#define INTEL_QUARK_I2C_CONTROLLER_CLK "i2c_designware.0"
> +#define INTEL_QUARK_I2C_CONTROLLER_CLK I2C_DESIGNWARE_NAME ".0"

I'm not fan of this, but I think creating another macro to help with
constant device instance naming might be more cumbersome and overkill.

--
With Best Regards,
Andy Shevchenko