Conflict between arch/powerpc/include/asm/disassemble.h and drivers/staging/rtl8723bs/include/wifi.h

Hello,

I was trying to include powerpc asm/disassemble.h in some more widely used headers in order to 
reduce open coding, and I'm facing the following problem:

drivers/staging/rtl8723bs/include/wifi.h:237:30: error: conflicting types for 'get_ra'
drivers/staging/rtl8723bs/include/wifi.h:237:30: error: conflicting types for 'get_ra'
make[4]: *** [scripts/Makefile.build:272: drivers/staging/rtl8723bs/core/rtw_btcoex.o] Error 1
make[4]: *** [scripts/Makefile.build:272: drivers/staging/rtl8723bs/core/rtw_ap.o] Error 1
make[3]: *** [scripts/Makefile.build:515: drivers/staging/rtl8723bs] Error 2

(More details at http://kisskb.ellerman.id.au/kisskb/head/ee2dedcaaf3fe176e68498018632767d02639d03/)

Taking into account that asm/disassemble.h has been existing since 2008 while 
rtl8723bs/include/wifi.h was created in 2017, and that the get_ra() defined in the later is used at 
exactly one place only, would it be possible to change it there ? 
(https://elixir.bootlin.com/linux/v5.13-rc2/A/ident/get_ra)

Thanks
Christophe

On Thu, May 20, 2021 at 07:30:49AM +0200, Christophe Leroy wrote:

Hello,

I was trying to include powerpc asm/disassemble.h in some more widely used
headers in order to reduce open coding, and I'm facing the following
problem:

drivers/staging/rtl8723bs/include/wifi.h:237:30: error: conflicting types for 'get_ra'
drivers/staging/rtl8723bs/include/wifi.h:237:30: error: conflicting types for 'get_ra'
make[4]: *** [scripts/Makefile.build:272: drivers/staging/rtl8723bs/core/rtw_btcoex.o] Error 1
make[4]: *** [scripts/Makefile.build:272: drivers/staging/rtl8723bs/core/rtw_ap.o] Error 1
make[3]: *** [scripts/Makefile.build:515: drivers/staging/rtl8723bs] Error 2

(More details at http://kisskb.ellerman.id.au/kisskb/head/ee2dedcaaf3fe176e68498018632767d02639d03/)

Taking into account that asm/disassemble.h has been existing since 2008
while rtl8723bs/include/wifi.h was created in 2017, and that the get_ra()
defined in the later is used at exactly one place only, would it be possible
to change it there ?
(https://elixir.bootlin.com/linux/v5.13-rc2/A/ident/get_ra)

Yes, the staging code can change, I'll make a patch for it after
coffee...