drm/nouveau: mark symbols static where possible
authorBaoyou Xie <baoyou.xie@linaro.org>
Mon, 24 Oct 2016 03:09:03 +0000 (11:09 +0800)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 7 Nov 2016 04:04:36 +0000 (14:04 +1000)
We get a few warnings when building kernel with W=1:
drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c:29:1: warning: no previous prototype for 'nvbios_fan_table' [-Wmissing-prototypes]
drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c:56:1: warning: no previous prototype for 'nvbios_fan_entry' [-Wmissing-prototypes]
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c:184:1: warning: no previous prototype for 'gt215_clk_info' [-Wmissing-prototypes]
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c:99:1: warning: no previous prototype for 'gt215_link_train_calc' [-Wmissing-prototypes]
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c:153:1: warning: no previous prototype for 'gt215_link_train' [-Wmissing-prototypes]
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c:271:1: warning: no previous prototype for 'gt215_link_train_init' [-Wmissing-prototypes]
....

In fact, both functions are only used in the file in which they are
declared and don't need a declaration, but can be made static.
So this patch marks these functions with 'static'.

Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
17 files changed:
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nv10_fence.c
drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c

index afbf557b23d4395f34c15a299a6b5e2e9510c924..b60ee21f4571d01dedcac2d18dcba6beaac11bce 100644 (file)
@@ -92,7 +92,7 @@ calc(int blanks, int blanke, int total, int line)
        return line;
 }
 
-int
+static int
 nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos,
                                ktime_t *stime, ktime_t *etime)
 {
index f99fcf56928a8daf123ff56e61afe0d2ed367eb5..bcf3a213d5d863ea5fca03aea2dd07ce5455c75a 100644 (file)
@@ -66,7 +66,7 @@ nv10_fence_context_del(struct nouveau_channel *chan)
        nouveau_fence_context_free(&fctx->base);
 }
 
