X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules.c;h=03b3f2a1165de1910354677eb9522047b7f49bf6;hb=b879c303a787e9430a5234aff3c1185ff9a4b019;hp=596bcd188bc28064d49330bb3248b9b036d00948;hpb=d59c84effdc50961bdbe01dcc41d71c8609e6700;p=elogind.git

diff --git a/udev_rules.c b/udev_rules.c
index 596bcd188..03b3f2a11 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -2,17 +2,17 @@
  * udev_rules.c
  *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
  *	Free Software Foundation version 2 of the License.
- * 
+ *
  *	This program is distributed in the hope that it will be useful, but
  *	WITHOUT ANY WARRANTY; without even the implied warranty of
  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *	General Public License for more details.
- * 
+ *
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
  *	675 Mass Ave, Cambridge, MA 02139, USA.
@@ -401,7 +401,6 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
 		SUBST_ROOT,
-		SUBST_MODALIAS,
 		SUBST_ENV,
 	};
 	static const struct subst_map {
@@ -421,7 +420,6 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .name = "parent",		.fmt = 'P',	.type = SUBST_PARENT },
 		{ .name = "tempnode",		.fmt = 'N',	.type = SUBST_TEMP_NODE },
 		{ .name = "root",		.fmt = 'r',	.type = SUBST_ROOT },
-		{ .name = "modalias",		.fmt = 'A',	.type = SUBST_MODALIAS },
 		{ .name = "env",		.fmt = 'E',	.type = SUBST_ENV },
 		{ NULL, '\0', 0 }
 	};
@@ -451,8 +449,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 						goto found;
 					}
 				}
-			}
-			else if (head[0] == '%') {
+			} else if (head[0] == '%') {
 				/* substitute format char */
 				if (head[1] == '\0')
 					break;
@@ -619,24 +616,6 @@ found:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
 			break;
-		case SUBST_MODALIAS:
-			{
-				const char *value;
-				static int warn = 1;
-
-				if (warn) {
-					err("$modalias is deprecated, use $env{MODALIAS} or "
-					    "$sysfs{modalias} instead.");
-					warn = 0;
-				}
-
-				value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-				if (value != NULL) {
-					strlcat(string, value, maxsize);
-					dbg("substitute MODALIAS '%s'", temp2);
-				}
-			}
-			break;
 		case SUBST_ENV:
 			if (attr == NULL) {
 				dbg("missing attribute");
@@ -731,24 +710,6 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (match_key("NAME", rule, &rule->name, udev->name))
 		goto nomatch;
 
-	if (rule->modalias.operation != KEY_OP_UNSET) {
-		const char *value;
-		static int warn = 1;
-
-		if (warn) {
-			err("MODALIAS is deprecated, use ENV{MODALIAS} or SYSFS{modalias} instead.");
-			warn = 0;
-		}
-
-		value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-		if (value == NULL) {
-			dbg("MODALIAS value not found");
-			goto nomatch;
-		}
-		if (match_key("MODALIAS", rule, &rule->modalias, value))
-			goto nomatch;
-	}
-
 	for (i = 0; i < rule->env.count; i++) {
 		struct key_pair *pair = &rule->env.keys[i];