TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ionic: Clean RCT ordering issues

Browse Source 
Clean up complaints from an xmastree.py scan.

Signed-off-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Brett Creeley
2024-02-29 11:39:34 -08:00
committed by David S. Miller
parent 8aacc71399
commit bc40b88930
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/pensando/ionic/ionic_debugfs.c
+1 -1
View File
@@ -113,8 +113,8 @@ static const struct debugfs_reg32 intr_ctrl_regs[] = {
void ionic_debugfs_add_qcq(struct ionic_lif *lif, struct ionic_qcq *qcq) void ionic_debugfs_add_qcq(struct ionic_lif *lif, struct ionic_qcq *qcq)
{ {
struct dentry *qcq_dentry, *q_dentry, *cq_dentry; struct dentry *qcq_dentry, *q_dentry, *cq_dentry;
struct dentry *intr_dentry, *stats_dentry;
struct ionic_dev *idev = &lif->ionic->idev; struct ionic_dev *idev = &lif->ionic->idev;
struct dentry *intr_dentry, *stats_dentry;
struct debugfs_regset32 *intr_ctrl_regset; struct debugfs_regset32 *intr_ctrl_regset;
struct ionic_intr_info *intr = &qcq->intr; struct ionic_intr_info *intr = &qcq->intr;
struct debugfs_blob_wrapper *desc_blob; struct debugfs_blob_wrapper *desc_blob;
drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+3 -2
View File
@@ -40,8 +40,8 @@ static inline void ionic_rxq_post(struct ionic_queue *q, bool ring_dbell,
bool ionic_txq_poke_doorbell(struct ionic_queue *q) bool ionic_txq_poke_doorbell(struct ionic_queue *q)
{ {
unsigned long now, then, dif;
struct netdev_queue *netdev_txq; struct netdev_queue *netdev_txq;
unsigned long now, then, dif;
struct net_device *netdev; struct net_device *netdev;
netdev = q->lif->netdev; netdev = q->lif->netdev;
@@ -1776,7 +1776,7 @@ static netdev_tx_t ionic_start_hwstamp_xmit(struct sk_buff *skb,
struct net_device *netdev) struct net_device *netdev)
{ {
struct ionic_lif *lif = netdev_priv(netdev); struct ionic_lif *lif = netdev_priv(netdev);
struct ionic_queue *q = &lif->hwstamp_txq->q; struct ionic_queue *q;
int err, ndescs; int err, ndescs;
/* Does not stop/start txq, because we post to a separate tx queue /* Does not stop/start txq, because we post to a separate tx queue
@@ -1784,6 +1784,7 @@ static netdev_tx_t ionic_start_hwstamp_xmit(struct sk_buff *skb,
* the timestamping queue, it is dropped. * the timestamping queue, it is dropped.
*/ */
q = &lif->hwstamp_txq->q;
ndescs = ionic_tx_descs_needed(q, skb); ndescs = ionic_tx_descs_needed(q, skb);
if (unlikely(ndescs < 0)) if (unlikely(ndescs < 0))
goto err_out_drop; goto err_out_drop;