From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752746AbbJMJZV (ORCPT ); Tue, 13 Oct 2015 05:25:21 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:36552 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751373AbbJMJZR (ORCPT ); Tue, 13 Oct 2015 05:25:17 -0400 Date: Tue, 13 Oct 2015 10:25:13 +0100 From: Lee Jones To: Charles Keepax Cc: patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, rf@opensource.wolfsonmicro.com, sameo@linux.intel.com Subject: Re: [PATCH v2 6/6] mfd: arizona: use correct type ID for device tree config Message-ID: <20151013092512.GR32409@x1> References: <1443788955-7523-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1443788955-7523-6-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1443788955-7523-6-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 02 Oct 2015, Charles Keepax wrote: > From: Richard Fitzgerald > > In the case of a device tree config the code uses the device ID > from the DT entry to check which codec is required but when storing > the ID into struct arizona it was always using the non-DT SPI device > table to get an ID. > > This patch changes the code to store the correct ID into struct arizona. > > Signed-off-by: Richard Fitzgerald > Acked-by: Lee Jones > Signed-off-by: Charles Keepax > --- > drivers/mfd/arizona-i2c.c | 5 ++--- > drivers/mfd/arizona-spi.c | 5 ++--- > 2 files changed, 4 insertions(+), 6 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c > index 914bdce..4e3afd1 100644 > --- a/drivers/mfd/arizona-i2c.c > +++ b/drivers/mfd/arizona-i2c.c > @@ -56,8 +56,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c, > regmap_config = &wm8998_i2c_regmap; > break; > default: > - dev_err(&i2c->dev, "Unknown device type %ld\n", > - id->driver_data); > + dev_err(&i2c->dev, "Unknown device type %ld\n", type); > return -EINVAL; > } > > @@ -79,7 +78,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c, > return ret; > } > > - arizona->type = id->driver_data; > + arizona->type = type; > arizona->dev = &i2c->dev; > arizona->irq = i2c->irq; > > diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c > index 850a63a..8cffb1c 100644 > --- a/drivers/mfd/arizona-spi.c > +++ b/drivers/mfd/arizona-spi.c > @@ -47,8 +47,7 @@ static int arizona_spi_probe(struct spi_device *spi) > regmap_config = &wm5110_spi_regmap; > break; > default: > - dev_err(&spi->dev, "Unknown device type %ld\n", > - id->driver_data); > + dev_err(&spi->dev, "Unknown device type %ld\n", type); > return -EINVAL; > } > > @@ -70,7 +69,7 @@ static int arizona_spi_probe(struct spi_device *spi) > return ret; > } > > - arizona->type = id->driver_data; > + arizona->type = type; > arizona->dev = &spi->dev; > arizona->irq = spi->irq; > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog