diff options
author | Hannes Eder <hannes@hanneseder.net> | 2008-12-18 15:18:47 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-12-29 02:47:26 -0500 |
commit | b358d0a6252d8ed16afb20caaec35b24c76074bb (patch) | |
tree | 7de8d283b0dfc20c3233489dfde88554f3051040 /drivers/gpu | |
parent | 95281e352e19b670458563a5ca746195c183a98f (diff) |
drm/i915: fix sparse warnings: make symbols static
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_opregion.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 2 |
9 files changed, 23 insertions, 22 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 0dee776b91fb..b8723b7a75b6 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -821,8 +821,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data, | |||
821 | * some RAM for the framebuffer at early boot. This code figures out | 821 | * some RAM for the framebuffer at early boot. This code figures out |
822 | * how much was set aside so we can use it for our own purposes. | 822 | * how much was set aside so we can use it for our own purposes. |
823 | */ | 823 | */ |
824 | int i915_probe_agp(struct drm_device *dev, unsigned long *aperture_size, | 824 | static int i915_probe_agp(struct drm_device *dev, unsigned long *aperture_size, |
825 | unsigned long *preallocated_size) | 825 | unsigned long *preallocated_size) |
826 | { | 826 | { |
827 | struct pci_dev *bridge_dev; | 827 | struct pci_dev *bridge_dev; |
828 | u16 tmp = 0; | 828 | u16 tmp = 0; |
@@ -1007,7 +1007,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) | |||
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | 1009 | ||
1010 | int i915_driver_firstopen(struct drm_device *dev) | 1010 | static int i915_driver_firstopen(struct drm_device *dev) |
1011 | { | 1011 | { |
1012 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | 1012 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
1013 | return 0; | 1013 | return 0; |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index cbee41c32417..f8b3df0926c0 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "drm_pciids.h" | 35 | #include "drm_pciids.h" |
36 | #include <linux/console.h> | 36 | #include <linux/console.h> |
37 | 37 | ||
38 | unsigned int i915_modeset = -1; | 38 | static unsigned int i915_modeset = -1; |
39 | module_param_named(modeset, i915_modeset, int, 0400); | 39 | module_param_named(modeset, i915_modeset, int, 0400); |
40 | 40 | ||
41 | unsigned int i915_fbpercrtc = 0; | 41 | unsigned int i915_fbpercrtc = 0; |
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 13ae731a33db..ff012835a386 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c | |||
@@ -257,8 +257,8 @@ void opregion_enable_asle(struct drm_device *dev) | |||
257 | 257 | ||
258 | static struct intel_opregion *system_opregion; | 258 | static struct intel_opregion *system_opregion; |
259 | 259 | ||
260 | int intel_opregion_video_event(struct notifier_block *nb, unsigned long val, | 260 | static int intel_opregion_video_event(struct notifier_block *nb, |
261 | void *data) | 261 | unsigned long val, void *data) |
262 | { | 262 | { |
263 | /* The only video events relevant to opregion are 0x80. These indicate | 263 | /* The only video events relevant to opregion are 0x80. These indicate |
264 | either a docking event, lid switch or display switch request. In | 264 | either a docking event, lid switch or display switch request. In |
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 5d9c94eb7055..dcaed3466e83 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
@@ -237,7 +237,7 @@ static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs | |||
237 | .best_encoder = intel_best_encoder, | 237 | .best_encoder = intel_best_encoder, |
238 | }; | 238 | }; |
239 | 239 | ||
240 | void intel_crt_enc_destroy(struct drm_encoder *encoder) | 240 | static void intel_crt_enc_destroy(struct drm_encoder *encoder) |
241 | { | 241 | { |
242 | drm_encoder_cleanup(encoder); | 242 | drm_encoder_cleanup(encoder); |
243 | } | 243 | } |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5689e44d30b3..579dc42a6464 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -343,7 +343,7 @@ intel_wait_for_vblank(struct drm_device *dev) | |||
343 | udelay(20000); | 343 | udelay(20000); |
344 | } | 344 | } |
345 | 345 | ||
346 | void | 346 | static void |
347 | intel_pipe_set_base(struct drm_crtc *crtc, int x, int y) | 347 | intel_pipe_set_base(struct drm_crtc *crtc, int x, int y) |
348 | { | 348 | { |
349 | struct drm_device *dev = crtc->dev; | 349 | struct drm_device *dev = crtc->dev; |
@@ -1329,7 +1329,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { | |||
1329 | }; | 1329 | }; |
1330 | 1330 | ||
1331 | 1331 | ||
1332 | void intel_crtc_init(struct drm_device *dev, int pipe) | 1332 | static void intel_crtc_init(struct drm_device *dev, int pipe) |
1333 | { | 1333 | { |
1334 | struct intel_crtc *intel_crtc; | 1334 | struct intel_crtc *intel_crtc; |
1335 | int i; | 1335 | int i; |
@@ -1375,7 +1375,7 @@ struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe) | |||
1375 | return crtc; | 1375 | return crtc; |
1376 | } | 1376 | } |
1377 | 1377 | ||
1378 | int intel_connector_clones(struct drm_device *dev, int type_mask) | 1378 | static int intel_connector_clones(struct drm_device *dev, int type_mask) |
1379 | { | 1379 | { |
1380 | int index_mask = 0; | 1380 | int index_mask = 0; |
1381 | struct drm_connector *connector; | 1381 | struct drm_connector *connector; |
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 008bfaed4614..cc621c82ad2b 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c | |||
@@ -43,7 +43,7 @@ extern struct intel_dvo_dev_ops ivch_ops; | |||
43 | extern struct intel_dvo_dev_ops tfp410_ops; | 43 | extern struct intel_dvo_dev_ops tfp410_ops; |
44 | extern struct intel_dvo_dev_ops ch7017_ops; | 44 | extern struct intel_dvo_dev_ops ch7017_ops; |
45 | 45 | ||
46 | struct intel_dvo_device intel_dvo_devices[] = { | 46 | static struct intel_dvo_device intel_dvo_devices[] = { |
47 | { | 47 | { |
48 | .type = INTEL_DVO_CHIP_TMDS, | 48 | .type = INTEL_DVO_CHIP_TMDS, |
49 | .name = "sil164", | 49 | .name = "sil164", |
@@ -335,7 +335,7 @@ static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs | |||
335 | .best_encoder = intel_best_encoder, | 335 | .best_encoder = intel_best_encoder, |
336 | }; | 336 | }; |
337 | 337 | ||
338 | void intel_dvo_enc_destroy(struct drm_encoder *encoder) | 338 | static void intel_dvo_enc_destroy(struct drm_encoder *encoder) |
339 | { | 339 | { |
340 | drm_encoder_cleanup(encoder); | 340 | drm_encoder_cleanup(encoder); |
341 | } | 341 | } |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index bbf3e7f54f1e..3e38da0f6096 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -338,7 +338,7 @@ static void intelfb_off(struct fb_info *info, int dpms_mode) | |||
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
341 | int intelfb_blank(int blank, struct fb_info *info) | 341 | static int intelfb_blank(int blank, struct fb_info *info) |
342 | { | 342 | { |
343 | switch (blank) { | 343 | switch (blank) { |
344 | case FB_BLANK_UNBLANK: | 344 | case FB_BLANK_UNBLANK: |
@@ -428,10 +428,10 @@ static struct notifier_block paniced = { | |||
428 | .notifier_call = intelfb_panic, | 428 | .notifier_call = intelfb_panic, |
429 | }; | 429 | }; |
430 | 430 | ||
431 | int intelfb_create(struct drm_device *dev, uint32_t fb_width, | 431 | static int intelfb_create(struct drm_device *dev, uint32_t fb_width, |
432 | uint32_t fb_height, uint32_t surface_width, | 432 | uint32_t fb_height, uint32_t surface_width, |
433 | uint32_t surface_height, | 433 | uint32_t surface_height, |
434 | struct intel_framebuffer **intel_fb_p) | 434 | struct intel_framebuffer **intel_fb_p) |
435 | { | 435 | { |
436 | struct fb_info *info; | 436 | struct fb_info *info; |
437 | struct intelfb_par *par; | 437 | struct intelfb_par *par; |
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 626258d72c90..fbbaa4f414a0 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -59,7 +59,7 @@ struct intel_sdvo_priv { | |||
59 | * SDVOB and SDVOC to work around apparent hardware issues (according to | 59 | * SDVOB and SDVOC to work around apparent hardware issues (according to |
60 | * comments in the BIOS). | 60 | * comments in the BIOS). |
61 | */ | 61 | */ |
62 | void intel_sdvo_write_sdvox(struct intel_output *intel_output, u32 val) | 62 | static void intel_sdvo_write_sdvox(struct intel_output *intel_output, u32 val) |
63 | { | 63 | { |
64 | struct drm_device *dev = intel_output->base.dev; | 64 | struct drm_device *dev = intel_output->base.dev; |
65 | struct drm_i915_private *dev_priv = dev->dev_private; | 65 | struct drm_i915_private *dev_priv = dev->dev_private; |
@@ -296,7 +296,7 @@ static u8 intel_sdvo_read_response(struct intel_output *intel_output, | |||
296 | return status; | 296 | return status; |
297 | } | 297 | } |
298 | 298 | ||
299 | int intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode) | 299 | static int intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode) |
300 | { | 300 | { |
301 | if (mode->clock >= 100000) | 301 | if (mode->clock >= 100000) |
302 | return 1; | 302 | return 1; |
@@ -311,7 +311,8 @@ int intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode) | |||
311 | * SDVO chips which defeats the purpose of doing a bus switch in the first | 311 | * SDVO chips which defeats the purpose of doing a bus switch in the first |
312 | * place. | 312 | * place. |
313 | */ | 313 | */ |
314 | void intel_sdvo_set_control_bus_switch(struct intel_output *intel_output, u8 target) | 314 | static void intel_sdvo_set_control_bus_switch(struct intel_output *intel_output, |
315 | u8 target) | ||
315 | { | 316 | { |
316 | intel_sdvo_write_cmd(intel_output, SDVO_CMD_SET_CONTROL_BUS_SWITCH, &target, 1); | 317 | intel_sdvo_write_cmd(intel_output, SDVO_CMD_SET_CONTROL_BUS_SWITCH, &target, 1); |
317 | } | 318 | } |
@@ -967,7 +968,7 @@ static const struct drm_connector_helper_funcs intel_sdvo_connector_helper_funcs | |||
967 | .best_encoder = intel_best_encoder, | 968 | .best_encoder = intel_best_encoder, |
968 | }; | 969 | }; |
969 | 970 | ||
970 | void intel_sdvo_enc_destroy(struct drm_encoder *encoder) | 971 | static void intel_sdvo_enc_destroy(struct drm_encoder *encoder) |
971 | { | 972 | { |
972 | drm_encoder_cleanup(encoder); | 973 | drm_encoder_cleanup(encoder); |
973 | } | 974 | } |
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index d409b8637883..fbb35dc56f5c 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c | |||
@@ -1612,7 +1612,7 @@ static const struct drm_connector_helper_funcs intel_tv_connector_helper_funcs = | |||
1612 | .best_encoder = intel_best_encoder, | 1612 | .best_encoder = intel_best_encoder, |
1613 | }; | 1613 | }; |
1614 | 1614 | ||
1615 | void intel_tv_enc_destroy(struct drm_encoder *encoder) | 1615 | static void intel_tv_enc_destroy(struct drm_encoder *encoder) |
1616 | { | 1616 | { |
1617 | drm_encoder_cleanup(encoder); | 1617 | drm_encoder_cleanup(encoder); |
1618 | } | 1618 | } |