summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/sconfig/main.c7
-rw-r--r--util/sconfig/sconfig.h3
2 files changed, 3 insertions, 7 deletions
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index a3c77eb135..2a7fa15faf 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -493,7 +493,6 @@ void add_resource(struct bus *bus, int type, int index, int base)
} else {
dev->res = r;
}
- dev->rescnt++;
}
void add_register(struct chip_instance *chip_instance, char *name, char *val)
@@ -589,7 +588,7 @@ static void pass0(FILE *fil, struct device *ptr, struct device *next)
}
fprintf(fil, "DEVTREE_CONST static struct device %s;\n", ptr->name);
- if (ptr->rescnt > 0)
+ if (ptr->res)
fprintf(fil, "DEVTREE_CONST struct resource %s_res[];\n",
ptr->name);
if (dev_has_children(ptr))
@@ -606,7 +605,7 @@ static void pass0(FILE *fil, struct device *ptr, struct device *next)
static void emit_resources(FILE *fil, struct device *ptr)
{
- if (ptr->rescnt == 0)
+ if (ptr->res == NULL)
return;
int i = 1;
@@ -704,7 +703,7 @@ static void pass1(FILE *fil, struct device *ptr, struct device *next)
fprintf(fil, "\t.subsystem_device = 0x%04x,\n",
ptr->subsystem_device);
- if (ptr->rescnt > 0) {
+ if (ptr->res) {
fprintf(fil, "\t.resource_list = &%s_res[0],\n",
ptr->name);
}
diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h
index f9137fa7ac..63b65fd372 100644
--- a/util/sconfig/sconfig.h
+++ b/util/sconfig/sconfig.h
@@ -99,9 +99,6 @@ struct device {
/* Indicates whether this device is enabled. */
int enabled;
- /* Indicates number of resources for the device. */
- int rescnt;
-
/* Subsystem IDs for the device. */
int subsystem_vendor;
int subsystem_device;