diff mbox series

[1/3] i2c: Revert incorrect conversion to use generic helper

Message ID 20190801102026.27312-1-suzuki.poulose@arm.com
State Accepted
Commit 644bf60088955421051e716ab9c8fe7fb7997fd7
Headers show
Series [1/3] i2c: Revert incorrect conversion to use generic helper | expand

Commit Message

Suzuki K Poulose Aug. 1, 2019, 10:20 a.m. UTC 
The patch "drivers: Introduce device lookup variants by ACPI_COMPANION device"
converted an incorrect instance in i2c driver to a new helper. Revert this
change.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>

---
 drivers/i2c/i2c-core-acpi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.21.0

Comments

Greg Kroah-Hartman Aug. 1, 2019, 1:54 p.m. UTC | #1 
On Thu, Aug 01, 2019 at 11:20:24AM +0100, Suzuki K Poulose wrote:
> The patch "drivers: Introduce device lookup variants by ACPI_COMPANION device"

> converted an incorrect instance in i2c driver to a new helper. Revert this

> change.

> 

> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>

> Cc: Wolfram Sang <wsa@the-dreams.de>

> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


Fixes: 00500147cbd3 ("drivers: Introduce device lookup variants by ACPI_COMPANION device")

I'll go add this...
Suzuki K Poulose Aug. 1, 2019, 2:03 p.m. UTC | #2 
On 08/01/2019 02:54 PM, Greg KH wrote:
> On Thu, Aug 01, 2019 at 11:20:24AM +0100, Suzuki K Poulose wrote:

>> The patch "drivers: Introduce device lookup variants by ACPI_COMPANION device"

>> converted an incorrect instance in i2c driver to a new helper. Revert this

>> change.

>>

>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

>> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>

>> Cc: Wolfram Sang <wsa@the-dreams.de>

>> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

> 

> Fixes: 00500147cbd3 ("drivers: Introduce device lookup variants by ACPI_COMPANION device")

> 

> I'll go add this...


Thanks Greg ! Sorry, I thought the commit ids may change in linus's and
thus I referred to the "commit subject"

Cheers
Greg Kroah-Hartman Aug. 1, 2019, 2:05 p.m. UTC | #3 
On Thu, Aug 01, 2019 at 03:03:06PM +0100, Suzuki K Poulose wrote:
> On 08/01/2019 02:54 PM, Greg KH wrote:

> > On Thu, Aug 01, 2019 at 11:20:24AM +0100, Suzuki K Poulose wrote:

> > > The patch "drivers: Introduce device lookup variants by ACPI_COMPANION device"

> > > converted an incorrect instance in i2c driver to a new helper. Revert this

> > > change.

> > > 

> > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

> > > Cc: Mika Westerberg <mika.westerberg@linux.intel.com>

> > > Cc: Wolfram Sang <wsa@the-dreams.de>

> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

> > 

> > Fixes: 00500147cbd3 ("drivers: Introduce device lookup variants by ACPI_COMPANION device")

> > 

> > I'll go add this...

> 

> Thanks Greg ! Sorry, I thought the commit ids may change in linus's and

> thus I referred to the "commit subject"


Once they are in my -next branch, they will not change.

thanks,

greg k-h
diff mbox series

Patch

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index bc80aafb521f..f60f7a95d48e 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -357,7 +357,10 @@  static int i2c_acpi_find_match_adapter(struct device *dev, const void *data)
 
 struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
 {
-	struct device *dev = bus_find_device_by_acpi_dev(&i2c_bus_type, handle);
+	struct device *dev;
+
+	dev = bus_find_device(&i2c_bus_type, NULL, handle,
+			      i2c_acpi_find_match_adapter);
 
 	return dev ? i2c_verify_adapter(dev) : NULL;
 }