tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ionic: more ionic name tweaks

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>

authored by

Shannon Nelson and committed by
David S. Miller c06107ca 36ac2c50

+14 -13
+5 -5
drivers/net/ethernet/pensando/ionic/ionic_dev.h
··· 182 182 void *cb_arg; 183 183 }; 184 184 185 - #define QUEUE_NAME_MAX_SZ 32 185 + #define IONIC_QUEUE_NAME_MAX_SZ 32 186 186 187 187 struct ionic_queue { 188 188 u64 dbell_count; ··· 207 207 unsigned int desc_size; 208 208 unsigned int sg_desc_size; 209 209 unsigned int pid; 210 - char name[QUEUE_NAME_MAX_SZ]; 210 + char name[IONIC_QUEUE_NAME_MAX_SZ]; 211 211 }; 212 212 213 - #define INTR_INDEX_NOT_ASSIGNED -1 214 - #define INTR_NAME_MAX_SZ 32 213 + #define IONIC_INTR_INDEX_NOT_ASSIGNED -1 214 + #define IONIC_INTR_NAME_MAX_SZ 32 215 215 216 216 struct ionic_intr_info { 217 - char name[INTR_NAME_MAX_SZ]; 217 + char name[IONIC_INTR_NAME_MAX_SZ]; 218 218 unsigned int index; 219 219 unsigned int vector; 220 220 u64 rearm_count;
+7 -6
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
··· 12 12 #include "ionic_stats.h" 13 13 14 14 static const char ionic_priv_flags_strings[][ETH_GSTRING_LEN] = { 15 - #define PRIV_F_SW_DBG_STATS BIT(0) 15 + #define IONIC_PRIV_F_SW_DBG_STATS BIT(0) 16 16 "sw-dbg-stats", 17 17 }; 18 - #define PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings) 18 + 19 + #define IONIC_PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings) 19 20 20 21 static void ionic_get_stats_strings(struct ionic_lif *lif, u8 *buf) 21 22 { ··· 59 58 count = ionic_get_stats_count(lif); 60 59 break; 61 60 case ETH_SS_PRIV_FLAGS: 62 - count = PRIV_FLAGS_COUNT; 61 + count = IONIC_PRIV_FLAGS_COUNT; 63 62 break; 64 63 } 65 64 return count; ··· 76 75 break; 77 76 case ETH_SS_PRIV_FLAGS: 78 77 memcpy(buf, ionic_priv_flags_strings, 79 - PRIV_FLAGS_COUNT * ETH_GSTRING_LEN); 78 + IONIC_PRIV_FLAGS_COUNT * ETH_GSTRING_LEN); 80 79 break; 81 80 } 82 81 } ··· 558 557 u32 priv_flags = 0; 559 558 560 559 if (test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) 561 - priv_flags |= PRIV_F_SW_DBG_STATS; 560 + priv_flags |= IONIC_PRIV_F_SW_DBG_STATS; 562 561 563 562 return priv_flags; 564 563 } ··· 568 567 struct ionic_lif *lif = netdev_priv(netdev); 569 568 570 569 clear_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state); 571 - if (priv_flags & PRIV_F_SW_DBG_STATS) 570 + if (priv_flags & IONIC_PRIV_F_SW_DBG_STATS) 572 571 set_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state); 573 572 574 573 return 0;
+2 -2
drivers/net/ethernet/pensando/ionic/ionic_lif.c
··· 199 199 200 200 static void ionic_intr_free(struct ionic *ionic, int index) 201 201 { 202 - if (index != INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs) 202 + if (index != IONIC_INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs) 203 203 clear_bit(index, ionic->intrs); 204 204 } 205 205 ··· 455 455 cpumask_set_cpu(new->intr.cpu, 456 456 &new->intr.affinity_mask); 457 457 } else { 458 - new->intr.index = INTR_INDEX_NOT_ASSIGNED; 458 + new->intr.index = IONIC_INTR_INDEX_NOT_ASSIGNED; 459 459 } 460 460 461 461 new->cq.info = devm_kzalloc(dev, sizeof(*new->cq.info) * num_descs,