Skip to content

Commit

Permalink
Revert "driver core: check start node in klist_iter_init_node"
Browse files Browse the repository at this point in the history 
This reverts commit a15d49f as that
patch broke the build.

Cc: Hannes Reinecke <hare@suse.de>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Apr 20, 2012
1 parent 591bfc6 commit 7cd9c9b
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 76 deletions.
46 changes: 17 additions & 29 deletions drivers/base/bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,11 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start,
if (!bus)
return -EINVAL;

error = klist_iter_init_node(&bus->p->klist_devices, &i,
(start ? &start->p->knode_bus : NULL));
if (!error) {
while ((dev = next_device(&i)) && !error)
error = fn(dev, data);
klist_iter_exit(&i);
}
klist_iter_init_node(&bus->p->klist_devices, &i,
(start ? &start->p->knode_bus : NULL));
while ((dev = next_device(&i)) && !error)
error = fn(dev, data);
klist_iter_exit(&i);
return error;
}
EXPORT_SYMBOL_GPL(bus_for_each_dev);
Expand Down Expand Up @@ -332,10 +330,8 @@ struct device *bus_find_device(struct bus_type *bus,
if (!bus)
return NULL;

if (klist_iter_init_node(&bus->p->klist_devices, &i,
(start ? &start->p->knode_bus : NULL)) < 0)
return NULL;

klist_iter_init_node(&bus->p->klist_devices, &i,
(start ? &start->p->knode_bus : NULL));
while ((dev = next_device(&i)))
if (match(dev, data) && get_device(dev))
break;
Expand Down Expand Up @@ -388,9 +384,7 @@ struct device *subsys_find_device_by_id(struct bus_type *subsys, unsigned int id
return NULL;

if (hint) {
if (klist_iter_init_node(&subsys->p->klist_devices, &i,
&hint->p->knode_bus) < 0)
return NULL;
klist_iter_init_node(&subsys->p->klist_devices, &i, &hint->p->knode_bus);
dev = next_device(&i);
if (dev && dev->id == id && get_device(dev)) {
klist_iter_exit(&i);
Expand Down Expand Up @@ -452,13 +446,11 @@ int bus_for_each_drv(struct bus_type *bus, struct device_driver *start,
if (!bus)
return -EINVAL;

error = klist_iter_init_node(&bus->p->klist_drivers, &i,
start ? &start->p->knode_bus : NULL);
if (!error) {
while ((drv = next_driver(&i)) && !error)
error = fn(drv, data);
klist_iter_exit(&i);
}
klist_iter_init_node(&bus->p->klist_drivers, &i,
start ? &start->p->knode_bus : NULL);
while ((drv = next_driver(&i)) && !error)
error = fn(drv, data);
klist_iter_exit(&i);
return error;
}
EXPORT_SYMBOL_GPL(bus_for_each_drv);
Expand Down Expand Up @@ -1119,19 +1111,15 @@ EXPORT_SYMBOL_GPL(bus_sort_breadthfirst);
* otherwise if it is NULL, the iteration starts at the beginning of
* the list.
*/
int subsys_dev_iter_init(struct subsys_dev_iter *iter, struct bus_type *subsys,
struct device *start, const struct device_type *type)
void subsys_dev_iter_init(struct subsys_dev_iter *iter, struct bus_type *subsys,
struct device *start, const struct device_type *type)
{
struct klist_node *start_knode = NULL;
int error;

if (start)
start_knode = &start->p->knode_bus;
error = klist_iter_init_node(&subsys->p->klist_devices, &iter->ki,
start_knode);
if (!error)
iter->type = type;
return error;
klist_iter_init_node(&subsys->p->klist_devices, &iter->ki, start_knode);
iter->type = type;
}
EXPORT_SYMBOL_GPL(subsys_dev_iter_init);

Expand Down
32 changes: 12 additions & 20 deletions drivers/base/class.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,20 +301,15 @@ void class_destroy(struct class *cls)
* otherwise if it is NULL, the iteration starts at the beginning of
* the list.
*/
int class_dev_iter_init(struct class_dev_iter *iter, struct class *class,
struct device *start, const struct device_type *type)
void class_dev_iter_init(struct class_dev_iter *iter, struct class *class,
struct device *start, const struct device_type *type)
{
struct klist_node *start_knode = NULL;
int error;

if (start)
start_knode = &start->knode_class;
error = klist_iter_init_node(&class->p->klist_devices, &iter->ki,
start_knode);
if (!error)
iter->type = type;

return error;
klist_iter_init_node(&class->p->klist_devices, &iter->ki, start_knode);
iter->type = type;
}
EXPORT_SYMBOL_GPL(class_dev_iter_init);

Expand Down Expand Up @@ -392,15 +387,14 @@ int class_for_each_device(struct class *class, struct device *start,
return -EINVAL;
}

error = class_dev_iter_init(&iter, class, start, NULL);
if (!error) {
while ((dev = class_dev_iter_next(&iter))) {
error = fn(dev, data);
if (error)
break;
}
class_dev_iter_exit(&iter);
class_dev_iter_init(&iter, class, start, NULL);
while ((dev = class_dev_iter_next(&iter))) {
error = fn(dev, data);
if (error)
break;
}
class_dev_iter_exit(&iter);

return error;
}
EXPORT_SYMBOL_GPL(class_for_each_device);
Expand Down Expand Up @@ -440,9 +434,7 @@ struct device *class_find_device(struct class *class, struct device *start,
return NULL;
}

if (class_dev_iter_init(&iter, class, start, NULL) < 0)
return NULL;

class_dev_iter_init(&iter, class, start, NULL);
while ((dev = class_dev_iter_next(&iter))) {
if (match(dev, data)) {
get_device(dev);
Expand Down
18 changes: 7 additions & 11 deletions drivers/base/driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,11 @@ int driver_for_each_device(struct device_driver *drv, struct device *start,
if (!drv)
return -EINVAL;

error = klist_iter_init_node(&drv->p->klist_devices, &i,
start ? &start->p->knode_driver : NULL);
if (!error) {
while ((dev = next_device(&i)) && !error)
error = fn(dev, data);
klist_iter_exit(&i);
}
klist_iter_init_node(&drv->p->klist_devices, &i,
start ? &start->p->knode_driver : NULL);
while ((dev = next_device(&i)) && !error)
error = fn(dev, data);
klist_iter_exit(&i);
return error;
}
EXPORT_SYMBOL_GPL(driver_for_each_device);
Expand Down Expand Up @@ -85,10 +83,8 @@ struct device *driver_find_device(struct device_driver *drv,
if (!drv)
return NULL;

if (klist_iter_init_node(&drv->p->klist_devices, &i,
(start ? &start->p->knode_driver : NULL)) < 0)
return NULL;

klist_iter_init_node(&drv->p->klist_devices, &i,
(start ? &start->p->knode_driver : NULL));
while ((dev = next_device(&i)))
if (match(dev, data) && get_device(dev))
break;
Expand Down
10 changes: 5 additions & 5 deletions include/linux/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ struct subsys_dev_iter {
struct klist_iter ki;
const struct device_type *type;
};
int subsys_dev_iter_init(struct subsys_dev_iter *iter,
void subsys_dev_iter_init(struct subsys_dev_iter *iter,
struct bus_type *subsys,
struct device *start,
const struct device_type *type);
Expand Down Expand Up @@ -380,10 +380,10 @@ int class_compat_create_link(struct class_compat *cls, struct device *dev,
void class_compat_remove_link(struct class_compat *cls, struct device *dev,
struct device *device_link);

extern int class_dev_iter_init(struct class_dev_iter *iter,
struct class *class,
struct device *start,
const struct device_type *type);
extern void class_dev_iter_init(struct class_dev_iter *iter,
struct class *class,
struct device *start,
const struct device_type *type);
extern struct device *class_dev_iter_next(struct class_dev_iter *iter);
extern void class_dev_iter_exit(struct class_dev_iter *iter);

Expand Down
2 changes: 1 addition & 1 deletion include/linux/klist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct klist_iter {


extern void klist_iter_init(struct klist *k, struct klist_iter *i);
extern int klist_iter_init_node(struct klist *k, struct klist_iter *i,
extern void klist_iter_init_node(struct klist *k, struct klist_iter *i,
struct klist_node *n);
extern void klist_iter_exit(struct klist_iter *i);
extern struct klist_node *klist_next(struct klist_iter *i);
Expand Down
14 changes: 4 additions & 10 deletions lib/klist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,19 +278,13 @@ EXPORT_SYMBOL_GPL(klist_node_attached);
* Similar to klist_iter_init(), but starts the action off with @n,
* instead of with the list head.
*/
int klist_iter_init_node(struct klist *k, struct klist_iter *i,
struct klist_node *n)
void klist_iter_init_node(struct klist *k, struct klist_iter *i,
struct klist_node *n)
{
if (n) {
kref_get(&n->n_ref);
if (!n->n_klist) {
kref_put(&n->n_ref);
return -ENODEV;
}
}
i->i_klist = k;
i->i_cur = n;
return 0;
if (n)
kref_get(&n->n_ref);
}
EXPORT_SYMBOL_GPL(klist_iter_init_node);

Expand Down

0 comments on commit 7cd9c9b

Please sign in to comment.