From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753723AbYEIHU6 (ORCPT ); Fri, 9 May 2008 03:20:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751249AbYEIHUs (ORCPT ); Fri, 9 May 2008 03:20:48 -0400 Received: from nf-out-0910.google.com ([64.233.182.187]:25850 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750939AbYEIHUr (ORCPT ); Fri, 9 May 2008 03:20:47 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type:content-disposition:user-agent; b=kKvO3UsCtDucqQjnu2wII1qLJ2M3nEpHolMltqWwSr5XoFzBjTYgR/3EmTbyto8MEIgeSmrgKuLsHUO2kb2Iuo8+ohoagjCTqmYB3w0rA1TpAWUkioOYJ7t0w3AhvDFsuF5LjCVNZqwfi0yopN/wl4l+QWpPS+AgKAxNcVcxEPs= Date: Fri, 9 May 2008 15:20:29 +0800 From: Dave Young To: khali@linux-fr.org Cc: gregkh@suse.de, i2c@lm-sensors.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] i2c : use class_for_each_device Message-ID: <20080509072029.GA2740@darkstar.te-china.tietoenator.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use class_for_each_device for iteration. Signed-off-by: Dave Young --- drivers/i2c/i2c-core.c | 96 ++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 44 deletions(-) diff -upr a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c --- a/drivers/i2c/i2c-core.c 2008-05-09 13:55:41.000000000 +0800 +++ b/drivers/i2c/i2c-core.c 2008-05-09 14:24:07.000000000 +0800 @@ -35,7 +35,6 @@ #include #include #include -#include #include #include "i2c-core.h" @@ -655,6 +654,16 @@ EXPORT_SYMBOL(i2c_del_adapter); /* ------------------------------------------------------------------------- */ +static int __attach_adapter(struct device *dev, void *data) +{ + struct i2c_adapter *adapter; + struct i2c_driver *driver = data; + + adapter = container_of(dev, struct i2c_adapter, dev); + driver->attach_adapter(adapter); + + return 0; +} /* * An i2c_driver is used with one or more i2c_client (device) nodes to access @@ -696,21 +705,52 @@ int i2c_register_driver(struct module *o pr_debug("i2c-core: driver [%s] registered\n", driver->driver.name); /* legacy drivers scan i2c busses directly */ - if (driver->attach_adapter) { - struct i2c_adapter *adapter; + if (driver->attach_adapter) + class_for_each_device(&i2c_adapter_class, driver, + __attach_adapter); + + mutex_unlock(&core_lock); + return 0; +} +EXPORT_SYMBOL(i2c_register_driver); + +static int __detach_adapter(struct device *dev, void *data) +{ + struct list_head *item2, *_n; + struct i2c_client *client; + struct i2c_adapter *adap; + struct i2c_driver *driver = data; - down(&i2c_adapter_class.sem); - list_for_each_entry(adapter, &i2c_adapter_class.devices, - dev.node) { - driver->attach_adapter(adapter); + /* Have a look at each adapter, if clients of this driver + * are still attached. If so, detach them to be able to + * kill the driver afterwards. + */ + adap = container_of(dev, struct i2c_adapter, dev); + if (driver->detach_adapter) { + if (driver->attach_adapter(adap)) + dev_err(&adap->dev, "detach_adapter failed " + "for driver [%s]\n", + driver->driver.name); + } else { + list_for_each_safe(item2, _n, &adap->clients) { + client = list_entry(item2, struct i2c_client, + list); + if (client->driver != driver) + continue; + dev_dbg(&adap->dev, "detaching client [%s] " + "at 0x%02x\n", client->name, + client->addr); + if (driver->detach_client(client)) { + dev_err(&adap->dev, "detach_client " + "failed for client [%s] at " + "0x%02x\n", client->name, + client->addr); + } } - up(&i2c_adapter_class.sem); } - mutex_unlock(&core_lock); return 0; } -EXPORT_SYMBOL(i2c_register_driver); /** * i2c_del_driver - unregister I2C driver @@ -719,46 +759,14 @@ EXPORT_SYMBOL(i2c_register_driver); */ void i2c_del_driver(struct i2c_driver *driver) { - struct list_head *item2, *_n; - struct i2c_client *client; - struct i2c_adapter *adap; - mutex_lock(&core_lock); /* new-style driver? */ if (is_newstyle_driver(driver)) goto unregister; - /* Have a look at each adapter, if clients of this driver are still - * attached. If so, detach them to be able to kill the driver - * afterwards. - */ - down(&i2c_adapter_class.sem); - list_for_each_entry(adap, &i2c_adapter_class.devices, dev.node) { - if (driver->detach_adapter) { - if (driver->detach_adapter(adap)) { - dev_err(&adap->dev, "detach_adapter failed " - "for driver [%s]\n", - driver->driver.name); - } - } else { - list_for_each_safe(item2, _n, &adap->clients) { - client = list_entry(item2, struct i2c_client, list); - if (client->driver != driver) - continue; - dev_dbg(&adap->dev, "detaching client [%s] " - "at 0x%02x\n", client->name, - client->addr); - if (driver->detach_client(client)) { - dev_err(&adap->dev, "detach_client " - "failed for client [%s] at " - "0x%02x\n", client->name, - client->addr); - } - } - } - } - up(&i2c_adapter_class.sem); + class_for_each_device(&i2c_adapter_class, driver, + __detach_adapter); unregister: driver_unregister(&driver->driver);