Skip to contentSkip to conversation

iio:adc:ad7124: Convert to generic firmware handling

PATCH In review Jonathan Cameron 4 participants 10 messages Jul 25, 2021 – Nov 28, 2021

Subsystems (2)
lore
Share & tools
lore

Jonathan Cameron

author maintainer
#0 lore raw

cover iio:adc:ad7124: Convert to generic firmware handling

From: Jonathan Cameron <[email protected]>

The fix was something noticed whilst editing adjacent code.

Testing (minimal) done with hacked QEMU and a the device ID checks commented out. The driver handling of channel subnodes could be made more forgiving than it currently is, but this series doesn't attempt to change that and I'd be wary doing so without hardware.

Andy pointed out we had a bunch of this of_ specific stuff still in IIO and it would be good to reduce this. I'm not that bothered about cases tied directly to specific SoCs but for general SPI / I2C devices it would be nice if ACPI uses of PRP0001 worked for all of them and we ensure there are no 'bad' examples for people to base new drivers on.

Jonathan Cameron (2):
iio:adc:ad7124: Parse configuration into correct local config
structure.
iio:adc:ad7124: Convert to fwnode handling of child node parsing.

 drivers/iio/adc/ad7124.c | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)
Signature · 1 line
2.32.0
author maintainer
#1 lore raw

PATCH 1/2 iio:adc:ad7124: Parse configuration into correct local config structure.

From: Jonathan Cameron <[email protected]>

The channel index is used before it's been read from the device tree child node. Move it down a few lines so it reflects the correct setting.

Noticed by inspection, so test appreciated.

Fixes 7b8d045e497a ("iio: adc: ad7124: allow more than 8 channels")
Cc Alexandru Tachici <[email protected]>
---
 drivers/iio/adc/ad7124.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/adc/ad7124.c +2 -1
index e45c600fccc0..b2e49386d7dc 100644
@@ -765,7 +765,6 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
 	st->channels = channels;
 
 	for_each_available_child_of_node(np, child) {
-		cfg = &st->channels[channel].cfg;
 
 		ret = of_property_read_u32(child, "reg", &channel);
 		if (ret)
@@ -778,6 +777,8 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
 			goto err;
 		}
 
+		cfg = &st->channels[channel].cfg;
+
 		ret = of_property_read_u32_array(child, "diff-channels",
 						 ain, 2);
 		if (ret)
Signature · 1 line
2.32.0
author maintainer
#2 lore raw

PATCH 2/2 iio:adc:ad7124: Convert to fwnode handling of child node parsing.

In reply to Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Also use device_get_match_data() rather than of specific variant. These changes enable use of this binding on ACPI platforms via PRP0001. Whilst it's possible no one will ever do so, this is part of a general effort to clear out examples from IIO that might be copied into new drivers.

It may appear that this change drops the check for status = disabled, but in reality it does not because the of property code uses of_get_next_available_child(). This driver may well fail to probe if disabled is ever actually set though due to the need for complete concurrent child nodes. A future series might resolve that restriction.

---
 drivers/iio/adc/ad7124.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)
drivers/iio/adc/ad7124.c +18 -17
index b2e49386d7dc..bbb9830e13c2 100644
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/kfifo.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/property.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 
@@ -733,18 +733,20 @@ static int ad7124_check_chip_id(struct ad7124_state *st)
 	return 0;
 }
 
