]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] pciba cleanup
authorAlexander Viro <viro@math.psu.edu>
Wed, 4 Dec 2002 04:40:39 +0000 (20:40 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 4 Dec 2002 04:40:39 +0000 (20:40 -0800)
switched to devfs_remove(), killed gratitious devfs_handle_t variable.

arch/ia64/sn/io/pciba.c

index 7604d60d931aa7e34fe7b8e9200009f550ae2b51..191240d93bfe28e21e9e3e6b6ba23002d755aad3 100644 (file)
@@ -281,10 +281,6 @@ free_nodes(void)
 }
 #endif
 
-
-static devfs_handle_t pciba_devfs_handle;
-
-
 #if !defined(CONFIG_IA64_SGI_SN1)
 
 static status __init
@@ -296,8 +292,7 @@ register_with_devfs(void)
 
        TRACE();
 
-       pciba_devfs_handle = devfs_mk_dir(NULL, "pci", NULL);
-       if (pciba_devfs_handle == NULL)
+       if (!devfs_mk_dir(NULL, "pci", NULL))
                return failure;
 
        /* FIXME: don't forget /dev/pci/mem & /dev/pci/io */
@@ -314,7 +309,7 @@ register_with_devfs(void)
                        return failure;
 
                if (register_pci_device(device_dir_handle, dev) == failure) {
-                       devfs_unregister(pciba_devfs_handle);
+                       devfs_remove("pci");
                        return failure;
                }
        }
@@ -344,7 +339,7 @@ register_with_devfs(void)
                        return failure;
        
                if (register_pci_device(device_dir_handle, dev) == failure) {
-                       devfs_unregister(pciba_devfs_handle);
+                       devfs_remove("pci");
                        return failure;
                }
        }