| Message ID | 20191009120522.17019-1-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8856c5064834a2600fbe99d4b6de041e6a40621a |
| Headers | show |
| Series | drm/msm/mdp5: make config variables static | expand |
On Wed, Oct 09, 2019 at 01:05:22PM +0100, Ben Dooks wrote: > A number of the config structs are not exported so make > them static to avoid the following sparse warnings: > > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:17:26: warning: symbol 'msm8x74v1_config' was not declared. Should it be static? > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:101:26: warning: symbol 'msm8x74v2_config' was not declared. Should it be static? > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:183:26: warning: symbol 'apq8084_config' was not declared. Should it be static? > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:278:26: warning: symbol 'msm8x16_config' was not declared. Should it be static? > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:345:26: warning: symbol 'msm8x94_config' was not declared. Should it be static? > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:440:26: warning: symbol 'msm8x96_config' was not declared. Should it be static? > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:548:26: warning: symbol 'msm8917_config' was not declared. Should it be static? > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:633:26: warning: symbol 'msm8998_config' was not declared. Should it be static? > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Applied to msm-next, thanks for the patch! Sean > --- > Cc: Rob Clark <robdclark@gmail.com> > Cc: Sean Paul <sean@poorly.run> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: linux-arm-msm@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: freedreno@lists.freedesktop.org > --- > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c > index f6e71ff539ca..7c9c1ddae821 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c > @@ -14,7 +14,7 @@ struct mdp5_cfg_handler { > /* mdp5_cfg must be exposed (used in mdp5.xml.h) */ > const struct mdp5_cfg_hw *mdp5_cfg = NULL; > > -const struct mdp5_cfg_hw msm8x74v1_config = { > +static const struct mdp5_cfg_hw msm8x74v1_config = { > .name = "msm8x74v1", > .mdp = { > .count = 1, > @@ -98,7 +98,7 @@ const struct mdp5_cfg_hw msm8x74v1_config = { > .max_clk = 200000000, > }; > > -const struct mdp5_cfg_hw msm8x74v2_config = { > +static const struct mdp5_cfg_hw msm8x74v2_config = { > .name = "msm8x74", > .mdp = { > .count = 1, > @@ -180,7 +180,7 @@ const struct mdp5_cfg_hw msm8x74v2_config = { > .max_clk = 200000000, > }; > > -const struct mdp5_cfg_hw apq8084_config = { > +static const struct mdp5_cfg_hw apq8084_config = { > .name = "apq8084", > .mdp = { > .count = 1, > @@ -275,7 +275,7 @@ const struct mdp5_cfg_hw apq8084_config = { > .max_clk = 320000000, > }; > > -const struct mdp5_cfg_hw msm8x16_config = { > +static const struct mdp5_cfg_hw msm8x16_config = { > .name = "msm8x16", > .mdp = { > .count = 1, > @@ -342,7 +342,7 @@ const struct mdp5_cfg_hw msm8x16_config = { > .max_clk = 320000000, > }; > > -const struct mdp5_cfg_hw msm8x94_config = { > +static const struct mdp5_cfg_hw msm8x94_config = { > .name = "msm8x94", > .mdp = { > .count = 1, > @@ -437,7 +437,7 @@ const struct mdp5_cfg_hw msm8x94_config = { > .max_clk = 400000000, > }; > > -const struct mdp5_cfg_hw msm8x96_config = { > +static const struct mdp5_cfg_hw msm8x96_config = { > .name = "msm8x96", > .mdp = { > .count = 1, > @@ -545,7 +545,7 @@ const struct mdp5_cfg_hw msm8x96_config = { > .max_clk = 412500000, > }; > > -const struct mdp5_cfg_hw msm8917_config = { > +static const struct mdp5_cfg_hw msm8917_config = { > .name = "msm8917", > .mdp = { > .count = 1, > @@ -630,7 +630,7 @@ const struct mdp5_cfg_hw msm8917_config = { > .max_clk = 320000000, > }; > > -const struct mdp5_cfg_hw msm8998_config = { > +static const struct mdp5_cfg_hw msm8998_config = { > .name = "msm8998", > .mdp = { > .count = 1, > -- > 2.23.0 >
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c index f6e71ff539ca..7c9c1ddae821 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c @@ -14,7 +14,7 @@ struct mdp5_cfg_handler { /* mdp5_cfg must be exposed (used in mdp5.xml.h) */ const struct mdp5_cfg_hw *mdp5_cfg = NULL; -const struct mdp5_cfg_hw msm8x74v1_config = { +static const struct mdp5_cfg_hw msm8x74v1_config = { .name = "msm8x74v1", .mdp = { .count = 1, @@ -98,7 +98,7 @@ const struct mdp5_cfg_hw msm8x74v1_config = { .max_clk = 200000000, }; -const struct mdp5_cfg_hw msm8x74v2_config = { +static const struct mdp5_cfg_hw msm8x74v2_config = { .name = "msm8x74", .mdp = { .count = 1, @@ -180,7 +180,7 @@ const struct mdp5_cfg_hw msm8x74v2_config = { .max_clk = 200000000, }; -const struct mdp5_cfg_hw apq8084_config = { +static const struct mdp5_cfg_hw apq8084_config = { .name = "apq8084", .mdp = { .count = 1, @@ -275,7 +275,7 @@ const struct mdp5_cfg_hw apq8084_config = { .max_clk = 320000000, }; -const struct mdp5_cfg_hw msm8x16_config = { +static const struct mdp5_cfg_hw msm8x16_config = { .name = "msm8x16", .mdp = { .count = 1, @@ -342,7 +342,7 @@ const struct mdp5_cfg_hw msm8x16_config = { .max_clk = 320000000, }; -const struct mdp5_cfg_hw msm8x94_config = { +static const struct mdp5_cfg_hw msm8x94_config = { .name = "msm8x94", .mdp = { .count = 1, @@ -437,7 +437,7 @@ const struct mdp5_cfg_hw msm8x94_config = { .max_clk = 400000000, }; -const struct mdp5_cfg_hw msm8x96_config = { +static const struct mdp5_cfg_hw msm8x96_config = { .name = "msm8x96", .mdp = { .count = 1, @@ -545,7 +545,7 @@ const struct mdp5_cfg_hw msm8x96_config = { .max_clk = 412500000, }; -const struct mdp5_cfg_hw msm8917_config = { +static const struct mdp5_cfg_hw msm8917_config = { .name = "msm8917", .mdp = { .count = 1, @@ -630,7 +630,7 @@ const struct mdp5_cfg_hw msm8917_config = { .max_clk = 320000000, }; -const struct mdp5_cfg_hw msm8998_config = { +static const struct mdp5_cfg_hw msm8998_config = { .name = "msm8998", .mdp = { .count = 1,
A number of the config structs are not exported so make them static to avoid the following sparse warnings: drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:17:26: warning: symbol 'msm8x74v1_config' was not declared. Should it be static? drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:101:26: warning: symbol 'msm8x74v2_config' was not declared. Should it be static? drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:183:26: warning: symbol 'apq8084_config' was not declared. Should it be static? drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:278:26: warning: symbol 'msm8x16_config' was not declared. Should it be static? drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:345:26: warning: symbol 'msm8x94_config' was not declared. Should it be static? drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:440:26: warning: symbol 'msm8x96_config' was not declared. Should it be static? drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:548:26: warning: symbol 'msm8917_config' was not declared. Should it be static? drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c:633:26: warning: symbol 'msm8998_config' was not declared. Should it be static? Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- Cc: Rob Clark <robdclark@gmail.com> Cc: Sean Paul <sean@poorly.run> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: linux-arm-msm@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org --- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)