aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/matrox/matroxfb_g450.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/matrox/matroxfb_g450.c')
-rw-r--r--drivers/video/matrox/matroxfb_g450.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/matrox/matroxfb_g450.c b/drivers/video/matrox/matroxfb_g450.c
index f7f1343cd345..cff0546ea6fd 100644
--- a/drivers/video/matrox/matroxfb_g450.c
+++ b/drivers/video/matrox/matroxfb_g450.c
@@ -161,7 +161,7 @@ static int g450_query_ctrl(void* md, struct v4l2_queryctrl *p) {
161 161
162static int g450_set_ctrl(void* md, struct v4l2_control *p) { 162static int g450_set_ctrl(void* md, struct v4l2_control *p) {
163 int i; 163 int i;
164 MINFO_FROM(md); 164 struct matrox_fb_info *minfo = md;
165 165
166 i = get_ctrl_id(p->id); 166 i = get_ctrl_id(p->id);
167 if (i < 0) return -EINVAL; 167 if (i < 0) return -EINVAL;
@@ -215,7 +215,7 @@ static int g450_set_ctrl(void* md, struct v4l2_control *p) {
215 215
216static int g450_get_ctrl(void* md, struct v4l2_control *p) { 216static int g450_get_ctrl(void* md, struct v4l2_control *p) {
217 int i; 217 int i;
218 MINFO_FROM(md); 218 struct matrox_fb_info *minfo = md;
219 219
220 i = get_ctrl_id(p->id); 220 i = get_ctrl_id(p->id);
221 if (i < 0) return -EINVAL; 221 if (i < 0) return -EINVAL;
@@ -518,7 +518,7 @@ static void cve2_init_TV(struct matrox_fb_info *minfo,
518} 518}
519 519
520static int matroxfb_g450_compute(void* md, struct my_timming* mt) { 520static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
521 MINFO_FROM(md); 521 struct matrox_fb_info *minfo = md;
522 522
523 dprintk(KERN_DEBUG "Computing, mode=%u\n", minfo->outputs[1].mode); 523 dprintk(KERN_DEBUG "Computing, mode=%u\n", minfo->outputs[1].mode);
524 524
@@ -556,7 +556,7 @@ static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
556} 556}
557 557
558static int matroxfb_g450_program(void* md) { 558static int matroxfb_g450_program(void* md) {
559 MINFO_FROM(md); 559 struct matrox_fb_info *minfo = md;
560 560
561 if (minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) { 561 if (minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) {
562 cve2_init_TV(minfo, &minfo->hw.maven); 562 cve2_init_TV(minfo, &minfo->hw.maven);
@@ -575,7 +575,7 @@ static int matroxfb_g450_verify_mode(void* md, u_int32_t arg) {
575} 575}
576 576
577static int g450_dvi_compute(void* md, struct my_timming* mt) { 577static int g450_dvi_compute(void* md, struct my_timming* mt) {
578 MINFO_FROM(md); 578 struct matrox_fb_info *minfo = md;
579 579
580 if (mt->mnp < 0) { 580 if (mt->mnp < 0) {
581 mt->mnp = matroxfb_g450_setclk(minfo, mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL); 581 mt->mnp = matroxfb_g450_setclk(minfo, mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);