Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

diff --combined drivers/ieee1394/nodemgr.c
index 0ec2987686215e6c4273830681e95c6aa7931cc6,f2453668acf56ee9ca5604aadcad9a729df2ee5f..082c7fd239f584a14f64604bb65fe770697eda02
--- 1/drivers/ieee1394/nodemgr.c
--- 2/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@@ -121,8 -121,8 +121,8 @@@ struct host_info 
  };
  
  static int nodemgr_bus_match(struct device * dev, struct device_driver * drv);
- static int nodemgr_hotplug(struct class_device *cdev, char **envp, int num_envp,
-                          char *buffer, int buffer_size);
+ static int nodemgr_uevent(struct class_device *cdev, char **envp, int num_envp,
+                         char *buffer, int buffer_size);
  static void nodemgr_resume_ne(struct node_entry *ne);
  static void nodemgr_remove_ne(struct node_entry *ne);
  static struct node_entry *find_entry_by_guid(u64 guid);
@@@ -162,7 -162,7 +162,7 @@@ static void ud_cls_release(struct class
  static struct class nodemgr_ud_class = {
        .name           = "ieee1394",
        .release        = ud_cls_release,
-       .hotplug        = nodemgr_hotplug,
+       .uevent         = nodemgr_uevent,
  };
  
  static struct hpsb_highlevel nodemgr_highlevel;
@@@ -743,20 -743,21 +743,20 @@@ static struct node_entry *nodemgr_creat
                                              unsigned int generation)
  {
        struct hpsb_host *host = hi->host;
 -        struct node_entry *ne;
 -
 -      ne = kmalloc(sizeof(struct node_entry), GFP_KERNEL);
 -        if (!ne) return NULL;
 +      struct node_entry *ne;
  
 -      memset(ne, 0, sizeof(struct node_entry));
 +      ne = kzalloc(sizeof(*ne), GFP_KERNEL);
 +      if (!ne)
 +              return NULL;
  
        ne->tpool = &host->tpool[nodeid & NODE_MASK];
  
 -        ne->host = host;
 -        ne->nodeid = nodeid;
 +      ne->host = host;
 +      ne->nodeid = nodeid;
        ne->generation = generation;
        ne->needs_probe = 1;
  
 -        ne->guid = guid;
 +      ne->guid = guid;
        ne->guid_vendor_id = (guid >> 40) & 0xffffff;
        ne->guid_vendor_oui = nodemgr_find_oui_name(ne->guid_vendor_id);
        ne->csr = csr;
@@@ -786,7 -787,7 +786,7 @@@
                   (host->node_id == nodeid) ? "Host" : "Node",
                   NODE_BUS_ARGS(host, nodeid), (unsigned long long)guid);
  
 -        return ne;
 +      return ne;
  }
  
  
@@@ -871,10 -872,12 +871,10 @@@ static struct unit_directory *nodemgr_p
        struct csr1212_keyval *kv;
        u8 last_key_id = 0;
  
 -      ud = kmalloc(sizeof(struct unit_directory), GFP_KERNEL);
 +      ud = kzalloc(sizeof(*ud), GFP_KERNEL);
        if (!ud)
                goto unit_directory_error;
  
 -      memset (ud, 0, sizeof(struct unit_directory));
 -
        ud->ne = ne;
        ud->ignore_driver = ignore_drivers;
        ud->address = ud_kv->offset + CSR1212_CONFIG_ROM_SPACE_BASE;
