From 35d346fe2d98b3ec5ed0451b87cc31be06177d68 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 9 Aug 2010 12:58:16 +0000 Subject: [PATCH] Fix build error introduced in r5868. aliased_name was a compatibility hack to match the output of the C rewrite with the python version's results. It seems that we carried these useless symbols with us for years, just without any impact good or bad. By declaring devices static and tightening the screws (-Werror), the compiler now knows that these declarations are useless - and stops. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5687 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/sconfig/main.c | 4 ---- util/sconfig/sconfig.h | 1 - 2 files changed, 5 deletions(-) diff --git a/util/sconfig/main.c b/util/sconfig/main.c index be42381340..40a220aa44 100755 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -223,8 +223,6 @@ void alias_siblings(struct device *d) { if (device_match(d, cmp)) { d->multidev = 1; - cmp->aliased_name = malloc(12); - sprintf(cmp->aliased_name, "_dev%d", cmp->id); cmp->id = d->id; cmp->name = d->name; cmp->used = 1; @@ -289,8 +287,6 @@ static void pass0(FILE *fil, struct device *ptr) { if (ptr->children || ptr->multidev) fprintf(fil, "struct bus %s_links[];\n", ptr->name); } - if ((ptr->type == device) && (ptr->id != 0) && ptr->used) - fprintf(fil, "static struct device %s;\n", ptr->aliased_name); } static void pass1(FILE *fil, struct device *ptr) { diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h index 139ac86ae9..8fbae6a48b 100755 --- a/util/sconfig/sconfig.h +++ b/util/sconfig/sconfig.h @@ -54,7 +54,6 @@ struct device { int chiph_exists; char *ops; char *name; - char *aliased_name; char *name_underscore; char *path; int path_a;