Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ee35ea7 authored by Juston Li's avatar Juston Li Committed by Greg Kroah-Hartman
Browse files

staging: sm750fb: fix c99 comments 



fixed all checkpatch.pl ERROR: do not use C99 // comments

Any C99 comments used to comment out code are simply removed.
Also some of the errors occur inside '#if 0' blocks which I
might as well fix since checkpatch.pl caught them but the blocks
themselves should probably be cleaned up later.

Changes since v1: close a comment block

Signed-off-by: default avatarJuston Li <juston.h.li@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c40753b5

drivers/staging/sm750fb/ddk750_chip.c

+2 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ logical_chip_type_t getChipType(void) 
	char physicalRev;

	logical_chip_type_t chip;



	physicalID = devId750;//either 0x718 or 0x750

	physicalID = devId750; /* either 0x718 or 0x750 */

	physicalRev = revId750;



	if (physicalID == 0x718)
@@ -257,7 +257,7 @@ int ddk750_initHw(initchip_param_t *pInitParam) 


	unsigned int ulReg;

#if 0

	//move the code to map regiter function.

	/* move the code to map regiter function. */

	if (getChipType() == SM718) {

		/* turn on big endian bit*/

		ulReg = PEEK32(0x74);
@@ -487,8 +487,6 @@ unsigned int calcPllValue(unsigned int request_orig, pll_value_t *pll) 
			}

		}

	}



	//printk("Finally:  pll->n[%lu],m[%lu],od[%lu],pod[%lu]\n",pll->N,pll->M,pll->OD,pll->POD);

	return ret;

}
@@ -580,14 +578,9 @@ pll_value_t *pPLL /* Structure to hold the value to be set in PLL */ 
	}



    /* Restore input frequency from Khz to hz unit */

//    pPLL->inputFreq *= 1000;

	ulRequestClk *= 1000;

	pPLL->inputFreq = DEFAULT_INPUT_CLOCK; /* Default reference clock */



    /* Output debug information */

	//DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Requested Frequency = %d\n", ulRequestClk));

	//DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Input CLK = %dHz, M=%d, N=%d, OD=%d, POD=%d\n", pPLL->inputFreq, pPLL->M, pPLL->N, pPLL->OD, pPLL->POD));



    /* Return actual frequency that the PLL can set */

	ret = calcPLL(pPLL);

	return ret;

drivers/staging/sm750fb/ddk750_dvi.c

+1 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ int dviInit( 
                              vsyncEnable, deskewEnable, deskewSetting, continuousSyncEnable,

                              pllFilterEnable, pllFilterValue);

	}

	return -1;//error

	return -1; /* error */

}
@@ -66,7 +66,6 @@ unsigned short dviGetVendorID(void) 
{

    dvi_ctrl_device_t *pCurrentDviCtrl;



    //pCurrentDviCtrl = getDviCtrl();

    pCurrentDviCtrl = g_dcftSupportedDviController;

    if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)

        return pCurrentDviCtrl->pfnGetVendorId();
@@ -86,7 +85,6 @@ unsigned short dviGetDeviceID(void) 
{

    dvi_ctrl_device_t *pCurrentDviCtrl;



//    pCurrentDviCtrl = getDviCtrl();

	pCurrentDviCtrl = g_dcftSupportedDviController;

    if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)

        return pCurrentDviCtrl->pfnGetDeviceId();

drivers/staging/sm750fb/ddk750_help.c

+0 −2
Original line number Diff line number Diff line 
//#include "ddk750_reg.h"

//#include "ddk750_chip.h"

#include "ddk750_help.h"



void __iomem * mmio750 = NULL;

drivers/staging/sm750fb/ddk750_sii164.c

+0 −11
Original line number Diff line number Diff line
@@ -125,10 +125,7 @@ long sii164InitChip( 
    unsigned char pllFilterValue

)

{

    //unsigned char ucRegIndex, ucRegValue;

    //unsigned char ucDeviceAddress,

	unsigned char config;

    //unsigned long delayCount;



    /* Initialize the i2c bus */

#ifdef USE_HW_I2C
@@ -141,10 +138,6 @@ long sii164InitChip( 
    /* Check if SII164 Chip exists */

    if ((sii164GetVendorID() == SII164_VENDOR_ID) && (sii164GetDeviceID() == SII164_DEVICE_ID))

    {



#ifdef DDKDEBUG

        //sii164PrintRegisterValues();

#endif

        /*

         *  Initialize SII164 controller chip.

         */
@@ -241,10 +234,6 @@ long sii164InitChip( 
        config |= SII164_CONFIGURATION_POWER_NORMAL;

        i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);



#ifdef DDKDEBUG

        //sii164PrintRegisterValues();

#endif



        return 0;

    }

drivers/staging/sm750fb/sm750.h

+4 −6
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
/* please use revision id to distinguish sm750le and sm750*/

#define SPC_SM750 	0



//#define SPC_SM750LE 8



#define MB(x) ((x)<<20)

#define MHZ(x) ((x) * 1000000)

/* align should be 2,4,8,16 */
@@ -95,10 +93,10 @@ struct lynx_cursor{ 
};



struct lynxfb_crtc{

	unsigned char __iomem * vCursor;//virtual address of cursor

	unsigned char __iomem * vScreen;//virtual address of on_screen

	int oCursor;//cursor address offset in vidmem

	int oScreen;//onscreen address offset in vidmem

	unsigned char __iomem * vCursor; /* virtual address of cursor */

	unsigned char __iomem * vScreen; /* virtual address of on_screen */

	int oCursor; /* cursor address offset in vidmem */

	int oScreen; /* onscreen address offset in vidmem */

	int channel;/* which channel this crtc stands for*/

	resource_size_t vidmem_size;/* this view's video memory max size */