| Message ID | 20240309224540.22682-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e27b02e23a701e5761f1d6028643e1203a1c56de |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ssb: drop use of non-existing CONFIG_SSB_DEBUG symbol | expand |
On Sat, 9 Mar 2024 14:45:38 -0800 Randy Dunlap <rdunlap@infradead.org> wrote: > -static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev) > -{ > -#ifdef CONFIG_SSB_DEBUG > - printk(KERN_ERR "SSB: BUG! Calling DMA API for " > - "unsupported bustype %d\n", dev->bus->bustype); > -#endif /* DEBUG */ > -} > - > #ifdef CONFIG_SSB_PCIHOST > /* PCI-host wrapper driver */ > extern int ssb_pcihost_register(struct pci_driver *driver); > diff -- a/drivers/ssb/main.c b/drivers/ssb/main.c > --- a/drivers/ssb/main.c > +++ b/drivers/ssb/main.c > @@ -1144,7 +1144,6 @@ u32 ssb_dma_translation(struct ssb_devic > return SSB_PCI_DMA; > } > default: > - __ssb_dma_not_implemented(dev); > } > return 0; > } > Acked-by: Michael Büsch <m@bues.ch>
Randy Dunlap <rdunlap@infradead.org> wrote: > CONFIG_SSB_DEBUG is used in one header file and nowhere else, so > remove it and the now-empty inline function that contained it. Also > remove the call to the empty inline function. The empty "default:" > case is kept to prevent 2 compiler warnings: > > drivers/ssb/main.c:1133:9: warning: enumeration value 'SSB_BUSTYPE_PCMCIA' not handled in switch [-Wswitch] > drivers/ssb/main.c:1133:9: warning: enumeration value 'SSB_BUSTYPE_SDIO' not handled in switch [-Wswitch] > > Reported-by: Ying Sun <sunying@isrc.iscas.ac.cn> > Link: https://lore.kernel.org/lkml/4e8525fe.607e2.18a8ddfdce8.Coremail.sunying@isrc.iscas.ac.cn/ > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Michael Büsch <m@bues.ch> > Cc: linux-wireless@vger.kernel.org > Cc: Kalle Valo <kvalo@kernel.org> > Acked-by: Michael Büsch <m@bues.ch> Patch applied to wireless-next.git, thanks. e27b02e23a70 ssb: drop use of non-existing CONFIG_SSB_DEBUG symbol
diff -- a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h @@ -621,14 +621,6 @@ extern u32 ssb_dma_translation(struct ss #define SSB_DMA_TRANSLATION_MASK 0xC0000000 #define SSB_DMA_TRANSLATION_SHIFT 30 -static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev) -{ -#ifdef CONFIG_SSB_DEBUG - printk(KERN_ERR "SSB: BUG! Calling DMA API for " - "unsupported bustype %d\n", dev->bus->bustype); -#endif /* DEBUG */ -} - #ifdef CONFIG_SSB_PCIHOST /* PCI-host wrapper driver */ extern int ssb_pcihost_register(struct pci_driver *driver); diff -- a/drivers/ssb/main.c b/drivers/ssb/main.c --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -1144,7 +1144,6 @@ u32 ssb_dma_translation(struct ssb_devic return SSB_PCI_DMA; } default: - __ssb_dma_not_implemented(dev); } return 0; }
CONFIG_SSB_DEBUG is used in one header file and nowhere else, so remove it and the now-empty inline function that contained it. Also remove the call to the empty inline function. The empty "default:" case is kept to prevent 2 compiler warnings: drivers/ssb/main.c:1133:9: warning: enumeration value 'SSB_BUSTYPE_PCMCIA' not handled in switch [-Wswitch] drivers/ssb/main.c:1133:9: warning: enumeration value 'SSB_BUSTYPE_SDIO' not handled in switch [-Wswitch] Reported-by: Ying Sun <sunying@isrc.iscas.ac.cn> Link: https://lore.kernel.org/lkml/4e8525fe.607e2.18a8ddfdce8.Coremail.sunying@isrc.iscas.ac.cn/ Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Michael Büsch <m@bues.ch> Cc: linux-wireless@vger.kernel.org Cc: Kalle Valo <kvalo@kernel.org> --- This Closes only 1 of the 3 issues reported in the Link. drivers/ssb/main.c | 1 - include/linux/ssb/ssb.h | 8 -------- 2 files changed, 9 deletions(-)