hv_netvsc: Fix the order of num_sc_offered decrement

[deliverable/linux.git] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 500592486e8832cfd61673302359cc352b51efa0..6470eb8088f4f4da92215f5009c3b63a2a492876 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -149,8 +149,7 @@ EXPORT_SYMBOL_GPL(bus_remove_file);
 
 static void bus_release(struct kobject *kobj)
 {
-       struct subsys_private *priv =
-               container_of(kobj, typeof(*priv), subsys.kobj);
+       struct subsys_private *priv = to_subsys_private(kobj);
        struct bus_type *bus = priv->bus;
 
        kfree(priv);
@@ -1019,13 +1018,11 @@ static void device_insertion_sort_klist(struct device *a, struct list_head *list
                                        int (*compare)(const struct device *a,
                                                        const struct device *b))
 {
-       struct list_head *pos;
        struct klist_node *n;
        struct device_private *dev_prv;
        struct device *b;
 
-       list_for_each(pos, list) {
-               n = container_of(pos, struct klist_node, n_node);
+       list_for_each_entry(n, list, n_node) {
                dev_prv = to_device_private_bus(n);
                b = dev_prv->device;
                if (compare(a, b) <= 0) {
@@ -1042,8 +1039,7 @@ void bus_sort_breadthfirst(struct bus_type *bus,
                                          const struct device *b))
 {
        LIST_HEAD(sorted_devices);
-       struct list_head *pos, *tmp;
-       struct klist_node *n;
+       struct klist_node *n, *tmp;
        struct device_private *dev_prv;
        struct device *dev;
        struct klist *device_klist;
@@ -1051,8 +1047,7 @@ void bus_sort_breadthfirst(struct bus_type *bus,
        device_klist = bus_get_device_klist(bus);
 
        spin_lock(&device_klist->k_lock);
-       list_for_each_safe(pos, tmp, &device_klist->k_list) {
-               n = container_of(pos, struct klist_node, n_node);
+       list_for_each_entry_safe(n, tmp, &device_klist->k_list, n_node) {
                dev_prv = to_device_private_bus(n);
                dev = dev_prv->device;
                device_insertion_sort_klist(dev, &sorted_devices, compare);
@@ -1107,7 +1102,7 @@ struct device *subsys_dev_iter_next(struct subsys_dev_iter *iter)
                knode = klist_next(&iter->ki);
                if (!knode)
                        return NULL;
-               dev = container_of(knode, struct device_private, knode_bus)->device;
+               dev = to_device_private_bus(knode)->device;
                if (!iter->type || iter->type == dev->type)
                        return dev;
        }