On Sat, May 21, 2022 at 12:04:54AM +0300, Pavel Skripkin wrote:
> Hi Phillip,
>
> On 5/20/22 01:10, Phillip Potter wrote:
> > Remove include/rtw_debug.h, as all it now has are:
> >
> > (1) A load of unused preprocessor definitions that expand to BIT(x)
> > variants.
> > (2) A preprocessor definition that expands to the name of the driver
> > and is only used in one place inside a pr_info_once call in
> > core/rtw_fw.c.
> >
> > It is now surplus to requirements after fixing up the few places that
> > include the file.
> >
> > Signed-off-by: Phillip Potter <phil@xxxxxxxxxxxxxxxx>
> > ---
> > drivers/staging/r8188eu/core/rtw_fw.c | 4 +-
> > drivers/staging/r8188eu/include/drv_types.h | 1 -
> > drivers/staging/r8188eu/include/rtw_debug.h | 45 --------------------
> > drivers/staging/r8188eu/os_dep/ioctl_linux.c | 1 -
> > 4 files changed, 2 insertions(+), 49 deletions(-)
> > delete mode 100644 drivers/staging/r8188eu/include/rtw_debug.h
> >
> > diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c
> > index bf077876ed3d..0451e5177644 100644
> > --- a/drivers/staging/r8188eu/core/rtw_fw.c
> > +++ b/drivers/staging/r8188eu/core/rtw_fw.c
> > @@ -259,8 +259,8 @@ int rtl8188e_firmware_download(struct adapter *padapter)
> > fwhdr = (struct rt_firmware_hdr *)dvobj->firmware.data;
> > if (IS_FW_HEADER_EXIST(fwhdr)) {
> > - pr_info_once("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n",
> > - DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion,
> > + pr_info_once("R8188EU: Firmware Version %d, SubVersion %d, Signature 0x%x\n",
> > + le16_to_cpu(fwhdr->version), fwhdr->subversion,
> > le16_to_cpu(fwhdr->signature));
>
> What about converting this macro to dev_info_once()? IMO, looks cleaner:
>
> [ 27.985218] r8188eu 2-1:1.0: Firmware Version 11, SubVersion 1, Signature
> 0x88e1
>
>
>
>
> With regards,
> Pavel Skripkin
Hi Pavel,
Yes, good idea, I like it. This patch has been merged now, but I will
submit another to do this. Many thanks for the suggestion.
Regards,
Phil