@@@ -934,10 -937,10 +934,10 @@@
                        /* Logical Unit Number */
                        if (kv->key.type == CSR1212_KV_TYPE_IMMEDIATE) {
                                if (ud->flags & UNIT_DIRECTORY_HAS_LUN) {
 -                                      ud_child = kmalloc(sizeof(struct unit_directory), GFP_KERNEL);
 +                                      ud_child = kmalloc(sizeof(*ud_child), GFP_KERNEL);
                                        if (!ud_child)
                                                goto unit_directory_error;
 -                                      memcpy(ud_child, ud, sizeof(struct unit_directory));
 +                                      memcpy(ud_child, ud, sizeof(*ud_child));
                                        nodemgr_register_device(ne, ud_child, &ne->device);
                                        ud_child = NULL;
                                        
@@@ -963,7 -966,7 +963,7 @@@
                                if (ud_child == NULL)
                                        break;
                                
-                               /* inherit unspecified values so hotplug picks it up */
+                               /* inherit unspecified values, the driver core picks it up */
                                if ((ud->flags & UNIT_DIRECTORY_MODEL_ID) &&
                                    !(ud_child->flags & UNIT_DIRECTORY_MODEL_ID))
                                {
@@@ -1059,8 -1062,8 +1059,8 @@@ static void nodemgr_process_root_direct
  
  #ifdef CONFIG_HOTPLUG
  
- static int nodemgr_hotplug(struct class_device *cdev, char **envp, int num_envp,
-                          char *buffer, int buffer_size)
+ static int nodemgr_uevent(struct class_device *cdev, char **envp, int num_envp,
+                         char *buffer, int buffer_size)
  {
        struct unit_directory *ud;
        int i = 0;
@@@ -1109,8 -1112,8 +1109,8 @@@ do {                                                            
  
  #else
  
- static int nodemgr_hotplug(struct class_device *cdev, char **envp, int num_envp,
-                          char *buffer, int buffer_size)
+ static int nodemgr_uevent(struct class_device *cdev, char **envp, int num_envp,
+                         char *buffer, int buffer_size)
  {
        return -ENODEV;
  }
@@@ -1197,7 -1200,7 +1197,7 @@@ static void nodemgr_node_scan_one(struc
        struct csr1212_csr *csr;
        struct nodemgr_csr_info *ci;
  
 -      ci = kmalloc(sizeof(struct nodemgr_csr_info), GFP_KERNEL);
 +      ci = kmalloc(sizeof(*ci), GFP_KERNEL);
        if (!ci)
                return;
  
@@@ -1407,28 -1410,14 +1407,28 @@@ static void nodemgr_node_probe(struct h
        struct hpsb_host *host = hi->host;
        struct class *class = &nodemgr_ne_class;
        struct class_device *cdev;
 +      struct node_entry *ne;
  
        /* Do some processing of the nodes we've probed. This pulls them
         * into the sysfs layer if needed, and can result in processing of
         * unit-directories, or just updating the node and it's
 -       * unit-directories. */
 +       * unit-directories.
 +       *
 +       * Run updates before probes. Usually, updates are time-critical
 +       * while probes are time-consuming. (Well, those probes need some
 +       * improvement...) */
 +
        down_read(&class->subsys.rwsem);
 -      list_for_each_entry(cdev, &class->children, node)
 -              nodemgr_probe_ne(hi, container_of(cdev, struct node_entry, class_dev), generation);
 +      list_for_each_entry(cdev, &class->children, node) {
 +              ne = container_of(cdev, struct node_entry, class_dev);
 +              if (!ne->needs_probe)
 +                      nodemgr_probe_ne(hi, ne, generation);
 +      }
 +      list_for_each_entry(cdev, &class->children, node) {
 +              ne = container_of(cdev, struct node_entry, class_dev);
 +              if (ne->needs_probe)
 +                      nodemgr_probe_ne(hi, ne, generation);
 +      }
          up_read(&class->subsys.rwsem);
  
  
@@@ -1459,8 -1448,7 +1459,8 @@@ static int nodemgr_send_resume_packet(s
        int ret = 1;
  
        packet = hpsb_make_phypacket(host,
 -                      0x003c0000 | NODEID_TO_NODE(host->node_id) << 24);
 +                      EXTPHYPACKET_TYPE_RESUME |
 +                      NODEID_TO_NODE(host->node_id) << PHYPACKET_PORT_SHIFT);
        if (packet) {
                packet->no_waiter = 1;
                packet->generation = get_hpsb_generation(host);
@@@ -1630,8 -1618,8 +1630,8 @@@ static int nodemgr_host_thread(void *__
  
                /* Scan our nodes to get the bus options and create node
                 * entries. This does not do the sysfs stuff, since that
-                * would trigger hotplug callbacks and such, which is a
-                * bad idea at this point. */
+                * would trigger uevents and such, which is a bad idea at
+                * this point. */
                nodemgr_node_scan(hi, generation);
  
                /* This actually does the full probe, with sysfs