can: sja1000: use cpu endian
Subsystems (3)
PATCH 1/1 can: sja1000: use cpu endian
--- drivers/net/can/sja1000/sja1000_of_platform.c | 26 ++++++++++++------------ 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/net/can/sja1000/sja1000_of_platform.c +13 -13
@@ -97,7 +97,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)struct sja1000_priv *priv;struct resource res;const u32 *prop; -int err, irq, res_size, prop_size; +int err, irq, res_size;void __iomem *base; err =of_address_to_resource (np,0 , &res);
@@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop =of_get_property (np,"nxp,external-clock-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->can.clock.freq = *prop /2 ; + prop =of_get_property (np,"nxp,external-clock-frequency" ,NULL ); +if (prop) + priv->can.clock.freq =be32_to_cpup (prop) /2 ;else priv->can.clock.freq =SJA1000_OFP_CAN_CLOCK ;/* default */ - prop =of_get_property (np,"nxp,tx-output-mode" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= *prop &OCR_MODE_MASK ; + prop =of_get_property (np,"nxp,tx-output-mode" ,NULL ); +if (prop) + priv->ocr |=be32_to_cpup (prop) &OCR_MODE_MASK ;else priv->ocr |=OCR_MODE_NORMAL ;/* default */ - prop =of_get_property (np,"nxp,tx-output-config" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= (*prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; + prop =of_get_property (np,"nxp,tx-output-config" ,NULL ); +if (prop) + priv->ocr |= (be32_to_cpup (prop) <<OCR_TX_SHIFT ) &OCR_TX_MASK ;else priv->ocr |=OCR_TX0_PULLDOWN ;/* default */ - prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + prop =of_get_property (np,"nxp,clock-out-frequency" ,NULL ); +if (prop) { +u32 divider = priv->can.clock.freq *2 /be32_to_cpup (prop);if (divider >1 ) priv->cdr |= divider /2 -1 ;
Signature · 1 line
1.7.2.5
Marc Kleine-Budde
maintainerOn 04/08/2013 03:48 PM, Christoph Fritz wrote:
Please add a patch description to the patch, as some subsystem maintainers don't take patches without it.
What about using of_property_read_u32, instead of open coding it?
Marc
Quoted 59 lines
Signed-off-by Christoph Fritz <[email protected]>--- drivers/net/can/sja1000/sja1000_of_platform.c | 26 ++++++++++++------------ 1 files changed, 13 insertions(+), 13 deletions(-)drivers/net/can/sja1000/sja1000_of_platform.c +13
-13@@ -97,7 +97,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)struct sja1000_priv *priv;struct resource res;const u32 *prop; -int err, irq, res_size, prop_size; +int err, irq, res_size;void __iomem *base; err =of_address_to_resource (np,0 , &res);@@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop =of_get_property (np,"nxp,external-clock-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->can.clock.freq = *prop /2 ; + prop =of_get_property (np,"nxp,external-clock-frequency" ,NULL ); +if (prop) + priv->can.clock.freq =be32_to_cpup (prop) /2 ;else priv->can.clock.freq =SJA1000_OFP_CAN_CLOCK ;/* default */ - prop =of_get_property (np,"nxp,tx-output-mode" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= *prop &OCR_MODE_MASK ; + prop =of_get_property (np,"nxp,tx-output-mode" ,NULL ); +if (prop) + priv->ocr |=be32_to_cpup (prop) &OCR_MODE_MASK ;else priv->ocr |=OCR_MODE_NORMAL ;/* default */ - prop =of_get_property (np,"nxp,tx-output-config" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= (*prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; + prop =of_get_property (np,"nxp,tx-output-config" ,NULL ); +if (prop) + priv->ocr |= (be32_to_cpup (prop) <<OCR_TX_SHIFT ) &OCR_TX_MASK ;else priv->ocr |=OCR_TX0_PULLDOWN ;/* default */ - prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + prop =of_get_property (np,"nxp,clock-out-frequency" ,NULL ); +if (prop) { +u32 divider = priv->can.clock.freq *2 /be32_to_cpup (prop);if (divider >1 ) priv->cdr |= divider /2 -1 ;
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
PATCH v2 1/1 can: sja1000: fix endian on arm
To get correct endian on arm cpus while reading device tree properties, this patch replaces of_get_property() with of_property_read_u32().
--- drivers/net/can/sja1000/sja1000_of_platform.c | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/net/can/sja1000/sja1000_of_platform.c +16 -16
@@ -96,8 +96,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)struct net_device *dev;struct sja1000_priv *priv;struct resource res; -const u32 *prop; -int err, irq, res_size, prop_size; +u32 prop; +int err, irq, res_size;void __iomem *base; err =of_address_to_resource (np,0 , &res);
@@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop =of_get_property (np,"nxp,external-clock-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->can.clock.freq = *prop /2 ; + err =of_property_read_u32 (np,"nxp,external-clock-frequency" , &prop); +if (!err) + priv->can.clock.freq = prop /2 ;else priv->can.clock.freq =SJA1000_OFP_CAN_CLOCK ;/* default */ - prop =of_get_property (np,"nxp,tx-output-mode" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= *prop &OCR_MODE_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-mode" , &prop); +if (!err) + priv->ocr |= prop &OCR_MODE_MASK ;else priv->ocr |=OCR_MODE_NORMAL ;/* default */ - prop =of_get_property (np,"nxp,tx-output-config" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= (*prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-config" , &prop); +if (!err) + priv->ocr |= (prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ;else priv->ocr |=OCR_TX0_PULLDOWN ;/* default */ - prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + err =of_property_read_u32 (np,"nxp,clock-out-frequency" , &prop); +if (!err) { +u32 divider = priv->can.clock.freq *2 / prop;if (divider >1 ) priv->cdr |= divider /2 -1 ;
@@ -168,8 +168,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->cdr |=CDR_CLK_OFF ;/* default */ } - prop =of_get_property (np,"nxp,no-comparator-bypass" ,NULL ); -if (!prop) + err =of_property_read_u32 (np,"nxp,no-comparator-bypass" , &prop); +if (err) priv->cdr |=CDR_CBP ;/* default */ priv->irq_flags =IRQF_SHARED ;
Signature · 1 line
1.7.10.4
Marc Kleine-Budde
maintainerRe: [PATCH v2] can: sja1000: fix endian on arm
Quoted 4 lines · Christoph Fritz
To get correct endian on arm cpus while reading device tree properties, this patch replaces
of_get_property()withof_property_read_u32().Signed-off-by Christoph Fritz <[email protected]>
looks good, one nitpick inline
Quoted 60 lines
--- drivers/net/can/sja1000/sja1000_of_platform.c | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-)drivers/net/can/sja1000/sja1000_of_platform.c +14
-14@@ -96,8 +96,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)struct net_device *dev;struct sja1000_priv *priv;struct resource res; -const u32 *prop; -int err, irq, res_size, prop_size; +u32 prop; +int err, irq, res_size;void __iomem *base; err =of_address_to_resource (np,0 , &res);@@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop =of_get_property (np,"nxp,external-clock-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->can.clock.freq = *prop /2 ; + err =of_property_read_u32 (np,"nxp,external-clock-frequency" , &prop); +if (!err) + priv->can.clock.freq = prop /2 ;else priv->can.clock.freq =SJA1000_OFP_CAN_CLOCK ;/* default */ - prop =of_get_property (np,"nxp,tx-output-mode" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= *prop &OCR_MODE_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-mode" , &prop); +if (!err) + priv->ocr |= prop &OCR_MODE_MASK ;else priv->ocr |=OCR_MODE_NORMAL ;/* default */ - prop =of_get_property (np,"nxp,tx-output-config" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= (*prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-config" , &prop); +if (!err) + priv->ocr |= (prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ;else priv->ocr |=OCR_TX0_PULLDOWN ;/* default */ - prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + err =of_property_read_u32 (np,"nxp,clock-out-frequency" , &prop); +if (!err) { +u32 divider = priv->can.clock.freq *2 / prop;if (divider >1 ) priv->cdr |= divider /2 -1 ;
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 171
Quoted 6 lines
drivers/net/can/sja1000/sja1000_of_platform.c +1
-2@@ -168,8 +168,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->cdr |=CDR_CLK_OFF ;/* default */ } - prop =of_get_property (np,"nxp,no-comparator-bypass" ,NULL ); -if (!prop) + err =of_property_read_u32 (np,"nxp,no-comparator-bypass" , &prop);
What about using of_property_read_bool instead?
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 175
Quoted 5 lines
drivers/net/can/sja1000/sja1000_of_platform.c +1
-0+if (err) priv->cdr |=CDR_CBP ;/* default */ priv->irq_flags =IRQF_SHARED ;
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Re: [PATCH v2] can: sja1000: fix endian on arm
Quoted 18 lines · Marc Kleine-Budde
Quoted 4 lines · Christoph Fritz
To get correct endian on arm cpus while reading device tree properties, this patch replaces
of_get_property()withof_property_read_u32().Signed-off-by Christoph Fritz <[email protected]>looks good, one nitpick inline
Quoted 10 lines
--- drivers/net/can/sja1000/sja1000_of_platform.c | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-)drivers/net/can/sja1000/sja1000_of_platform.c +0
-0@@ -168,8 +168,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->cdr |=CDR_CLK_OFF ;/* default */ }
Quoted 5 lines
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 171
Quoted 3 lines
drivers/net/can/sja1000/sja1000_of_platform.c +1
-2- prop =of_get_property (np,"nxp,no-comparator-bypass" ,NULL ); -if (!prop) + err =of_property_read_u32 (np,"nxp,no-comparator-bypass" , &prop);What about using
of_property_read_boolinstead?
Yeah, that would be better, thanks - let me re-roll this.
Re: [PATCH v3] can: sja1000: fix endian on arm
To get correct endian on arm cpus while reading device tree properties, this patch replaces of_get_property() with of_property_read_u32().
--- drivers/net/can/sja1000/sja1000_of_platform.c | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/net/can/sja1000/sja1000_of_platform.c +15 -16
@@ -96,8 +96,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)struct net_device *dev;struct sja1000_priv *priv;struct resource res; -const u32 *prop; -int err, irq, res_size, prop_size; +u32 prop; +int err, irq, res_size;void __iomem *base; err =of_address_to_resource (np,0 , &res);
@@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop =of_get_property (np,"nxp,external-clock-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->can.clock.freq = *prop /2 ; + err =of_property_read_u32 (np,"nxp,external-clock-frequency" , &prop); +if (!err) + priv->can.clock.freq = prop /2 ;else priv->can.clock.freq =SJA1000_OFP_CAN_CLOCK ;/* default */ - prop =of_get_property (np,"nxp,tx-output-mode" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= *prop &OCR_MODE_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-mode" , &prop); +if (!err) + priv->ocr |= prop &OCR_MODE_MASK ;else priv->ocr |=OCR_MODE_NORMAL ;/* default */ - prop =of_get_property (np,"nxp,tx-output-config" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= (*prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-config" , &prop); +if (!err) + priv->ocr |= (prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ;else priv->ocr |=OCR_TX0_PULLDOWN ;/* default */ - prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + err =of_property_read_u32 (np,"nxp,clock-out-frequency" , &prop); +if (!err) { +u32 divider = priv->can.clock.freq *2 / prop;if (divider >1 ) priv->cdr |= divider /2 -1 ;
@@ -168,8 +168,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->cdr |=CDR_CLK_OFF ;/* default */ } - prop =of_get_property (np,"nxp,no-comparator-bypass" ,NULL ); -if (!prop) +if (!of_property_read_bool (np,"nxp,no-comparator-bypass" )) priv->cdr |=CDR_CBP ;/* default */ priv->irq_flags =IRQF_SHARED ;
Signature · 1 line
1.7.10.4
Marc Kleine-Budde
maintainerRe: [PATCH v3] can: sja1000: fix endian on arm
Quoted 4 lines · Christoph Fritz
To get correct endian on arm cpus while reading device tree properties, this patch replaces
of_get_property()withof_property_read_u32().Signed-off-by Christoph Fritz <[email protected]>
[...]
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 160
Quoted 5 lines
drivers/net/can/sja1000/sja1000_of_platform.c +2
-3- prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + err =of_property_read_u32 (np,"nxp,clock-out-frequency" , &prop); +if (!err) {
What about checking for "prop != 0" as the original code does?
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 161
Quoted 1 line
drivers/net/can/sja1000/sja1000_of_platform.c +1
-0+u32 divider = priv->can.clock.freq *2 / prop;
To prevent a potential div-by-zero here?
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Re: [PATCH v4] can: sja1000: fix endian on arm
To get correct endian on arm cpus while reading device tree properties, this patch replaces of_get_property() with of_property_read_u32().
--- drivers/net/can/sja1000/sja1000_of_platform.c | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/net/can/sja1000/sja1000_of_platform.c +15 -16
@@ -96,8 +96,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)struct net_device *dev;struct sja1000_priv *priv;struct resource res; -const u32 *prop; -int err, irq, res_size, prop_size; +u32 prop; +int err, irq, res_size;void __iomem *base; err =of_address_to_resource (np,0 , &res);
@@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop =of_get_property (np,"nxp,external-clock-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->can.clock.freq = *prop /2 ; + err =of_property_read_u32 (np,"nxp,external-clock-frequency" , &prop); +if (!err && prop !=0 ) + priv->can.clock.freq = prop /2 ;else priv->can.clock.freq =SJA1000_OFP_CAN_CLOCK ;/* default */ - prop =of_get_property (np,"nxp,tx-output-mode" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= *prop &OCR_MODE_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-mode" , &prop); +if (!err) + priv->ocr |= prop &OCR_MODE_MASK ;else priv->ocr |=OCR_MODE_NORMAL ;/* default */ - prop =of_get_property (np,"nxp,tx-output-config" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= (*prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-config" , &prop); +if (!err) + priv->ocr |= (prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ;else priv->ocr |=OCR_TX0_PULLDOWN ;/* default */ - prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + err =of_property_read_u32 (np,"nxp,clock-out-frequency" , &prop); +if (!err) { +u32 divider = priv->can.clock.freq *2 / prop;if (divider >1 ) priv->cdr |= divider /2 -1 ;
@@ -168,8 +168,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->cdr |=CDR_CLK_OFF ;/* default */ } - prop =of_get_property (np,"nxp,no-comparator-bypass" ,NULL ); -if (!prop) +if (!of_property_read_bool (np,"nxp,no-comparator-bypass" )) priv->cdr |=CDR_CBP ;/* default */ priv->irq_flags =IRQF_SHARED ;
Signature · 1 line
1.7.10.4
Marc Kleine-Budde
maintainerRe: [PATCH v4] can: sja1000: fix endian on arm
Quoted 24 lines · Christoph Fritz
To get correct endian on arm cpus while reading device tree properties, this patch replaces
of_get_property()withof_property_read_u32().Signed-off-by Christoph Fritz <[email protected]>--- drivers/net/can/sja1000/sja1000_of_platform.c | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-)drivers/net/can/sja1000/sja1000_of_platform.c +2
-2@@ -96,8 +96,8 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)struct net_device *dev;struct sja1000_priv *priv;struct resource res; -const u32 *prop; -int err, irq, res_size, prop_size; +u32 prop; +int err, irq, res_size;void __iomem *base; err =of_address_to_resource (np,0 , &res);
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 143
Quoted 9 lines
drivers/net/can/sja1000/sja1000_of_platform.c +3
-3@@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop =of_get_property (np,"nxp,external-clock-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->can.clock.freq = *prop /2 ; + err =of_property_read_u32 (np,"nxp,external-clock-frequency" , &prop); +if (!err && prop !=0 ) + priv->can.clock.freq = prop /2 ;
No need to check for prop != 0 here....
Quoted 17 lines
drivers/net/can/sja1000/sja1000_of_platform.c +5
-6else priv->can.clock.freq =SJA1000_OFP_CAN_CLOCK ;/* default */ - prop =of_get_property (np,"nxp,tx-output-mode" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= *prop &OCR_MODE_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-mode" , &prop); +if (!err) + priv->ocr |= prop &OCR_MODE_MASK ;else priv->ocr |=OCR_MODE_NORMAL ;/* default */ - prop =of_get_property (np,"nxp,tx-output-config" , &prop_size); -if (prop && (prop_size ==sizeof (u32))) - priv->ocr |= (*prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; + err =of_property_read_u32 (np,"nxp,tx-output-config" , &prop); +if (!err)
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 161
Quoted 10 lines
drivers/net/can/sja1000/sja1000_of_platform.c +4
-3+ priv->ocr |= (prop <<OCR_TX_SHIFT ) &OCR_TX_MASK ; else priv->ocr |= OCR_TX0_PULLDOWN; /* default */ - prop =of_get_property (np,"nxp,clock-out-frequency" , &prop_size); -if (prop && (prop_size ==sizeof (u32)) && *prop) { -u32 divider = priv->can.clock.freq *2 / *prop; + err =of_property_read_u32 (np,"nxp,clock-out-frequency" , &prop); +if (!err) { +u32 divider = priv->can.clock.freq *2 / prop;
....but here, because of the possibility of devide-by-zero.
drivers/net/can/sja1000/sja1000_of_platform.c static int sja1000_ofp_probe(struct platform_device *ofdev) · line 174
Quoted 13 lines
drivers/net/can/sja1000/sja1000_of_platform.c +1
-2if (divider >1 ) priv->cdr |= divider /2 -1 ;@@ -168,8 +168,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->cdr |=CDR_CLK_OFF ;/* default */ } - prop =of_get_property (np,"nxp,no-comparator-bypass" ,NULL ); -if (!prop) +if (!of_property_read_bool (np,"nxp,no-comparator-bypass" )) priv->cdr |=CDR_CBP ;/* default */ priv->irq_flags =IRQF_SHARED ;
No need to resend, I'll fix it while applying.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Marc Kleine-Budde
maintainerRe: [PATCH v4] can: sja1000: fix endian on arm
In reply to Christoph FritzQuoted 4 lines · Christoph Fritz
To get correct endian on arm cpus while reading device tree properties, this patch replaces
of_get_property()withof_property_read_u32().Signed-off-by Christoph Fritz <[email protected]>
I've fixed the potential div-by-zero problem and tweaked the commit message a bit. The patch is included in my latest pull request to david.
Thanks,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |