[PATCH] rename namedev's get_attr() to be main namedev_name_device() as that's what...

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 1f535c4c8b17e36de73258bf5996d4ec0a74f59e..5ea843e9b74d2645857c50ca00ab825830bf92d8 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -28,11 +28,7 @@
 
 struct sysfs_class_device;
 
-/* namedev config files */
 #define COMMENT_CHARACTER              '#'
-#define NAMEDEV_CONFIG_ROOT            "/home/greg/src/udev/"
-#define NAMEDEV_CONFIG_PERMISSION_FILE "namedev.permissions"
-#define NAMEDEV_CONFIG_FILE            "namedev.config"
 
 enum config_type {
        KERNEL_NAME     = 0,    /* must be 0 to let memset() default to this value */
@@ -54,7 +50,6 @@ struct config_device {
        struct list_head node;
 
        enum config_type type;
-
        char bus[BUS_SIZE];
        char sysfs_file[FILE_SIZE];
        char sysfs_value[VALUE_SIZE];
@@ -62,13 +57,16 @@ struct config_device {
        char place[PLACE_SIZE];
        char kernel_name[NAME_SIZE];
        char exec_program[FILE_SIZE];
-       
+
        /* what to set the device to */
-       struct device_attr attr;
+       char name[NAME_SIZE];
+       char owner[OWNER_SIZE];
+       char group[GROUP_SIZE];
+       mode_t mode;
 };
 
 
 extern int namedev_init(void);
-extern int namedev_name_device(struct sysfs_class_device *class_dev, struct device_attr *attr);
+extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
 
 #endif