Commit efca4885 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: sm750fb: remove proc_checkMode method from lynxfb_output 



The proc_checkMode of lynxfb_output is set to function that always
returns 0. Calling that function and checking for its return value is
meaningless.

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 104f456c

drivers/staging/sm750fb/sm750.c

+1 −5
Original line number Diff line number Diff line
@@ -588,10 +588,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, 
		return -ENOMEM;

	}



	ret = output->proc_checkMode(output, var);

	if (!ret)

		ret = crtc->proc_checkMode(crtc, var);

	return ret;

	return crtc->proc_checkMode(crtc, var);

}



static int lynxfb_ops_setcolreg(unsigned regno,
@@ -690,7 +687,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par) 
	crtc->ywrapstep = 0;



	output->proc_setMode = hw_sm750_output_setMode;

	output->proc_checkMode = hw_sm750_output_checkMode;



	output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID) ?

				 hw_sm750le_setBLANK : hw_sm750_setBLANK;

drivers/staging/sm750fb/sm750.h

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ struct lynxfb_output { 
						struct fb_var_screeninfo*,

						struct fb_fix_screeninfo*);



	int (*proc_checkMode)(struct lynxfb_output*, struct fb_var_screeninfo*);

	int (*proc_setBLANK)(struct lynxfb_output*, int);

	void  (*clear)(struct lynxfb_output *);

};

drivers/staging/sm750fb/sm750_hw.c

+0 −9
Original line number Diff line number Diff line
@@ -190,15 +190,6 @@ resource_size_t hw_sm750_getVMSize(struct lynx_share *share) 
	return ret;

}







int hw_sm750_output_checkMode(struct lynxfb_output *output, struct fb_var_screeninfo *var)

{



	return 0;

}





int hw_sm750_output_setMode(struct lynxfb_output *output,

									struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix)

{

drivers/staging/sm750fb/sm750_hw.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ int hw_sm750_deWait(void); 
int hw_sm750le_deWait(void);



resource_size_t hw_sm750_getVMSize(struct lynx_share *);

int hw_sm750_output_checkMode(struct lynxfb_output*, struct fb_var_screeninfo*);

int hw_sm750_output_setMode(struct lynxfb_output*, struct fb_var_screeninfo*, struct fb_fix_screeninfo*);

int hw_sm750_crtc_checkMode(struct lynxfb_crtc*, struct fb_var_screeninfo*);

int hw_sm750_crtc_setMode(struct lynxfb_crtc*, struct fb_var_screeninfo*, struct fb_fix_screeninfo*);