On 05/06/2013 06:44 PM, Jonathan Cameron wrote: > On 04/16/2013 03:37 PM, Jacek Anaszewski wrote: [...] >> diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c >> index af6c320..eb17eca 100644 >> --- a/drivers/iio/magnetometer/ak8975.c >> +++ b/drivers/iio/magnetometer/ak8975.c >> @@ -29,6 +29,7 @@ >> #include <linux/delay.h> >> >> #include <linux/gpio.h> >> +#include <linux/of_gpio.h> >> >> #include <linux/iio/iio.h> >> #include <linux/iio/sysfs.h> >> @@ -384,7 +385,9 @@ static int ak8975_probe(struct i2c_client *client, >> int err; >> >> /* Grab and set up the supplied GPIO. */ >> - if (client->dev.platform_data == NULL) >> + if (client->dev.of_node) >> + eoc_gpio = of_get_gpio(client->dev.of_node, 0); >> + else if (client->dev.platform_data == NULL) >> eoc_gpio = -1; >> else >> eoc_gpio = *(int *)(client->dev.platform_data); Usually this is done in the opposite order. First check for platform_data, then, of_node. Also it probably makes sense to check for -EPROBE_DEFER in the of case. - Lars -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
