Skip to content

Commit

Permalink
Staging: xgifb: fix lots of sparse warnings
Browse files Browse the repository at this point in the history 
Fix many sparse warnings about data or functions being static.
Fix many sparse warnings about data or functions not being used
  (put them inside #if 0/#endif blocks).
Fix sparse warnings about 0 being used for NULL.
Fixed a small bit of source formatting when those lines were being
  modified anyway, but there is still lots of this yet to be done.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: devel@driverdev.osuosl.org
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent 6a4ca03 commit 8922967
Show file tree
Hide file tree
Showing 8 changed files with 462 additions and 409 deletions.
3 changes: 2 additions & 1 deletion drivers/staging/xgifb/XGI_accel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

/* TW: BR(16)+2 = 0x8242 */

int xgiCmdQueLen;
static int xgiCmdQueLen;

#define XGI300Idle \
{ \
Expand Down Expand Up @@ -488,6 +488,7 @@ int xgiCmdQueLen;

int XGIfb_initaccel(void);
void XGIfb_syncaccel(void);
int fbcon_XGI_sync(struct fb_info *info);

extern struct video_info xgi_video_info;

Expand Down
27 changes: 12 additions & 15 deletions drivers/staging/xgifb/XGI_main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,20 +350,17 @@ static int enable_dstn = 0;
static int XGIfb_ypan = -1;


int XGIfb_accel = 0;


static int XGIfb_hwcursor_size = 0;
static int XGIfb_CRT2_write_enable = 0;

int XGIfb_crt2type = -1; /* TW: CRT2 type (for overriding autodetection) */
int XGIfb_tvplug = -1; /* PR: Tv plug type (for overriding autodetection) */
static int XGIfb_crt2type = -1; /* TW: CRT2 type (for overriding autodetection) */
static int XGIfb_tvplug = -1; /* PR: Tv plug type (for overriding autodetection) */

int XGIfb_queuemode = -1; /* TW: Use MMIO queue mode by default (310/325 series only) */
static int XGIfb_queuemode = -1; /* TW: Use MMIO queue mode by default (310/325 series only) */

unsigned char XGIfb_detectedpdc = 0;
static unsigned char XGIfb_detectedpdc = 0;

unsigned char XGIfb_detectedlcda = 0xff;
static unsigned char XGIfb_detectedlcda = 0xff;



Expand All @@ -372,10 +369,10 @@ unsigned char XGIfb_detectedlcda = 0xff;
/* XGIfb_info XGIfbinfo; */

/* TW: Hardware extension; contains data on hardware */
struct xgi_hw_device_info XGIhw_ext;
static struct xgi_hw_device_info XGIhw_ext;

/* TW: XGI private structure */
struct vb_device_info XGI_Pr;
static struct vb_device_info XGI_Pr;

/* card parameters */
static unsigned long XGIfb_mmio_size = 0;
Expand All @@ -392,7 +389,7 @@ typedef enum _XGI_CMDTYPE {

/* mode table */
/* NOT const - will be patched for 1280x960 mode number chaos reasons */
struct _XGIbios_mode {
static struct _XGIbios_mode {
char name[15];
u8 mode_no;
u16 vesa_mode_no_1; /* "XGI defined" VESA mode number */
Expand Down Expand Up @@ -491,17 +488,17 @@ static int xgifb_mode_idx = 1;
#else
static int xgifb_mode_idx = -1; /* Use a default mode if we are inside the kernel */
#endif
u8 XGIfb_mode_no = 0;
u8 XGIfb_rate_idx = 0;
static u8 XGIfb_mode_no = 0;
static u8 XGIfb_rate_idx = 0;

/* TW: CR36 evaluation */
const unsigned short XGI300paneltype[] =
static const unsigned short XGI300paneltype[] =
{ LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024,
LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768,
LCD_1024x768, LCD_1024x768, LCD_1024x768,
LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768 };

const unsigned short XGI310paneltype[] =
static const unsigned short XGI310paneltype[] =
{ LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024,
LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960,
LCD_1152x768, LCD_1400x1050,LCD_1280x768, LCD_1600x1200,
Expand Down
29 changes: 17 additions & 12 deletions drivers/staging/xgifb/XGI_main_26.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
#include "XGI_main.h"
#include "vb_util.h"

int XGIfb_accel = 0;


#define Index_CR_GPIO_Reg1 0x48
#define Index_CR_GPIO_Reg2 0x49
Expand Down Expand Up @@ -161,8 +163,9 @@ struct video_info xgi_video_info;

/* --------------- Hardware Access Routines -------------------------- */

int
XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension,
static int
XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
struct xgi_hw_device_info *HwDeviceExtension,
unsigned char modeno, unsigned char rateindex)
{
unsigned short ModeNo = modeno;
Expand Down Expand Up @@ -196,8 +199,9 @@ XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, struct xgi_hw_device_in
return(Clock);
}

int
XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension,
static int
XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
struct xgi_hw_device_info *HwDeviceExtension,
unsigned char modeno, unsigned char rateindex,
u32 *left_margin, u32 *right_margin,
u32 *upper_margin, u32 *lower_margin,
Expand Down Expand Up @@ -377,7 +381,7 @@ XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, struct xgi_hw_device_inf



void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)
static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)
{
XGI_Pr->RelIO = BaseAddr;
XGI_Pr->P3c4 = BaseAddr + 0x14;
Expand Down Expand Up @@ -570,7 +574,7 @@ static void XGIfb_search_vesamode(unsigned int vesamode)
if(!j) printk(KERN_INFO "XGIfb: Invalid VESA mode 0x%x'\n", vesamode);
}

int XGIfb_GetXG21LVDSData(void)
static int XGIfb_GetXG21LVDSData(void)
{
u8 tmp;
unsigned char *pData;
Expand Down Expand Up @@ -2057,9 +2061,9 @@ static int XGIfb_heap_init(void)

int agp_enabled = 1;
u32 agp_size;
unsigned long *cmdq_baseport = 0;
unsigned long *read_port = 0;
unsigned long *write_port = 0;
unsigned long *cmdq_baseport = NULL;
unsigned long *read_port = NULL;
unsigned long *write_port = NULL;
XGI_CMDTYPE cmd_type;
#ifndef AGPOFF
struct agp_kern_info *agp_info;
Expand Down Expand Up @@ -2827,7 +2831,7 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)

static unsigned char VBIOS_BUF[65535];

unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address)
static unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address)
{
u32 rom_size = 0;
u32 rom_address = 0;
Expand Down Expand Up @@ -2872,7 +2876,8 @@ unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address)
return copy_address;
}

