| Message ID | 1342610921-31986-1-git-send-email-broonie@opensource.wolfsonmicro.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
Mark Brown wrote: > > When gpio_request() fails the driver logged the failure but while it'd > try to print an error code in the non-DT case it didn't pass the error > code in so garbage would be logged and in the DT case the error wasn't > logged. > > Further, in the non-DT case the error code was then overwritten with - > EBUSY > depriving the caller of information and breaking automatic probe deferral > pushing back from the GPIO level. Also reformat the non-DT log message > so it's not word wrapped and we can grep for it. > > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> > --- > drivers/spi/spi-s3c64xx.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c > index 999154a0..7258b18 100644 > --- a/drivers/spi/spi-s3c64xx.c > +++ b/drivers/spi/spi-s3c64xx.c > @@ -894,9 +894,9 @@ static int s3c64xx_spi_setup(struct spi_device *spi) > if (!spi_get_ctldata(spi)) { > err = gpio_request(cs->line, dev_name(&spi->dev)); > if (err) { > - dev_err(&spi->dev, "request for slave select gpio " > - "line [%d] failed\n", cs->line); > - err = -EBUSY; > + dev_err(&spi->dev, > + "Failed to get /CS gpio [%d]: %d\n", > + cs->line, err); > goto err_gpio_req; > } > spi_set_ctldata(spi, cs); > @@ -1114,7 +1114,8 @@ static int s3c64xx_spi_parse_dt_gpio(struct > s3c64xx_spi_driver_data *sdd) > > ret = gpio_request(gpio, "spi-bus"); > if (ret) { > - dev_err(dev, "gpio [%d] request failed\n", gpio); > + dev_err(dev, "gpio [%d] request failed: %d\n", > + gpio, ret); > goto free_gpio; > } > } > -- > 1.7.10.4 Mark, thanks for your re-work 3th and 4th patches in this series :-) Looks good to me, applied this series. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 999154a0..7258b18 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -894,9 +894,9 @@ static int s3c64xx_spi_setup(struct spi_device *spi) if (!spi_get_ctldata(spi)) { err = gpio_request(cs->line, dev_name(&spi->dev)); if (err) { - dev_err(&spi->dev, "request for slave select gpio " - "line [%d] failed\n", cs->line); - err = -EBUSY; + dev_err(&spi->dev, + "Failed to get /CS gpio [%d]: %d\n", + cs->line, err); goto err_gpio_req; } spi_set_ctldata(spi, cs); @@ -1114,7 +1114,8 @@ static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd) ret = gpio_request(gpio, "spi-bus"); if (ret) { - dev_err(dev, "gpio [%d] request failed\n", gpio); + dev_err(dev, "gpio [%d] request failed: %d\n", + gpio, ret); goto free_gpio; } }
When gpio_request() fails the driver logged the failure but while it'd try to print an error code in the non-DT case it didn't pass the error code in so garbage would be logged and in the DT case the error wasn't logged. Further, in the non-DT case the error code was then overwritten with -EBUSY depriving the caller of information and breaking automatic probe deferral pushing back from the GPIO level. Also reformat the non-DT log message so it's not word wrapped and we can grep for it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> --- drivers/spi/spi-s3c64xx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)