| Message ID | 8421aa2c148d840b11b7115208e5276017999c2a.1627068552.git.geoff@infradead.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v4,01/10] net/ps3_gelic: Add gelic_descr structures | expand |
Le 23/07/2021 à 22:31, Geoff Levand a écrit : > In an effort to make the PS3 gelic driver easier to maintain, change the > gelic_card_enable_rxdmac routine to use the optimizer to remove > debug code. > > Signed-off-by: Geoff Levand <geoff@infradead.org> WARNING:VSPRINTF_SPECIFIER_PX: Using vsprintf specifier '%px' potentially exposes the kernel memory layout, if you don't really need the address please consider using '%p'. #38: FILE: drivers/net/ethernet/toshiba/ps3_gelic_net.c:171: + dev_err(dev, "%s:%d: head=%px\n", __func__, __LINE__, + card->rx_chain.head); NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. Commit 65f38d9720ac ("net/ps3_gelic: Cleanup debug code") has style problems, please review. NOTE: Ignored message types: ARCH_INCLUDE_LINUX BIT_MACRO COMPARISON_TO_NULL DT_SPLIT_BINDING_PATCH EMAIL_SUBJECT FILE_PATH_CHANGES GLOBAL_INITIALISERS LINE_SPACING MULTIPLE_ASSIGNMENTS > --- > drivers/net/ethernet/toshiba/ps3_gelic_net.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c > index 54e50ad9e629..85fc1915c8be 100644 > --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c > +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c > @@ -162,17 +162,16 @@ static void gelic_card_enable_rxdmac(struct gelic_card *card) > struct device *dev = ctodev(card); > int status; > > -#ifdef DEBUG > - if (gelic_descr_get_status(card->rx_chain.head) != > - GELIC_DESCR_DMA_CARDOWNED) { > - printk(KERN_ERR "%s: status=%x\n", __func__, > - be32_to_cpu(card->rx_chain.head->dmac_cmd_status)); > - printk(KERN_ERR "%s: nextphy=%x\n", __func__, > - be32_to_cpu(card->rx_chain.head->hw_regs.next_descr_addr)); > - printk(KERN_ERR "%s: head=%p\n", __func__, > - card->rx_chain.head); > + if (__is_defined(DEBUG) && (gelic_descr_get_status(card->rx_chain.head) > + != GELIC_DESCR_DMA_CARDOWNED)) { > + dev_err(dev, "%s:%d: status=%x\n", __func__, __LINE__, > + be32_to_cpu(card->rx_chain.head->hw_regs.dmac_cmd_status)); > + dev_err(dev, "%s:%d: nextphy=%x\n", __func__, __LINE__, > + be32_to_cpu(card->rx_chain.head->hw_regs.next_descr_addr)); > + dev_err(dev, "%s:%d: head=%px\n", __func__, __LINE__, > + card->rx_chain.head); > } > -#endif > + > status = lv1_net_start_rx_dma(bus_id(card), dev_id(card), > card->rx_chain.head->link.cpu_addr, 0); > >
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c index 54e50ad9e629..85fc1915c8be 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c @@ -162,17 +162,16 @@ static void gelic_card_enable_rxdmac(struct gelic_card *card) struct device *dev = ctodev(card); int status; -#ifdef DEBUG - if (gelic_descr_get_status(card->rx_chain.head) != - GELIC_DESCR_DMA_CARDOWNED) { - printk(KERN_ERR "%s: status=%x\n", __func__, - be32_to_cpu(card->rx_chain.head->dmac_cmd_status)); - printk(KERN_ERR "%s: nextphy=%x\n", __func__, - be32_to_cpu(card->rx_chain.head->hw_regs.next_descr_addr)); - printk(KERN_ERR "%s: head=%p\n", __func__, - card->rx_chain.head); + if (__is_defined(DEBUG) && (gelic_descr_get_status(card->rx_chain.head) + != GELIC_DESCR_DMA_CARDOWNED)) { + dev_err(dev, "%s:%d: status=%x\n", __func__, __LINE__, + be32_to_cpu(card->rx_chain.head->hw_regs.dmac_cmd_status)); + dev_err(dev, "%s:%d: nextphy=%x\n", __func__, __LINE__, + be32_to_cpu(card->rx_chain.head->hw_regs.next_descr_addr)); + dev_err(dev, "%s:%d: head=%px\n", __func__, __LINE__, + card->rx_chain.head); } -#endif + status = lv1_net_start_rx_dma(bus_id(card), dev_id(card), card->rx_chain.head->link.cpu_addr, 0);
In an effort to make the PS3 gelic driver easier to maintain, change the gelic_card_enable_rxdmac routine to use the optimizer to remove debug code. Signed-off-by: Geoff Levand <geoff@infradead.org> --- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)