<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/20771">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_setup() wherever applicable<br><br>Change-Id: Ie093dea96ec8990368695c0c5824e0fe44fb8540<br>---<br>M Transceiver52M/device/ipc/ipc-driver-test.c<br>M Transceiver52M/device/ipc/ipc_chan.c<br>M Transceiver52M/device/ipc/ipc_sock.c<br>3 files changed, 3 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/ipc/ipc-driver-test.c b/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>index 0cccbda..da53463 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>@@ -394,10 +394,7 @@</span><br><span>              return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-    bfd->cb = sock_callback_fn;</span><br><span style="color: hsl(0, 100%, 40%);">-  bfd->data = state;</span><br><span style="color: hsl(0, 100%, 40%);">-   bfd->priv_nr = n;</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, sock_callback_fn, state, n);</span><br><span> </span><br><span>        rc = osmo_fd_register(bfd);</span><br><span>  if (rc < 0) {</span><br><span>diff --git a/Transceiver52M/device/ipc/ipc_chan.c b/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>index af18aab..50782b9 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>@@ -236,13 +236,8 @@</span><br><span>                 return 0;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-       conn_bfd->cb = ipc_chan_sock_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-     conn_bfd->data = state;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   /* copy chan nr, required for proper bfd<->chan # mapping */</span><br><span style="color: hsl(0, 100%, 40%);">-      conn_bfd->priv_nr = bfd->priv_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, ipc_chan_sock_cb, state, bfd->priv_nr);</span><br><span> </span><br><span>     if (osmo_fd_register(conn_bfd) != 0) {</span><br><span>               LOGP(DDEV, LOGL_ERROR,</span><br><span>diff --git a/Transceiver52M/device/ipc/ipc_sock.c b/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>index 26865bf..b014fac 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>@@ -249,10 +249,7 @@</span><br><span>           return 0;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-       conn_bfd->cb = ipc_sock_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-  conn_bfd->data = state;</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, ipc_sock_cb, state, 0);</span><br><span> </span><br><span>        if (osmo_fd_register(conn_bfd) != 0) {</span><br><span>               LOGP(DDEV, LOGL_ERROR,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/20771">change 20771</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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://gerrit.osmocom.org/c/osmo-trx/+/20771"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie093dea96ec8990368695c0c5824e0fe44fb8540 </div>
<div style="display:none"> Gerrit-Change-Number: 20771 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>