-static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
-					  struct device_node *np)
+static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
+				       struct device *dev)
 {
 	struct ad7124_state *st = iio_priv(indio_dev);
 	struct ad7124_channel_config *cfg;
 	struct ad7124_channel *channels;
-	struct device_node *child;
+	struct fwnode_handle *child;
 	struct iio_chan_spec *chan;
 	unsigned int ain[2], channel = 0, tmp;
 	int ret;
 
-	st->num_channels = of_get_available_child_count(np);
+	device_for_each_child_node(dev, child)
+		st->num_channels++;
+
 	if (!st->num_channels) {
 		dev_err(indio_dev->dev.parent, "no channel children\n");
 		return -ENODEV;
@@ -764,9 +766,8 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
 	indio_dev->num_channels = st->num_channels;
 	st->channels = channels;
 
-	for_each_available_child_of_node(np, child) {
-
-		ret = of_property_read_u32(child, "reg", &channel);
+	device_for_each_child_node(dev, child) {
+		ret = fwnode_property_read_u32(child, "reg", &channel);
 		if (ret)
 			goto err;
 
@@ -779,8 +780,8 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
 
 		cfg = &st->channels[channel].cfg;
 
-		ret = of_property_read_u32_array(child, "diff-channels",
-						 ain, 2);
+		ret = fwnode_property_read_u32_array(child, "diff-channels",
+						     ain, 2);
 		if (ret)
 			goto err;
 
@@ -788,16 +789,16 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
 		st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) |
 						  AD7124_CHANNEL_AINM(ain[1]);
 
-		cfg->bipolar = of_property_read_bool(child, "bipolar");
+		cfg->bipolar = fwnode_property_read_bool(child, "bipolar");
 
-		ret = of_property_read_u32(child, "adi,reference-select", &tmp);
+		ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp);
 		if (ret)
 			cfg->refsel = AD7124_INT_REF;
 		else
 			cfg->refsel = tmp;
 
-		cfg->buf_positive = of_property_read_bool(child, "adi,buffered-positive");
-		cfg->buf_negative = of_property_read_bool(child, "adi,buffered-negative");
+		cfg->buf_positive = fwnode_property_read_bool(child, "adi,buffered-positive");
+		cfg->buf_negative = fwnode_property_read_bool(child, "adi,buffered-negative");
 
 		chan[channel] = ad7124_channel_template;
 		chan[channel].address = channel;
@@ -808,7 +809,7 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
 
 	return 0;
 err:
-	of_node_put(child);
+	fwnode_handle_put(child);
 
 	return ret;
 }
@@ -875,7 +876,7 @@ static int ad7124_probe(struct spi_device *spi)
 	struct iio_dev *indio_dev;
 	int i, ret;
 
-	info = of_device_get_match_data(&spi->dev);
+	info = device_get_match_data(&spi->dev);
 	if (!info)
 		return -ENODEV;
 
@@ -893,7 +894,7 @@ static int ad7124_probe(struct spi_device *spi)
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &ad7124_info;
 
-	ret = ad7124_of_parse_channel_config(indio_dev, spi->dev.of_node);
+	ret = ad7124_parse_channel_config(indio_dev, &spi->dev);
 	if (ret < 0)
 		return ret;
 
Signature · 1 line
2.32.0
#3 lore raw

Re: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing.

Quoted 9 lines · Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Also use device_get_match_data() rather than of specific variant. These changes enable use of this binding on ACPI platforms via PRP0001. Whilst it's possible no one will ever do so, this is part of a general effort to clear out examples from IIO that might be copied into new drivers.

Quoted 6 lines

It may appear that this change drops the check for status = disabled, but in reality it does not because the of property code uses of_get_next_available_child(). This driver may well fail to probe if disabled is ever actually set though due to the need for complete concurrent child nodes. A future series might resolve that restriction.

Perhaps we need to have

...

drivers/iio/adc/ad7124.c static int ad7124_check_chip_id(struct ad7124_state *st) · line 749

Quoted 3 lines
drivers/iio/adc/ad7124.c +3 -0
+       device_for_each_child_node(dev, child)
+               st->num_channels++;
+

device_get_child_node_count() ?

...

drivers/iio/adc/ad7124.c static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, · line 769

Quoted 2 lines
drivers/iio/adc/ad7124.c +1 -1
-       for_each_available_child_of_node(np, child) {
+       device_for_each_child_node(dev, child) {

Isn't this
fwnode_for_each_available_child_node()
better to use?

...

So the gaps I see are
device_get_available_child_node_count()
and
device_for_each_available_child_node()

Both of them I think are easy to add and avoid possible breakage.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw

Re: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing.

Quoted 19 lines · On Sun, 25 Jul 2021 23:33:12 +0300 Andy Shevchenko <[email protected]>…
Quoted 9 lines · Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Also use device_get_match_data() rather than of specific variant. These changes enable use of this binding on ACPI platforms via PRP0001. Whilst it's possible no one will ever do so, this is part of a general effort to clear out examples from IIO that might be copied into new drivers.

Quoted 6 lines

It may appear that this change drops the check for status = disabled, but in reality it does not because the of property code uses of_get_next_available_child(). This driver may well fail to probe if disabled is ever actually set though due to the need for complete concurrent child nodes. A future series might resolve that restriction.

Perhaps we need to have

Quoted 8 lines

...

drivers/iio/adc/ad7124.c static int ad7124_check_chip_id(struct ad7124_state *st) · line 749

Quoted 3 lines
drivers/iio/adc/ad7124.c +3 -0
+       device_for_each_child_node(dev, child)
+               st->num_channels++;
+  

device_get_child_node_count() ?

Gah. Not sure how I missed that one when looking for it...

Quoted 8 lines

...

drivers/iio/adc/ad7124.c static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, · line 769

Quoted 2 lines
drivers/iio/adc/ad7124.c +1 -1
-       for_each_available_child_of_node(np, child) {
+       device_for_each_child_node(dev, child) {  

Isn't this
fwnode_for_each_available_child_node()
better to use?

Given we would be extracting the fwnode just to call this loop, I'd say no, device version makes more sense..

Quoted 7 lines

...

So the gaps I see are
device_get_available_child_node_count()
and
device_for_each_available_child_node()

Do we then fix the fact that device_for_each_child_node() will call the _available() form for device tree? That seems inconsistent currently and I was assuming that was deliberate...

Jonathan

Quoted 3 lines

Both of them I think are easy to add and avoid possible breakage.

#5 lore raw

Re: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing.

Quoted 3 lines · Jonathan Cameron
Quoted 1 line · On Sun, 25 Jul 2021 23:33:12 +0300 Andy Shevchenko <[email protected]>…

On Sun, Jul 25, 2021 at 8:22 PM Jonathan Cameron <[email protected]> wrote:

...

Quoted 18 lines
Quoted 6 lines

drivers/iio/adc/ad7124.c static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, · line 769

Quoted 2 lines
drivers/iio/adc/ad7124.c +1 -1
-       for_each_available_child_of_node(np, child) {
+       device_for_each_child_node(dev, child) {

Isn't this
fwnode_for_each_available_child_node()
better to use?

Given we would be extracting the fwnode just to call this loop, I'd say no, device version makes more sense..

Quoted 7 lines

...

So the gaps I see are
device_get_available_child_node_count()
and
device_for_each_available_child_node()

Quoted 4 lines

Do we then fix the fact that device_for_each_child_node() will call the _available() form for device tree? That seems inconsistent currently and I was assuming that was deliberate...

I'm not sure I got your point. Mine (see below) is to add the APIs that you want to use as a direct replacement of the corresponding OF counterparts.

Quoted 1 line
Quoted 1 line

Both of them I think are easy to add and avoid possible breakage.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw

Re: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing.

Quoted 26 lines · On Tue, 27 Jul 2021 17:16:07 +0300 Andy Shevchenko <[email protected]>…
Quoted 3 lines · Jonathan Cameron
Quoted 1 line · On Sun, 25 Jul 2021 23:33:12 +0300 Andy Shevchenko <[email protected]>…

On Sun, Jul 25, 2021 at 8:22 PM Jonathan Cameron <[email protected]> wrote:

...

Quoted 18 lines
Quoted 6 lines

drivers/iio/adc/ad7124.c static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, · line 769

Quoted 2 lines
drivers/iio/adc/ad7124.c +1 -1
-       for_each_available_child_of_node(np, child) {
+       device_for_each_child_node(dev, child) {  

Isn't this
fwnode_for_each_available_child_node()
better to use?

Given we would be extracting the fwnode just to call this loop, I'd say no, device version makes more sense..

Quoted 7 lines

...

So the gaps I see are
device_get_available_child_node_count()
and
device_for_each_available_child_node()

Quoted 8 lines
Quoted 4 lines

Do we then fix the fact that device_for_each_child_node() will call the _available() form for device tree? That seems inconsistent currently and I was assuming that was deliberate...

I'm not sure I got your point. Mine (see below) is to add the APIs that you want to use as a direct replacement of the corresponding OF counterparts.

+CC Rafael,

The oddity is that device_for_each_child_node() is a direct replacement of the for_each_available_child_of_node() other than the obvious use of device rather than the of node.

https://elixir.bootlin.com/linux/v5.14-rc3/source/drivers/of/property.c#L939

static struct fwnode_handle * of_fwnode_get_next_child_node(const struct fwnode_handle *fwnode,
struct fwnode_handle *child)

{
	return of_fwnode_handle(of_get_next_available_child(to_of_node(fwnode),
							    to_of_node(child)));
}

So the question becomes whether there is any desire at all to have a version of the device_for_each_child_node() that does not check if it is available or not.

Looks like it goes all the way back. Rafael, any comment on why the available for is used here and whether it makes sense to introduce separate versions for looping over children that cover the _available_ and everything cases?

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/base/property.c?id=8a0662d9ed2968e1186208336a8e1fab3fdfea63

I'm kind of assuming this was deliberate as we don't want to encourage accessing disabled firmware nodes.

Jonathan

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines

Both of them I think are easy to add and avoid possible breakage.

author maintainer
#7 lore raw

Re: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing.

Quoted 34 lines · On Tue, 27 Jul 2021 19:20:13 +0100 Jonathan Cameron…
Quoted 31 lines · On Tue, 27 Jul 2021 17:16:07 +0300 Andy Shevchenko <[email protected]>…
Quoted 3 lines · Jonathan Cameron
Quoted 1 line · On Sun, 25 Jul 2021 23:33:12 +0300 Andy Shevchenko <[email protected]>…

On Sun, Jul 25, 2021 at 8:22 PM Jonathan Cameron <[email protected]> wrote:

...

Quoted 22 lines
Quoted 6 lines

drivers/iio/adc/ad7124.c static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, · line 769

Quoted 2 lines
drivers/iio/adc/ad7124.c +1 -1
-       for_each_available_child_of_node(np, child) {
+       device_for_each_child_node(dev, child) {    

Isn't this
fwnode_for_each_available_child_node()
better to use?

Given we would be extracting the fwnode just to call this loop, I'd say no, device version makes more sense..

Quoted 7 lines

...

So the gaps I see are
device_get_available_child_node_count()
and
device_for_each_available_child_node()

Do we then fix the fact that device_for_each_child_node() will call the _available() form for device tree? That seems inconsistent currently and I was assuming that was deliberate...

Quoted 4 lines
Quoted 3 lines

I'm not sure I got your point. Mine (see below) is to add the APIs that you want to use as a direct replacement of the corresponding OF counterparts.

+CC Rafael,

Rafael, if you have a chance to give input on the questions below it would be much appreciated.

Thanks,

Jonathan

Quoted 36 lines

The oddity is that device_for_each_child_node() is a direct replacement of the for_each_available_child_of_node() other than the obvious use of device rather than the of node.

https://elixir.bootlin.com/linux/v5.14-rc3/source/drivers/of/property.c#L939

static struct fwnode_handle * of_fwnode_get_next_child_node(const struct fwnode_handle *fwnode,
struct fwnode_handle *child)

{
	return of_fwnode_handle(of_get_next_available_child(to_of_node(fwnode),
							    to_of_node(child)));
}

So the question becomes whether there is any desire at all to have a version of the device_for_each_child_node() that does not check if it is available or not.

Looks like it goes all the way back. Rafael, any comment on why the available for is used here and whether it makes sense to introduce separate versions for looping over children that cover the _available_ and everything cases?

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/base/property.c?id=8a0662d9ed2968e1186208336a8e1fab3fdfea63

I'm kind of assuming this was deliberate as we don't want to encourage accessing disabled firmware nodes.

Jonathan

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines

Both of them I think are easy to add and avoid possible breakage.

author maintainer
#8 lore raw

Re: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing.

Quoted 37 lines · On Sun, 15 Aug 2021 17:09:51 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 34 lines · On Tue, 27 Jul 2021 19:20:13 +0100 Jonathan Cameron…
Quoted 31 lines · On Tue, 27 Jul 2021 17:16:07 +0300 Andy Shevchenko <[email protected]>…
Quoted 3 lines · Jonathan Cameron
Quoted 1 line · On Sun, 25 Jul 2021 23:33:12 +0300 Andy Shevchenko <[email protected]>…

On Sun, Jul 25, 2021 at 8:22 PM Jonathan Cameron <[email protected]> wrote:

...

Quoted 22 lines
Quoted 6 lines

drivers/iio/adc/ad7124.c static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, · line 769

Quoted 2 lines
drivers/iio/adc/ad7124.c +1 -1
-       for_each_available_child_of_node(np, child) {
+       device_for_each_child_node(dev, child) {      

Isn't this
fwnode_for_each_available_child_node()
better to use?

Given we would be extracting the fwnode just to call this loop, I'd say no, device version makes more sense..

Quoted 7 lines

...

So the gaps I see are
device_get_available_child_node_count()
and
device_for_each_available_child_node()

Do we then fix the fact that device_for_each_child_node() will call the _available() form for device tree? That seems inconsistent currently and I was assuming that was deliberate...

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines

I'm not sure I got your point. Mine (see below) is to add the APIs that you want to use as a direct replacement of the corresponding OF counterparts.

+CC Rafael,

Rafael, if you have a chance to give input on the questions below it would be much appreciated.

Rafael, if you have a chance to look at this it would be great.

Quoted 42 lines

Thanks,

Jonathan

Quoted 36 lines

The oddity is that device_for_each_child_node() is a direct replacement of the for_each_available_child_of_node() other than the obvious use of device rather than the of node.

https://elixir.bootlin.com/linux/v5.14-rc3/source/drivers/of/property.c#L939

static struct fwnode_handle * of_fwnode_get_next_child_node(const struct fwnode_handle *fwnode,
struct fwnode_handle *child)

{
	return of_fwnode_handle(of_get_next_available_child(to_of_node(fwnode),
							    to_of_node(child)));
}

So the question becomes whether there is any desire at all to have a version of the device_for_each_child_node() that does not check if it is available or not.

Looks like it goes all the way back. Rafael, any comment on why the available for is used here and whether it makes sense to introduce separate versions for looping over children that cover the _available_ and everything cases?

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/base/property.c?id=8a0662d9ed2968e1186208336a8e1fab3fdfea63

I'm kind of assuming this was deliberate as we don't want to encourage accessing disabled firmware nodes.

Jonathan

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines

Both of them I think are easy to add and avoid possible breakage.

#9 lore raw

Re: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing.

Rafael, looking for your input on this.

Just converted it again, having forgotten this patch set was outstanding until I saw the same line of code and it all came back..

Thanks,

Jonathan

Quoted 95 lines · On Sun, 3 Oct 2021 16:45:41 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 37 lines · On Sun, 15 Aug 2021 17:09:51 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 34 lines · On Tue, 27 Jul 2021 19:20:13 +0100 Jonathan Cameron…
Quoted 31 lines · On Tue, 27 Jul 2021 17:16:07 +0300 Andy Shevchenko <[email protected]>…
Quoted 3 lines · Jonathan Cameron
Quoted 1 line · On Sun, 25 Jul 2021 23:33:12 +0300 Andy Shevchenko <[email protected]>…

On Sun, Jul 25, 2021 at 8:22 PM Jonathan Cameron <[email protected]> wrote:

...

Quoted 22 lines
Quoted 6 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-       for_each_available_child_of_node(np, child) {
+       device_for_each_child_node(dev, child) {        

Isn't this
fwnode_for_each_available_child_node()
better to use?

Given we would be extracting the fwnode just to call this loop, I'd say no, device version makes more sense..

Quoted 7 lines

...

So the gaps I see are
device_get_available_child_node_count()
and
device_for_each_available_child_node()

Do we then fix the fact that device_for_each_child_node() will call the _available() form for device tree? That seems inconsistent currently and I was assuming that was deliberate...

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines

I'm not sure I got your point. Mine (see below) is to add the APIs that you want to use as a direct replacement of the corresponding OF counterparts.

+CC Rafael,

Rafael, if you have a chance to give input on the questions below it would be much appreciated.

Rafael, if you have a chance to look at this it would be great.

Quoted 42 lines

Thanks,

Jonathan

Quoted 36 lines

The oddity is that device_for_each_child_node() is a direct replacement of the for_each_available_child_of_node() other than the obvious use of device rather than the of node.

https://elixir.bootlin.com/linux/v5.14-rc3/source/drivers/of/property.c#L939

static struct fwnode_handle * of_fwnode_get_next_child_node(const struct fwnode_handle *fwnode,
struct fwnode_handle *child)

{
	return of_fwnode_handle(of_get_next_available_child(to_of_node(fwnode),
							    to_of_node(child)));
}

So the question becomes whether there is any desire at all to have a version of the device_for_each_child_node() that does not check if it is available or not.

Looks like it goes all the way back. Rafael, any comment on why the available for is used here and whether it makes sense to introduce separate versions for looping over children that cover the _available_ and everything cases?

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/base/property.c?id=8a0662d9ed2968e1186208336a8e1fab3fdfea63

I'm kind of assuming this was deliberate as we don't want to encourage accessing disabled firmware nodes.

Jonathan

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines

Both of them I think are easy to add and avoid possible breakage.