<p>Felix Held has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23007">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">superio/smsc: pass the chip-specific ops struct to pnp_enable_devices<br><br>Pass the address of the chip-specific ops struct instead of the one of<br>the generic pnp_ops struct to the PNP device enable function.<br><br>Change-Id: I16e485494e448ae02e0a7b9e21b90ddbb1a53a4b<br>Signed-off-by: Felix Held <felix-coreboot@felixheld.de><br>---<br>M src/superio/smsc/dme1737/superio.c<br>M src/superio/smsc/fdc37n972/fdc37n972.c<br>M src/superio/smsc/kbc1100/superio.c<br>M src/superio/smsc/lpc47b272/superio.c<br>M src/superio/smsc/lpc47b397/superio.c<br>M src/superio/smsc/lpc47m10x/superio.c<br>M src/superio/smsc/lpc47m15x/superio.c<br>M src/superio/smsc/lpc47n217/superio.c<br>M src/superio/smsc/lpc47n227/superio.c<br>M src/superio/smsc/mec1308/superio.c<br>M src/superio/smsc/sch4037/superio.c<br>M src/superio/smsc/sio10n268/sio10n268.c<br>M src/superio/smsc/smscsuperio/superio.c<br>13 files changed, 26 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/23007/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/superio/smsc/dme1737/superio.c b/src/superio/smsc/dme1737/superio.c</span><br><span>index 7b4b947..8fff83e 100644</span><br><span>--- a/src/superio/smsc/dme1737/superio.c</span><br><span>+++ b/src/superio/smsc/dme1737/superio.c</span><br><span>@@ -60,8 +60,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        pnp_enable_devices(dev, &pnp_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-           ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_dme1737_ops = {</span><br><span>diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c</span><br><span>index e3edcea..ab29cfa 100644</span><br><span>--- a/src/superio/smsc/fdc37n972/fdc37n972.c</span><br><span>+++ b/src/superio/smsc/fdc37n972/fdc37n972.c</span><br><span>@@ -53,8 +53,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  pnp_enable_devices(dev, &pnp_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-           ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_fdc37n972_ops = {</span><br><span>diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c</span><br><span>index 0f5ede1..f600127 100644</span><br><span>--- a/src/superio/smsc/kbc1100/superio.c</span><br><span>+++ b/src/superio/smsc/kbc1100/superio.c</span><br><span>@@ -51,8 +51,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(0, 100%, 40%);">-                 pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+        pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> static void kbc1100_init(struct device *dev)</span><br><span>diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c</span><br><span>index a269b3b..a823455 100644</span><br><span>--- a/src/superio/smsc/lpc47b272/superio.c</span><br><span>+++ b/src/superio/smsc/lpc47b272/superio.c</span><br><span>@@ -77,8 +77,8 @@</span><br><span>  */</span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(0, 100%, 40%);">-                    pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+     pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_lpc47b272_ops = {</span><br><span>diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c</span><br><span>index 93e453f..d84a792 100644</span><br><span>--- a/src/superio/smsc/lpc47b397/superio.c</span><br><span>+++ b/src/superio/smsc/lpc47b397/superio.c</span><br><span>@@ -146,8 +146,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      pnp_enable_devices(dev, &pnp_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-           ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_lpc47b397_ops = {</span><br><span>diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c</span><br><span>index 58e7c95..00f01dd 100644</span><br><span>--- a/src/superio/smsc/lpc47m10x/superio.c</span><br><span>+++ b/src/superio/smsc/lpc47m10x/superio.c</span><br><span>@@ -75,8 +75,8 @@</span><br><span>  */</span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(0, 100%, 40%);">-                    pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+     pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_lpc47m10x_ops = {</span><br><span>diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c</span><br><span>index 814b70e..0d23681 100644</span><br><span>--- a/src/superio/smsc/lpc47m15x/superio.c</span><br><span>+++ b/src/superio/smsc/lpc47m15x/superio.c</span><br><span>@@ -54,8 +54,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        pnp_enable_devices(dev, &pnp_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-                      ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+   pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> static void lpc47m15x_init(struct device *dev)</span><br><span>diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c</span><br><span>index 9c5dff0..0c59611 100644</span><br><span>--- a/src/superio/smsc/lpc47n217/superio.c</span><br><span>+++ b/src/superio/smsc/lpc47n217/superio.c</span><br><span>@@ -70,8 +70,8 @@</span><br><span>  */</span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(0, 100%, 40%);">-                    pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+     pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> /**</span><br><span>diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c</span><br><span>index c831957..c6a11ef 100644</span><br><span>--- a/src/superio/smsc/lpc47n227/superio.c</span><br><span>+++ b/src/superio/smsc/lpc47n227/superio.c</span><br><span>@@ -69,8 +69,8 @@</span><br><span>  */</span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       pnp_enable_devices(dev, &pnp_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-                      ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+   pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> /**</span><br><span>diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c</span><br><span>index b11374c..c89fc70 100644</span><br><span>--- a/src/superio/smsc/mec1308/superio.c</span><br><span>+++ b/src/superio/smsc/mec1308/superio.c</span><br><span>@@ -60,8 +60,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  pnp_enable_devices(dev, &pnp_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-                      ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+   pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_mec1308_ops = {</span><br><span>diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c</span><br><span>index 78c6148..09e96aa 100644</span><br><span>--- a/src/superio/smsc/sch4037/superio.c</span><br><span>+++ b/src/superio/smsc/sch4037/superio.c</span><br><span>@@ -53,7 +53,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+        pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_sch4037_ops = {</span><br><span>diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c</span><br><span>index 704e918..42a0802 100644</span><br><span>--- a/src/superio/smsc/sio10n268/sio10n268.c</span><br><span>+++ b/src/superio/smsc/sio10n268/sio10n268.c</span><br><span>@@ -52,8 +52,8 @@</span><br><span> </span><br><span> static void enable_dev(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  pnp_enable_devices(dev, &pnp_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-           ARRAY_SIZE(pnp_dev_info), pnp_dev_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           pnp_dev_info);</span><br><span> }</span><br><span> </span><br><span> struct chip_operations superio_smsc_sio10n268_ops = {</span><br><span>diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c</span><br><span>index 414ae8d..699a92f 100644</span><br><span>--- a/src/superio/smsc/smscsuperio/superio.c</span><br><span>+++ b/src/superio/smsc/smscsuperio/superio.c</span><br><span>@@ -281,8 +281,8 @@</span><br><span>  }</span><br><span> </span><br><span>        /* Enable the specified devices (if present on the chip). */</span><br><span style="color: hsl(0, 100%, 40%);">-    pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(0, 100%, 40%);">-                    &pnp_dev_info[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+     pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),</span><br><span style="color: hsl(120, 100%, 40%);">+           &pnp_dev_info[0]);</span><br><span> </span><br><span>   /* Restore LD_FOO values. */</span><br><span>         for (j = 0; j < ARRAY_SIZE(pnp_dev_info); j++)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23007">change 23007</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/23007"/><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: I16e485494e448ae02e0a7b9e21b90ddbb1a53a4b </div>
<div style="display:none"> Gerrit-Change-Number: 23007 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Felix Held <felix-coreboot@felixheld.de> </div>