int add_perm_dev(struct perm_device *new_dev)
{
- struct list_head *tmp;
+ struct perm_device *dev;
struct perm_device *tmp_dev;
/* update the values if we already have the device */
- list_for_each(tmp, &perm_device_list) {
- struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+ list_for_each_entry(dev, &perm_device_list, node) {
if (strcmp_pattern(new_dev->name, dev->name))
continue;
copy_var(dev, new_dev, mode);
static struct perm_device *find_perm(char *name)
{
- struct list_head *tmp;
- struct perm_device *perm = NULL;
+ struct perm_device *perm;
- list_for_each(tmp, &perm_device_list) {
- perm = list_entry(tmp, struct perm_device, node);
+ list_for_each_entry(perm, &perm_device_list, node) {
if (strcmp_pattern(perm->name, name))
continue;
return perm;
case 'D':
if (strlen(udev->kernel_number) == 0) {
strcat(pos, "disc");
+ dbg("substitute devfs disc");
break;
}
strcat(pos, "part");
strcat(pos, udev->kernel_number);
- dbg("substitute kernel number '%s'", udev->kernel_number);
+ dbg("substitute devfs part '%s'", udev->kernel_number);
break;
case 'm':
sprintf(pos, "%u", udev->minor);
break;
}
}
- strcat(pos, pos3);
- dbg("substitute partial callout output '%s'", pos3);
+ if (pos3) {
+ strcat(pos, pos3);
+ dbg("substitute partial callout output '%s'", pos3);
+ }
} else {
strcat(pos, udev->callout_value);
dbg("substitute callout output '%s'", udev->callout_value);
} bus_files[] = {
{ .bus = "scsi", .file = "vendor" },
{ .bus = "usb", .file = "idVendor" },
+ { .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{}
};
return; /* here to prevent compiler warning... */
}
+static int do_ignore(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+ struct config_device *dev;
+ struct list_head *tmp;
+
+ list_for_each(tmp, &config_device_list) {
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != IGNORE)
+ continue;
+
+ dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
+ if (strcmp_pattern(dev->kernel_name, class_dev->name) != 0)
+ continue;
+
+ dbg("found name, '%s' will be ignored", dev->kernel_name);
+
+ return 0;
+ }
+ return -ENODEV;
+}
+
static int exec_callout(struct config_device *dev, char *value, int len)
{
int retval;
static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
{
struct config_device *dev;
- struct list_head *tmp;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
+ list_for_each_entry(dev, &config_device_list, node) {
if (dev->type != CALLOUT)
continue;
{
struct sysfs_pair *pair;
struct config_device *dev;
- struct list_head *tmp;
int i;
int match;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
+ list_for_each_entry(dev, &config_device_list, node) {
if (dev->type != LABEL)
continue;
static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
{
struct config_device *dev;
- struct list_head *tmp;
char path[SYSFS_PATH_MAX];
int found;
char *temp = NULL;
if (!sysfs_device)
return -ENODEV;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
+ list_for_each_entry(dev, &config_device_list, node) {
if (dev->type != NUMBER)
continue;
static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
{
struct config_device *dev;
- struct list_head *tmp;
char path[SYSFS_PATH_MAX];
int found;
char *temp = NULL;
if (!sysfs_device)
return -ENODEV;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
+ list_for_each_entry(dev, &config_device_list, node) {
if (dev->type != TOPOLOGY)
continue;
static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
{
struct config_device *dev;
- struct list_head *tmp;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
+ list_for_each_entry(dev, &config_device_list, node) {
if (dev->type != REPLACE)
continue;
if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
temp = strrchr(filename, '/');
if (temp) {
+ char *temp2 = strrchr(filename, '/');
partition = 1;
*temp = 0x00;
- char *temp2 = strrchr(filename, '/');
dbg("temp2 = %s", temp2);
if (temp2 && (strcmp(temp2, "/block") == 0)) {
/* oops, we have no parent block device, so go back to original directory */
dbg("kernel_number='%s'", udev->kernel_number);
/* rules are looked at in priority order */
+ retval = do_ignore(class_dev, udev, sysfs_device);
+ if (retval == 0) {
+ dbg("name, '%s' is being ignored", class_dev->name);
+ return 1;
+ }
+
retval = do_callout(class_dev, udev, sysfs_device);
if (retval == 0)
goto found;