Re: [PATCH] staging: wfx: remove unused included header files

From: Greg KH
Date: Tue Mar 09 2021 - 09:55:50 EST


On Tue, Mar 09, 2021 at 02:45:56PM +0100, Jérôme Pouiller wrote:
> On Tuesday 9 March 2021 14:07:43 CET Greg KH wrote:
> > On Thu, Mar 04, 2021 at 10:43:45AM +0100, Jérôme Pouiller wrote:
> > > Hello Greg,
> > >
> > > On Tuesday 2 March 2021 16:01:25 CET Jérôme Pouiller wrote:
> > > > Hello Muhammad,
> > > >
> > > > Sorry, I am a bit late for the review of this patch. Thank you for
> your
> > > > contribution.
> > > >
> > > > On Thursday 11 February 2021 15:36:37 CET Muhammad Usama Anjum
> wrote:
> > > > >
> > > > > Many header files have been included, but never used. Those
> header
> > > > > files have been removed.
> > > > >
> > > > > Signed-off-by: Muhammad Usama Anjum <musamaanjum@xxxxxxxxx>
> > > > > ---
> > > > > drivers/staging/wfx/bh.c | 1 -
> > > > > drivers/staging/wfx/bh.h | 4 ----
> > > > > drivers/staging/wfx/bus.h | 3 ---
> > > > > drivers/staging/wfx/bus_sdio.c | 6 ------
> > > > > drivers/staging/wfx/bus_spi.c | 7 -------
> > > > > drivers/staging/wfx/data_rx.c | 5 -----
> > > > > drivers/staging/wfx/data_tx.c | 5 -----
> > > > > drivers/staging/wfx/data_tx.h | 3 ---
> > > > > drivers/staging/wfx/debug.c | 6 ------
> > > > > drivers/staging/wfx/fwio.c | 2 --
> > > > > drivers/staging/wfx/hif_api_cmd.h | 4 ----
> > > > > drivers/staging/wfx/hif_api_general.h | 9 ---------
> > > > > drivers/staging/wfx/hif_tx.c | 4 ----
> > > > > drivers/staging/wfx/hif_tx_mib.c | 5 -----
> > > > > drivers/staging/wfx/hwio.c | 3 ---
> > > > > drivers/staging/wfx/hwio.h | 2 --
> > > > > drivers/staging/wfx/key.c | 2 --
> > > > > drivers/staging/wfx/key.h | 2 --
> > > > > drivers/staging/wfx/main.c | 7 -------
> > > > > drivers/staging/wfx/main.h | 3 ---
> > > > > drivers/staging/wfx/queue.c | 4 ----
> > > > > drivers/staging/wfx/queue.h | 3 ---
> > > > > drivers/staging/wfx/scan.h | 2 --
> > > > > drivers/staging/wfx/sta.c | 6 ------
> > > > > drivers/staging/wfx/sta.h | 2 --
> > > > > drivers/staging/wfx/traces.h | 3 ---
> > > > > drivers/staging/wfx/wfx.h | 3 ---
> > > > > 27 files changed, 106 deletions(-)
> > > > >
> > > > > diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c
> > > > > index ed53d0b45592..cd6bcfdfbe9a 100644
> > > > > --- a/drivers/staging/wfx/bh.c
> > > > > +++ b/drivers/staging/wfx/bh.c
> > > > > @@ -5,7 +5,6 @@
> > > > > * Copyright (c) 2017-2020, Silicon Laboratories, Inc.
> > > > > * Copyright (c) 2010, ST-Ericsson
> > > > > */
> > > > > -#include <linux/gpio/consumer.h>
> > > > > #include <net/mac80211.h>
> > > >
> > > > Though bh.c refers to gpiod_set_value_cansleep()
> > > >
> > > >
> > > > > #include "bh.h"
> > > > > diff --git a/drivers/staging/wfx/bh.h b/drivers/staging/wfx/bh.h
> > > > > index 78c49329e22a..92ef3298d4ac 100644
> > > > > --- a/drivers/staging/wfx/bh.h
> > > > > +++ b/drivers/staging/wfx/bh.h
> > > > > @@ -8,10 +8,6 @@
> > > > > #ifndef WFX_BH_H
> > > > > #define WFX_BH_H
> > > > >
> > > > > -#include <linux/atomic.h>
> > > > > -#include <linux/wait.h>
> > > > > -#include <linux/workqueue.h>
> > > > > -
> > > > > struct wfx_dev;
> > > > >
> > > > > struct wfx_hif {
> > > >
> > > > Ditto, bh.h refers to atomic_t, struct work_struct and struct
> > > > completion. If you try to compile bh.h alone (with something like
> > > > gcc -xc .../bh.h) it won't work.
> > > >
> > > > Maybe it works now because we are lucky in the order the headers
> are
> > > > included, but I think it is not sufficient.
> > > >
> > > > [... same problem repeats multiple times in the following ...]
> > > >
> > >
> > > Greg, if nobody has any opinion on that, I think that this patch
> should
> > > be reverted.
> >
> > Nothing is breaking, why should it be reverted?
>
> Because it is less maintainable?
>
> > You never build a .h file alone :)
>
> hmmm... notwithstanding, I thing that the code should not depend on the
> order the headers are included. You don't?
>
> > Anyway, sure, I'll revert it, what is the commit id?
>
> commit 314fd52f01ea "staging: wfx: remove unused included header files"

Now reverted, thanks.

greg k-h