#define MAX_SYSFS_PAIRS 5
-#define RULEFILE_EXT ".rules"
-#define PERMFILE_EXT ".permissions"
+#define RULEFILE_SUFFIX ".rules"
+#define PERMFILE_SUFFIX ".permissions"
#define set_empty_perms(dev, m, o, g) \
if (dev->mode == 0) \
extern struct list_head perm_device_list;
extern int namedev_init(void);
-extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
+extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
extern int namedev_init_permissions(void);
extern int namedev_init_rules(void);