iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ionic: more ionic name tweaks

Browse Source 
Fix up a few more local names that need an "ionic" prefix.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shannon Nelson 2020-05-11 17:59:34 -07:00 committed by David S. Miller
parent 36ac2c5092
commit c06107cabe
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/pensando/ionic/ionic_dev.h
View File

@ -182,7 +182,7 @@ struct ionic_desc_info {
void *cb_arg; void *cb_arg;
}; };
#define QUEUE_NAME_MAX_SZ 32 #define IONIC_QUEUE_NAME_MAX_SZ 32
struct ionic_queue { struct ionic_queue {
u64 dbell_count; u64 dbell_count;
@ -207,14 +207,14 @@ struct ionic_queue {
unsigned int desc_size; unsigned int desc_size;
unsigned int sg_desc_size; unsigned int sg_desc_size;
unsigned int pid; unsigned int pid;
char name[QUEUE_NAME_MAX_SZ]; char name[IONIC_QUEUE_NAME_MAX_SZ];
}; };
#define INTR_INDEX_NOT_ASSIGNED -1 #define IONIC_INTR_INDEX_NOT_ASSIGNED -1
#define INTR_NAME_MAX_SZ 32 #define IONIC_INTR_NAME_MAX_SZ 32
struct ionic_intr_info { struct ionic_intr_info {
char name[INTR_NAME_MAX_SZ]; char name[IONIC_INTR_NAME_MAX_SZ];
unsigned int index; unsigned int index;
unsigned int vector; unsigned int vector;
u64 rearm_count; u64 rearm_count;

13
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
View File

@ -12,10 +12,11 @@
#include "ionic_stats.h" #include "ionic_stats.h"
static const char ionic_priv_flags_strings[][ETH_GSTRING_LEN] = { static const char ionic_priv_flags_strings[][ETH_GSTRING_LEN] = {
#define PRIV_F_SW_DBG_STATS BIT(0) #define IONIC_PRIV_F_SW_DBG_STATS BIT(0)
"sw-dbg-stats", "sw-dbg-stats",
}; };
#define PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings)
#define IONIC_PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings)
static void ionic_get_stats_strings(struct ionic_lif *lif, u8 *buf) static void ionic_get_stats_strings(struct ionic_lif *lif, u8 *buf)
{ {
@ -58,7 +59,7 @@ static int ionic_get_sset_count(struct net_device *netdev, int sset)
count = ionic_get_stats_count(lif); count = ionic_get_stats_count(lif);
break; break;
case ETH_SS_PRIV_FLAGS: case ETH_SS_PRIV_FLAGS:
count = PRIV_FLAGS_COUNT; count = IONIC_PRIV_FLAGS_COUNT;
break; break;
} }
return count; return count;
@ -75,7 +76,7 @@ static void ionic_get_strings(struct net_device *netdev,
break; break;
case ETH_SS_PRIV_FLAGS: case ETH_SS_PRIV_FLAGS:
memcpy(buf, ionic_priv_flags_strings, memcpy(buf, ionic_priv_flags_strings,
PRIV_FLAGS_COUNT * ETH_GSTRING_LEN); IONIC_PRIV_FLAGS_COUNT * ETH_GSTRING_LEN);
break; break;
} }
} }
@ -557,7 +558,7 @@ static u32 ionic_get_priv_flags(struct net_device *netdev)
u32 priv_flags = 0; u32 priv_flags = 0;
if (test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) if (test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))
priv_flags |= PRIV_F_SW_DBG_STATS; priv_flags |= IONIC_PRIV_F_SW_DBG_STATS;
return priv_flags; return priv_flags;
} }
@ -567,7 +568,7 @@ static int ionic_set_priv_flags(struct net_device *netdev, u32 priv_flags)
struct ionic_lif *lif = netdev_priv(netdev); struct ionic_lif *lif = netdev_priv(netdev);
clear_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state); clear_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);
if (priv_flags & PRIV_F_SW_DBG_STATS) if (priv_flags & IONIC_PRIV_F_SW_DBG_STATS)
set_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state); set_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);
return 0; return 0;

4
drivers/net/ethernet/pensando/ionic/ionic_lif.c
View File

@ -199,7 +199,7 @@ static int ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
static void ionic_intr_free(struct ionic *ionic, int index) static void ionic_intr_free(struct ionic *ionic, int index)
{ {
if (index != INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs) if (index != IONIC_INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs)
clear_bit(index, ionic->intrs); clear_bit(index, ionic->intrs);
} }
@ -455,7 +455,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
cpumask_set_cpu(new->intr.cpu, cpumask_set_cpu(new->intr.cpu,
&new->intr.affinity_mask); &new->intr.affinity_mask);
} else { } else {
new->intr.index = INTR_INDEX_NOT_ASSIGNED; new->intr.index = IONIC_INTR_INDEX_NOT_ASSIGNED;
} }
new->cq.info = devm_kzalloc(dev, sizeof(*new->cq.info) * num_descs, new->cq.info = devm_kzalloc(dev, sizeof(*new->cq.info) * num_descs,