-int
+static int
 nv10_fence_context_new(struct nouveau_channel *chan)
 {
        struct nv10_fence_chan *fctx;
index 79a8f71cf7884dc3e2307e12b591a194f8ae841a..513ee6b79553df3f459c9dad0ca2dcc62b63c6fe 100644 (file)
@@ -326,7 +326,7 @@ nvkm_udevice = {
        .sclass = nvkm_udevice_child_get,
 };
 
-int
+static int
 nvkm_udevice_new(const struct nvkm_oclass *oclass, void *data, u32 size,
                 struct nvkm_object **pobject)
 {
index dd2953bc926463cb1324d75a83d70a17bf1b7f9d..26990d44ae755f91619f7772e4398051dd622da9 100644 (file)
@@ -153,7 +153,7 @@ nv50_disp_chan_uevent = {
        .fini = nv50_disp_chan_uevent_fini,
 };
 
-int
+static int
 nv50_disp_chan_rd32(struct nvkm_object *object, u64 addr, u32 *data)
 {
        struct nv50_disp_chan *chan = nv50_disp_chan(object);
@@ -163,7 +163,7 @@ nv50_disp_chan_rd32(struct nvkm_object *object, u64 addr, u32 *data)
        return 0;
 }
 
-int
+static int
 nv50_disp_chan_wr32(struct nvkm_object *object, u64 addr, u32 data)
 {
        struct nv50_disp_chan *chan = nv50_disp_chan(object);
@@ -173,7 +173,7 @@ nv50_disp_chan_wr32(struct nvkm_object *object, u64 addr, u32 data)
        return 0;
 }
 
-int
+static int
 nv50_disp_chan_ntfy(struct nvkm_object *object, u32 type,
                    struct nvkm_event **pevent)
 {
@@ -189,7 +189,7 @@ nv50_disp_chan_ntfy(struct nvkm_object *object, u32 type,
        return -EINVAL;
 }
 
-int
+static int
 nv50_disp_chan_map(struct nvkm_object *object, u64 *addr, u32 *size)
 {
        struct nv50_disp_chan *chan = nv50_disp_chan(object);
index 2f9cecd81d04886e3699d3ecd4bab84a7fbd1f63..6424b396dcdeda2e8d470eb38bad3c455a16950f 100644 (file)
@@ -66,7 +66,7 @@ nv50_disp_root_scanoutpos(NV50_DISP_MTHD_V0)
        return 0;
 }
 
-int
+static int
 nv50_disp_root_mthd_(struct nvkm_object *object, u32 mthd, void *data, u32 size)
 {
        union {
index aeb3387a3fb0c09f7af3fe31a0e6a650c2f9fda4..15a992b3580a17b35c06567392a11523c629825d 100644 (file)
@@ -129,7 +129,7 @@ g84_fifo_chan_engine_fini(struct nvkm_fifo_chan *base,
 }
 
 
-int
+static int
 g84_fifo_chan_engine_init(struct nvkm_fifo_chan *base,
                          struct nvkm_engine *engine)
 {
@@ -170,7 +170,7 @@ g84_fifo_chan_engine_ctor(struct nvkm_fifo_chan *base,
        return nvkm_object_bind(object, NULL, 0, &chan->engn[engn]);
 }
 
-int
+static int
 g84_fifo_chan_object_ctor(struct nvkm_fifo_chan *base,
                          struct nvkm_object *object)
 {
index c925ade5880e708d6a2befde5cb2f26d02470fa2..74a64e3fd59ac56c00bebe786b9238feb83d7fd4 100644 (file)
@@ -218,7 +218,7 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info)
        }
 }
 
-void
+static void
 gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 {
        struct nvkm_device *device = gr->base.engine.subdev.device;
index 6d3c5011e18c98ddd6585529f22e5a6231b5710b..4c4b5ab6e46d1df1f7ab61f6d16f2f480d5fe154 100644 (file)
@@ -933,7 +933,7 @@ gm107_grctx_generate_attrib(struct gf100_grctx *info)
        }
 }
 
-void
+static void
 gm107_grctx_generate_tpcid(struct gf100_gr *gr)
 {
        struct nvkm_device *device = gr->base.engine.subdev.device;
index 157919c788e6f72261d6989a352c4f6fddf3a014..eccdee04107d39113240f8381eac86b0c983c97a 100644 (file)
@@ -1384,7 +1384,7 @@ gf100_gr_intr(struct nvkm_gr *base)
        nvkm_fifo_chan_put(device->fifo, flags, &chan);
 }
 
-void
+static void
 gf100_gr_init_fw(struct gf100_gr *gr, u32 fuc_base,
                 struct gf100_gr_fuc *code, struct gf100_gr_fuc *data)
 {
@@ -1701,7 +1701,7 @@ gf100_gr_oneinit(struct nvkm_gr *base)
        return 0;
 }
 
-int
+static int
 gf100_gr_init_(struct nvkm_gr *base)
 {
        struct gf100_gr *gr = gf100_gr(base);
index 45f965f608a73787a7026768bb75ec611485439f..2c67fac576d1f3e0afed511e1a09c6afef803c88 100644 (file)
@@ -308,7 +308,7 @@ gm107_gr_init_bios(struct gf100_gr *gr)
        }
 }
 
-int
+static int
 gm107_gr_init(struct gf100_gr *gr)
 {
        struct nvkm_device *device = gr->base.engine.subdev.device;
index 8616636ad7b407e49f49c981437d7799bc42696b..dde89a4a0f5b95a9d2d9869852e83585d339fcaf 100644 (file)
@@ -71,7 +71,7 @@ nvkm_perfdom_find(struct nvkm_pm *pm, int di)
        return NULL;
 }
 
-struct nvkm_perfsig *
+static struct nvkm_perfsig *
 nvkm_perfsig_find(struct nvkm_pm *pm, u8 di, u8 si, struct nvkm_perfdom **pdom)
 {
        struct nvkm_perfdom *dom = *pdom;
@@ -699,7 +699,7 @@ nvkm_pm_oclass_get(struct nvkm_oclass *oclass, int index,
        return 1;
 }
 
-int
+static int
 nvkm_perfsrc_new(struct nvkm_pm *pm, struct nvkm_perfsig *sig,
                 const struct nvkm_specsrc *spec)
 {
index 80fed7e78dcbe0bc1e7df6a864c3efb475c2733a..e2905815049bb9db408b742735a3bf85f43c6c17 100644 (file)
@@ -25,7 +25,7 @@
 #include <subdev/bios/bit.h>
 #include <subdev/bios/fan.h>
 
-u16
+static u16
 nvbios_fan_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len)
 {
        struct bit_entry bit_P;
@@ -52,7 +52,7 @@ nvbios_fan_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len)
        return 0x0000;
 }
 
-u16
+static u16
 nvbios_fan_entry(struct nvkm_bios *bios, int idx, u8 *ver, u8 *hdr,
                 u8 *cnt, u8 *len)
 {
index 056702ef69aa44eb5ce6cacb330674a68225ffbd..96e0941c8edd94d619d89e57ad08e01e47178632 100644 (file)
@@ -180,7 +180,7 @@ gt215_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
        return 0;
 }
 
-int
+static int
 gt215_clk_info(struct nvkm_clk *base, int idx, u32 khz,
               struct gt215_clk_info *info)
 {
index d15ea886df270d4a1652ec9a5c56e68cea3f85e3..f10664372161d589b60b896b6277c8d95f473305 100644 (file)
@@ -95,7 +95,7 @@ struct gt215_ram {
        struct gt215_ltrain ltrain;
 };
 
-void
+static void
 gt215_link_train_calc(u32 *vals, struct gt215_ltrain *train)
 {
        int i, lo, hi;
@@ -149,7 +149,7 @@ gt215_link_train_calc(u32 *vals, struct gt215_ltrain *train)
 /*
  * Link training for (at least) DDR3
  */
-int
+static int
 gt215_link_train(struct gt215_ram *ram)
 {
        struct gt215_ltrain *train = &ram->ltrain;
@@ -267,7 +267,7 @@ out:
        return ret;
 }
 
-int
+static int
 gt215_link_train_init(struct gt215_ram *ram)
 {
        static const u32 pattern[16] = {
@@ -333,7 +333,7 @@ gt215_link_train_init(struct gt215_ram *ram)
        return 0;
 }
 
-void
+static void
 gt215_link_train_fini(struct gt215_ram *ram)
 {
        if (ram->ltrain.mem)
index 3f45afd17d5a683dce70f84017cb7da240514fcd..2ead515b853095e5e69a847d47d63e12d98c9e0d 100644 (file)
@@ -37,7 +37,7 @@ gk104_gpio_intr_stat(struct nvkm_gpio *gpio, u32 *hi, u32 *lo)
        nvkm_wr32(device, 0x00dc80, intr1);
 }
 
-void
+static void
 gk104_gpio_intr_mask(struct nvkm_gpio *gpio, u32 type, u32 mask, u32 data)
 {
        struct nvkm_device *device = gpio->subdev.device;
index f1e2dc914366d6bf2d10b5c18eb530ac6c4124ce..ec48e4ace37a295c4b329f346e1dae5169989ddb 100644 (file)
@@ -1364,7 +1364,7 @@ gm200_secboot_init(struct nvkm_secboot *sb)
        return 0;
 }
 
-int
+static int
 gm200_secboot_fini(struct nvkm_secboot *sb, bool suspend)
 {
        struct gm200_secboot *gsb = gm200_secboot(sb);
index b2c5d1166a1394ebda84b739811b62db7d939fd8..1c744e029454030e04c3003a7db803ae83b59e28 100644 (file)
@@ -35,7 +35,7 @@ struct gk104_volt {
        struct nvbios_volt bios;
 };
 
-int
+static int
 gk104_volt_get(struct nvkm_volt *base)
 {
        struct nvbios_volt *bios = &gk104_volt(base)->bios;
@@ -48,7 +48,7 @@ gk104_volt_get(struct nvkm_volt *base)
        return bios->base + bios->pwm_range * duty / div;
 }
 
-int
+static int
 gk104_volt_set(struct nvkm_volt *base, u32 uv)
 {
        struct nvbios_volt *bios = &gk104_volt(base)->bios;