ionic: Clean RCT ordering issues

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>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_debugfs.c b/drivers/net/ethernet/pensando/ionic/ionic_debugfs.c
index 91327ef670c768968cf715163e213dc17574a13c..c3ae11a480242cd5c845b912a906ca6a4061251d 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_debugfs.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_debugfs.c
@@ -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)
 {
        struct dentry *qcq_dentry, *q_dentry, *cq_dentry;
-       struct dentry *intr_dentry, *stats_dentry;
        struct ionic_dev *idev = &lif->ionic->idev;
+       struct dentry *intr_dentry, *stats_dentry;
        struct debugfs_regset32 *intr_ctrl_regset;
        struct ionic_intr_info *intr = &qcq->intr;
        struct debugfs_blob_wrapper *desc_blob;

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
index 89a40657c6897ed5338aaf86465ba2fac1365f47..6d168ad8c84fb192554a119fc66814d09a026e64 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
@@ -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)
 {
-       unsigned long now, then, dif;
        struct netdev_queue *netdev_txq;
+       unsigned long now, then, dif;
        struct net_device *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 ionic_lif *lif = netdev_priv(netdev);
-       struct ionic_queue *q = &lif->hwstamp_txq->q;
+       struct ionic_queue *q;
        int err, ndescs;
 
        /* 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.
         */
 
+       q = &lif->hwstamp_txq->q;
        ndescs = ionic_tx_descs_needed(q, skb);
        if (unlikely(ndescs < 0))
                goto err_out_drop;