int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
static int __devinit xgifb_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
u16 reg16;
u8 reg, reg1;
Expand Down Expand Up @@ -3641,7 +3646,7 @@ MODULE_PARM_DESC(nocrt2rate,



int __init xgifb_init_module(void)
static int __init xgifb_init_module(void)
{
printk("\nXGIfb_init_module");
if(mode)
Expand Down
14 changes: 9 additions & 5 deletions drivers/staging/xgifb/vb_ext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ unsigned char XGI_Is301LV(struct vb_device_info *);
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo)
static unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo)
{
unsigned short flag ;

Expand Down Expand Up @@ -816,7 +816,8 @@ unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, str
; DX: PAnel V. resolution
;-----------------------------------------------------------------------------
*/
void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
static void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo,
PX86_REGS pBiosArguments)
{

unsigned short ModeIdIndex;
Expand Down Expand Up @@ -859,7 +860,8 @@ void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments
;
;-----------------------------------------------------------------------------
*/
void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
static void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo,
PX86_REGS pBiosArguments)
{

unsigned short EModeCount;
Expand Down Expand Up @@ -905,7 +907,8 @@ void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments
;
;-----------------------------------------------------------------------------
*/
void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
static void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo,
PX86_REGS pBiosArguments)
{
unsigned short ModeIdIndex, resindex;
unsigned short ModeNo;
Expand Down Expand Up @@ -964,7 +967,8 @@ void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments
; BX[6]: *Value1 D[6] Panel H. Polarity
;-----------------------------------------------------------------------------
*/
void XGI_XG21Fun14Sub73(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
static void XGI_XG21Fun14Sub73(struct vb_device_info *pVBInfo,
PX86_REGS pBiosArguments)
{
unsigned char Select;

Expand Down
Loading

0 comments on commit 8922967

Please sign in to comment.