<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26806">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/sconfig: Get rid of rescnt in struct device<br><br>This change gets rid of rescnt member in struct device since it is<br>redundant. "res" member can be used to determine if resource list is<br>present or not.<br><br>BUG=b:80081934<br>TEST=Verified that static.c generated with and without this CL is<br>exactly the same for all boards built using abuild.<br><br>Change-Id: I73a2361686ad1130716a7d29576f2d02b9ed33c1<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M util/sconfig/main.c<br>M util/sconfig/sconfig.h<br>2 files changed, 3 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/26806/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/sconfig/main.c b/util/sconfig/main.c</span><br><span>index 5c32178..f98cc5f 100644</span><br><span>--- a/util/sconfig/main.c</span><br><span>+++ b/util/sconfig/main.c</span><br><span>@@ -486,7 +486,6 @@</span><br><span>    } else {</span><br><span>             dev->res = r;</span><br><span>     }</span><br><span style="color: hsl(0, 100%, 40%);">-       dev->rescnt++;</span><br><span> }</span><br><span> </span><br><span> void add_register(struct chip_instance *chip_instance, char *name, char *val)</span><br><span>@@ -567,7 +566,7 @@</span><br><span>    }</span><br><span> </span><br><span>        fprintf(fil, "DEVTREE_CONST static struct device %s;\n", ptr->name);</span><br><span style="color: hsl(0, 100%, 40%);">-       if (ptr->rescnt > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+    if (ptr->res)</span><br><span>             fprintf(fil, "DEVTREE_CONST struct resource %s_res[];\n",</span><br><span>                  ptr->name);</span><br><span>       if (ptr->children || device_has_instance(ptr))</span><br><span>@@ -583,7 +582,7 @@</span><br><span> </span><br><span> static void emit_resources(FILE *fil, struct device *ptr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   if (ptr->rescnt == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!ptr->res)</span><br><span>            return;</span><br><span> </span><br><span>  int i = 1;</span><br><span>@@ -692,7 +691,7 @@</span><br><span>             fprintf(fil, "\t.subsystem_device = 0x%04x,\n",</span><br><span>                    ptr->subsystem_device);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  if (ptr->rescnt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+  if (ptr->res) {</span><br><span>           fprintf(fil, "\t.resource_list = &%s_res[0],\n",</span><br><span>                       ptr->name);</span><br><span>       }</span><br><span>diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h</span><br><span>index 2c52d23..10d58ae 100644</span><br><span>--- a/util/sconfig/sconfig.h</span><br><span>+++ b/util/sconfig/sconfig.h</span><br><span>@@ -89,7 +89,6 @@</span><br><span> struct device {</span><br><span>        int id;</span><br><span>      int enabled;</span><br><span style="color: hsl(0, 100%, 40%);">-    int rescnt;</span><br><span>  int subsystem_vendor;</span><br><span>        int subsystem_device;</span><br><span>        int inherit_subsystem;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26806">change 26806</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26806"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I73a2361686ad1130716a7d29576f2d02b9ed33c1 </div>
<div style="display:none"> Gerrit-Change-Number: 26806 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>