Skip to contentSkip to conversation

pinctrl: cs42l43: Tidy up header includes

PATCH In review Charles Keepax 2 participants 4 messages Jan 29, 2024 – Jan 31, 2024

Subsystems (4)
GPIO Pin control Cirrus Logic audio codecs Cirrus logic madera codec drivers
lore
Share & tools
lore

Charles Keepax

author maintainer
#0 lore raw

PATCH v3 1/3 pinctrl: cs42l43: Tidy up header includes

Fixup a couple of incorrect header includes.

Suggested-by Andy Shevchenko <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
Signed-off-by Charles Keepax <[email protected]>

---

No changes since v2.

Thanks,
Charles

 drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/cirrus/pinctrl-cs42l43.c +2 -2
index 012b0a3bad5a..24e21d1e0d06 100644
@@ -5,10 +5,10 @@
 // Copyright (c) 2023 Cirrus Logic, Inc. and
 //                    Cirrus Logic International Semiconductor Ltd.
 
+#include <linux/array_size.h>
 #include <linux/bits.h>
 #include <linux/build_bug.h>
 #include <linux/err.h>
-#include <linux/errno.h>
 #include <linux/gpio/driver.h>
 #include <linux/mfd/cs42l43.h>
 #include <linux/mfd/cs42l43-regs.h>

@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
-#include <linux/string_helpers.h>
+#include <linux/string_choices.h>
 
 #include <linux/pinctrl/consumer.h>
 #include <linux/pinctrl/pinctrl.h>
Signature · 1 line
2.30.2
author maintainer
#1 lore raw

PATCH v3 2/3 pinctrl: cs42l43: Remove some needless inlines

Remove some pointless inline declarations, no reason not to let the compiler decide.

Suggested-by Andy Shevchenko <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
Signed-off-by Charles Keepax <[email protected]>

---

No changes since v2.

Thanks,
Charles

 drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pinctrl/cirrus/pinctrl-cs42l43.c +6 -6
index 24e21d1e0d06..ac3df58bbe95 100644
@@ -276,7 +276,7 @@ static const struct pinmux_ops cs42l43_pin_mux_ops = {
 
 static const unsigned int cs42l43_pin_drv_str_ma[] = { 1, 2, 4, 8, 9, 10, 12, 16 };
 
-static inline int cs42l43_pin_get_drv_str(struct cs42l43_pin *priv, unsigned int pin)
+static int cs42l43_pin_get_drv_str(struct cs42l43_pin *priv, unsigned int pin)
 {
 	const struct cs42l43_pin_data *pdat = cs42l43_pin_pins[pin].drv_data;
 	unsigned int val;

@@ -289,8 +289,8 @@ static inline int cs42l43_pin_get_drv_str(struct cs42l43_pin *priv, unsigned int
 	return cs42l43_pin_drv_str_ma[(val & pdat->mask) >> pdat->shift];
 }
 
-static inline int cs42l43_pin_set_drv_str(struct cs42l43_pin *priv, unsigned int pin,
-					  unsigned int ma)
+static int cs42l43_pin_set_drv_str(struct cs42l43_pin *priv, unsigned int pin,
+				   unsigned int ma)
 {
 	const struct cs42l43_pin_data *pdat = cs42l43_pin_pins[pin].drv_data;
 	int i;

@@ -314,7 +314,7 @@ static inline int cs42l43_pin_set_drv_str(struct cs42l43_pin *priv, unsigned int
 	return -EINVAL;
 }
 
-static inline int cs42l43_pin_get_db(struct cs42l43_pin *priv, unsigned int pin)
+static int cs42l43_pin_get_db(struct cs42l43_pin *priv, unsigned int pin)
 {
 	unsigned int val;
 	int ret;

@@ -332,8 +332,8 @@ static inline int cs42l43_pin_get_db(struct cs42l43_pin *priv, unsigned int pin)
 	return 85; // Debounce is roughly 85uS
 }
 
-static inline int cs42l43_pin_set_db(struct cs42l43_pin *priv, unsigned int pin,
-				     unsigned int us)
+static int cs42l43_pin_set_db(struct cs42l43_pin *priv, unsigned int pin,
+			      unsigned int us)
 {
 	if (pin >= CS42L43_NUM_GPIOS)
 		return -ENOTSUPP;
Signature · 1 line
2.30.2
author maintainer
#2 lore raw

PATCH 3/3 pinctrl: cs42l43: Use str_high_low()

In reply to Charles Keepax

Use str_high_low() rather than open coding.

Suggested-by Andy Shevchenko <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
Signed-off-by Charles Keepax <[email protected]>

---

Changes since v2:
- Added missing brackets in commit message.

Thanks,
Charles

 drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/cirrus/pinctrl-cs42l43.c +1 -1
index ac3df58bbe95..628b60ccc2b0 100644
@@ -490,7 +490,7 @@ static void cs42l43_gpio_set(struct gpio_chip *chip, unsigned int offset, int va
 	int ret;
 
 	dev_dbg(priv->dev, "Setting gpio%d to %s\n",
-		offset + 1, value ? "high" : "low");
+		offset + 1, str_high_low(value));
 
 	ret = pm_runtime_resume_and_get(priv->dev);
 	if (ret) {
Signature · 1 line
2.30.2