From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932713AbaLDQ67 (ORCPT ); Thu, 4 Dec 2014 11:58:59 -0500 Received: from cantor2.suse.de ([195.135.220.15]:57803 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932313AbaLDQ66 (ORCPT ); Thu, 4 Dec 2014 11:58:58 -0500 Date: Thu, 04 Dec 2014 17:58:55 +0100 Message-ID: From: Takashi Iwai To: Wolfram Sang Cc: linuxppc-dev@ozlabs.org, Benjamin Herrenschmidt , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [alsa-devel] [RFC 2/2] sound: ppc: keywest: drop using attach adapter In-Reply-To: <1417711313-7257-3-git-send-email-wsa@the-dreams.de> References: <1417711313-7257-1-git-send-email-wsa@the-dreams.de> <1417711313-7257-3-git-send-email-wsa@the-dreams.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.4 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Thu, 4 Dec 2014 17:41:53 +0100, Wolfram Sang wrote: > > As we now have deferred probing, we can use a custom mechanism and > finally get rid of the legacy interface from the i2c core. > > Signed-off-by: Wolfram Sang > --- > sound/ppc/keywest.c | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c > index 0d1c27e911b8..a957f32368fa 100644 > --- a/sound/ppc/keywest.c > +++ b/sound/ppc/keywest.c > @@ -52,7 +52,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter) > return -EINVAL; > > if (strncmp(adapter->name, "mac-io", 6)) > - return 0; /* ignored */ > + return -EINVAL; /* ignored */ > > memset(&info, 0, sizeof(struct i2c_board_info)); > strlcpy(info.type, "keywest", I2C_NAME_SIZE); > @@ -100,7 +100,6 @@ static struct i2c_driver keywest_driver = { > .driver = { > .name = "PMac Keywest Audio", > }, > - .attach_adapter = keywest_attach_adapter, > .probe = keywest_probe, > .remove = keywest_remove, > .id_table = keywest_i2c_id, > @@ -132,16 +131,32 @@ int snd_pmac_tumbler_post_init(void) > /* exported */ > int snd_pmac_keywest_init(struct pmac_keywest *i2c) > { > - int err; > + struct i2c_adapter *adap; > + int err, i = 0; > > if (keywest_ctx) > return -EBUSY; > > + adap = i2c_get_adapter(0); > + if (!adap) > + return -EPROBE_DEFER; > + > keywest_ctx = i2c; > > if ((err = i2c_add_driver(&keywest_driver))) { > snd_printk(KERN_ERR "cannot register keywest i2c driver\n"); > + i2c_put_adapter(adap); > return err; > } > + > + /* We assume Macs have consecutive I2C bus numbers starting at 0 */ > + while (adap) { > + err = keywest_attach_adapter(adap); > + if (!err) > + break; > + i2c_put_adapter(adap); > + adap = i2c_get_adapter(++i); > + } > + > return 0; What if adap is NULL in the last while loop? Isn't it supposed to return an error? thanks, Takashi