Skip to contentSkip to conversation

net: can: cc770: Simplify parsing DT properties

PATCH In review Rob Herring (Arm) 3 participants 3 messages Aug 28, 2024 – Aug 29, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: can: cc770: Simplify parsing DT properties

Use of the typed property accessors is preferred over of_get_property(). The existing code doesn't work on little endian systems either. Replace the of_get_property() calls with of_property_read_bool() and of_property_read_u32().

---
 drivers/net/can/cc770/cc770_platform.c | 29 ++++++++------------------
 1 file changed, 9 insertions(+), 20 deletions(-)
drivers/net/can/cc770/cc770_platform.c +9 -20
index 13bcfba05f18..9993568154f8 100644
@@ -71,16 +71,9 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 				  struct cc770_priv *priv)
 {
 	struct device_node *np = pdev->dev.of_node;
-	const u32 *prop;
-	int prop_size;
-	u32 clkext;
-
-	prop = of_get_property(np, "bosch,external-clock-frequency",
-			       &prop_size);
-	if (prop && (prop_size ==  sizeof(u32)))
-		clkext = *prop;
-	else
-		clkext = CC770_PLATFORM_CAN_CLOCK; /* default */
+	u32 clkext = CC770_PLATFORM_CAN_CLOCK, clkout = 0;
+
+	of_property_read_u32(np, "bosch,external-clock-frequency", &clkext);
 	priv->can.clock.freq = clkext;
 
 	/* The system clock may not exceed 10 MHz */
@@ -98,7 +91,7 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 	if (of_property_read_bool(np, "bosch,iso-low-speed-mux"))
 		priv->cpu_interface |= CPUIF_MUX;
 
-	if (!of_get_property(np, "bosch,no-comperator-bypass", NULL))
+	if (!of_property_read_bool(np, "bosch,no-comperator-bypass"))
 		priv->bus_config |= BUSCFG_CBY;
 	if (of_property_read_bool(np, "bosch,disconnect-rx0-input"))
 		priv->bus_config |= BUSCFG_DR0;
@@ -109,20 +102,16 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 	if (of_property_read_bool(np, "bosch,polarity-dominant"))
 		priv->bus_config |= BUSCFG_POL;
 
-	prop = of_get_property(np, "bosch,clock-out-frequency", &prop_size);
-	if (prop && (prop_size == sizeof(u32)) && *prop > 0) {
-		u32 cdv = clkext / *prop;
-		int slew;
+	of_property_read_u32(np, "bosch,clock-out-frequency", &clkout);
+	if (clkout > 0) {
+		u32 cdv = clkext / clkout;
+		u32 slew;
 
 		if (cdv > 0 && cdv < 16) {
 			priv->cpu_interface |= CPUIF_CEN;
 			priv->clkout |= (cdv - 1) & CLKOUT_CD_MASK;
 
-			prop = of_get_property(np, "bosch,slew-rate",
-					       &prop_size);
-			if (prop && (prop_size == sizeof(u32))) {
-				slew = *prop;
-			} else {
+			if (of_property_read_u32(np, "bosch,slew-rate", &slew)) {
 				/* Determine default slew rate */
 				slew = (CLKOUT_SL_MASK >>
 					CLKOUT_SL_SHIFT) -
Signature · 1 line
2.45.2
reviewer
#1 lore raw
Quoted 6 lines · Rob Herring (Arm)

Use of the typed property accessors is preferred over of_get_property(). The existing code doesn't work on little endian systems either. Replace the of_get_property() calls with of_property_read_bool() and of_property_read_u32().

...

Quoted 9 lines
drivers/net/can/cc770/cc770_platform.c +0 -1
index 13bcfba05f18..9993568154f8 100644
@@ -71,16 +71,9 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 				  struct cc770_priv *priv)
 {
 	struct device_node *np = pdev->dev.of_node;
-	const u32 *prop;

drivers/net/can/cc770/cc770_platform.c static int cc770_get_of_node_data(struct platform_device *pdev, · line 74

Quoted 10 lines
drivers/net/can/cc770/cc770_platform.c +1 -9
-	int prop_size;
-	u32 clkext;
-
-	prop = of_get_property(np, "bosch,external-clock-frequency",
-			       &prop_size);
-	if (prop && (prop_size ==  sizeof(u32)))
-		clkext = *prop;
-	else
-		clkext = CC770_PLATFORM_CAN_CLOCK; /* default */
+	u32 clkext = CC770_PLATFORM_CAN_CLOCK, clkout = 0;

Marc,

Could you clarify if reverse xmas tree ordering - longest line to shortest
- of local variables is desired for can code? If so, I'm flagging that the above now doesn't follow that scheme.

Quoted 5 lines
drivers/net/can/cc770/cc770_platform.c +2 -0
+
+	of_property_read_u32(np, "bosch,external-clock-frequency", &clkext);
 	priv->can.clock.freq = clkext;
 
 	/* The system clock may not exceed 10 MHz */

...

Quoted 16 lines
drivers/net/can/cc770/cc770_platform.c +4 -4
@@ -109,20 +102,16 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 	if (of_property_read_bool(np, "bosch,polarity-dominant"))
 		priv->bus_config |= BUSCFG_POL;
 
-	prop = of_get_property(np, "bosch,clock-out-frequency", &prop_size);
-	if (prop && (prop_size == sizeof(u32)) && *prop > 0) {
-		u32 cdv = clkext / *prop;
-		int slew;
+	of_property_read_u32(np, "bosch,clock-out-frequency", &clkout);
+	if (clkout > 0) {
+		u32 cdv = clkext / clkout;
+		u32 slew;
 
 		if (cdv > 0 && cdv < 16) {
 			priv->cpu_interface |= CPUIF_CEN;
 			priv->clkout |= (cdv - 1) & CLKOUT_CD_MASK;

drivers/net/can/cc770/cc770_platform.c static int cc770_get_of_node_data(struct platform_device *pdev, · line 117

Quoted 10 lines
drivers/net/can/cc770/cc770_platform.c +1 -5
 
-			prop = of_get_property(np, "bosch,slew-rate",
-					       &prop_size);
-			if (prop && (prop_size == sizeof(u32))) {
-				slew = *prop;
-			} else {
+			if (of_property_read_u32(np, "bosch,slew-rate", &slew)) {
 				/* Determine default slew rate */
 				slew = (CLKOUT_SL_MASK >>
 					CLKOUT_SL_SHIFT) -

Rob,

The next few lines look like this:

					((cdv * clkext - 1) / 8000000);
				if (slew < 0)
					slew = 0;

But slew is now unsigned, so this check will always be false.

Flagged by Smatch and Coccinelle.

#2 lore raw
Quoted 32 lines · Simon Horman
Quoted 6 lines · Rob Herring (Arm)

Use of the typed property accessors is preferred over of_get_property(). The existing code doesn't work on little endian systems either. Replace the of_get_property() calls with of_property_read_bool() and of_property_read_u32().

...

Quoted 9 lines
drivers/net/can/cc770/cc770_platform.c +0 -1
index 13bcfba05f18..9993568154f8 100644
@@ -71,16 +71,9 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 				  struct cc770_priv *priv)
 {
 	struct device_node *np = pdev->dev.of_node;
-	const u32 *prop;

drivers/net/can/cc770/cc770_platform.c static int cc770_get_of_node_data(struct platform_device *pdev, · line 74

Quoted 10 lines
drivers/net/can/cc770/cc770_platform.c +1 -9
-	int prop_size;
-	u32 clkext;
-
-	prop = of_get_property(np, "bosch,external-clock-frequency",
-			       &prop_size);
-	if (prop && (prop_size ==  sizeof(u32)))
-		clkext = *prop;
-	else
-		clkext = CC770_PLATFORM_CAN_CLOCK; /* default */
+	u32 clkext = CC770_PLATFORM_CAN_CLOCK, clkout = 0;

Marc,

Quoted 3 lines

Could you clarify if reverse xmas tree ordering - longest line to shortest
- of local variables is desired for can code? If so, I'm flagging that the above now doesn't follow that scheme.

If you touch the code, and noting speaks against it, please make it reverse xmas.

Quoted 40 lines
Quoted 6 lines
drivers/net/can/cc770/cc770_platform.c +2 -0
+
+	of_property_read_u32(np, "bosch,external-clock-frequency", &clkext);
 	priv->can.clock.freq = clkext;
 
 	/* The system clock may not exceed 10 MHz */

...

Quoted 16 lines
drivers/net/can/cc770/cc770_platform.c +4 -4
@@ -109,20 +102,16 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 	if (of_property_read_bool(np, "bosch,polarity-dominant"))
 		priv->bus_config |= BUSCFG_POL;
 
-	prop = of_get_property(np, "bosch,clock-out-frequency", &prop_size);
-	if (prop && (prop_size == sizeof(u32)) && *prop > 0) {
-		u32 cdv = clkext / *prop;
-		int slew;
+	of_property_read_u32(np, "bosch,clock-out-frequency", &clkout);
+	if (clkout > 0) {
+		u32 cdv = clkext / clkout;
+		u32 slew;
 
 		if (cdv > 0 && cdv < 16) {
 			priv->cpu_interface |= CPUIF_CEN;
 			priv->clkout |= (cdv - 1) & CLKOUT_CD_MASK;

drivers/net/can/cc770/cc770_platform.c static int cc770_get_of_node_data(struct platform_device *pdev, · line 117

Quoted 10 lines
drivers/net/can/cc770/cc770_platform.c +1 -5
 
-			prop = of_get_property(np, "bosch,slew-rate",
-					       &prop_size);
-			if (prop && (prop_size == sizeof(u32))) {
-				slew = *prop;
-			} else {
+			if (of_property_read_u32(np, "bosch,slew-rate", &slew)) {
 				/* Determine default slew rate */
 				slew = (CLKOUT_SL_MASK >>
 					CLKOUT_SL_SHIFT) -

Rob,

The next few lines look like this:

Quoted 7 lines
					((cdv * clkext - 1) / 8000000);
				if (slew < 0)
					slew = 0;

But slew is now unsigned, so this check will always be false.

Flagged by Smatch and Coccinelle.

Good finding.

Thanks,
Marc

Signature · 4 lines
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |