Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 846 → Rev 847

/shark/trunk/drivers/i2c/i2c-core.c
21,7 → 21,7
All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> */
 
/* $Id: i2c-core.c,v 1.5 2004-03-20 12:22:37 giacomo Exp $ */
/* $Id: i2c-core.c,v 1.6 2004-09-13 15:06:15 giacomo Exp $ */
 
#define DEBUG 1 /* needed to pick up the dev_dbg() calls */
 
60,7 → 60,7
static void i2c_adapter_dev_release(struct device *dev)
{
struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
complete(&adap->dev_released);
//complete(&adap->dev_released);
}
 
static struct device_driver i2c_adapter_driver = {
73,7 → 73,7
static void i2c_adapter_class_dev_release(struct class_device *dev)
{
struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
complete(&adap->class_dev_released);
//complete(&adap->class_dev_released);
}
 
static struct class i2c_adapter_class = {
92,7 → 92,7
static void i2c_client_release(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
complete(&client->released);
//complete(&client->released);
}
 
static ssize_t show_client_name(struct device *dev, char *buf)
208,8 → 208,8
}
 
/* clean up the sysfs representation */
init_completion(&adap->dev_released);
init_completion(&adap->class_dev_released);
//init_completion(&adap->dev_released);
//init_completion(&adap->class_dev_released);
class_device_unregister(&adap->class_dev);
device_remove_file(&adap->dev, &dev_attr_name);
device_unregister(&adap->dev);
216,8 → 216,8
list_del(&adap->list);
 
/* wait for sysfs to drop all references */
wait_for_completion(&adap->dev_released);
wait_for_completion(&adap->class_dev_released);
//wait_for_completion(&adap->dev_released);
//wait_for_completion(&adap->class_dev_released);
 
DEB(dev_dbg(&adap->dev, "adapter unregistered\n"));
 
415,11 → 415,11
 
//down(&adapter->clist_lock);
list_del(&client->list);
init_completion(&client->released);
//init_completion(&client->released);
device_remove_file(&client->dev, &dev_attr_client_name);
device_unregister(&client->dev);
//up(&adapter->clist_lock);
wait_for_completion(&client->released);
//wait_for_completion(&client->released);
 
out:
return res;
/shark/trunk/drivers/i2c/i2c-dev.c
426,7 → 426,7
static void release_i2c_dev(struct class_device *dev)
{
struct i2c_dev *i2c_dev = to_i2c_dev(dev);
complete(&i2c_dev->released);
//complete(&i2c_dev->released);
}
 
static struct class i2c_dev_class = {
474,11 → 474,11
if (!i2c_dev)
return -ENODEV;
 
init_completion(&i2c_dev->released);
//init_completion(&i2c_dev->released);
devfs_remove("i2c/%d", i2c_dev->minor);
return_i2c_dev(i2c_dev);
class_device_unregister(&i2c_dev->class_dev);
wait_for_completion(&i2c_dev->released);
//wait_for_completion(&i2c_dev->released);
kfree(i2c_dev);
 
dev_dbg(&adap->dev, "Adapter unregistered\n");