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

Commit 85d47cff authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman
Browse files

staging: ft1000: Coding style fix in ft1000ReadProc. 



Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 92914cc8

drivers/staging/ft1000/ft1000-usb/ft1000_proc.c

+106 −110
Original line number Diff line number Diff line
@@ -54,8 +54,15 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, 


	struct ft1000_info *info;



  char *status[] = { "Idle (Disconnect)", "Searching", "Active (Connected)",

    "Waiting for L2", "Sleep", "No Coverage", "", ""

	char *status[] = { 

		"Idle (Disconnect)", 

		"Searching",

		"Active (Connected)",

		"Waiting for L2",

		"Sleep",

		"No Coverage",

		"",

		"",

	};



	char *signal[] = { "", "*", "**", "***", "****" };
@@ -67,15 +74,13 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, 
	dev = (struct net_device *) data;

	info = netdev_priv(dev);



  if (off > 0)

    {

	if (off > 0) {

		*eof = 1;

		return 0;

	}





  if (info->ProgConStat != 0xFF)

    {

	if (info->ProgConStat != 0xFF) {

		ft1000_read_dpram16(info->pFt1000Dev, FT1000_MAG_DSP_LED,

			   (u8 *)&ledStat, FT1000_MAG_DSP_LED_INDX);

		info->LedStat = ntohs(ledStat);
@@ -85,18 +90,13 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, 
		info->ConStat = ntohs(conStat);

		do_gettimeofday(&tv);

		delta = (tv.tv_sec - info->ConTm);

    }

  else

    {

	} else {

		info->ConStat = 0xf;

		delta = 0;

	}







	i = (info->LedStat) & 0xf;

  switch (i)

    {

	switch (i) {

	case 0x1:

		strength = 1;

		break;
@@ -114,8 +114,7 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, 
	}



	i = (info->LedStat >> 8) & 0xf;

  switch (i)

    {

	switch (i) {

	case 0x1:

		quality = 1;

		break;
@@ -132,7 +131,6 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, 
		quality = 0;

	}





	len = 0;

	PUTM_TO_PAGE(len, page, "Connection Time: %02ld:%02ld:%02ld\n",

      		((delta / 3600) % 24), ((delta / 60) % 60), (delta % 60));
@@ -147,7 +145,8 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, 
      		info->HwSerNum);

	PUTX_TO_PAGE(len, page, "Caliberation Version: ", CALVERSZ,

      		info->RfCalVer);

  PUTD_TO_PAGE (len, page, "Caliberation Date: ", CALDATESZ, info->RfCalDate);

	PUTD_TO_PAGE(len, page, "Caliberation Date: ", CALDATESZ,

		info->RfCalDate);

	PUTM_TO_PAGE(len, page, "Media State: %s\n",

      		(info->mediastate) ? "link" : "no link");

	PUTM_TO_PAGE(len, page, "Connection Status: %s\n",
@@ -159,9 +158,6 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, 
	PUTM_TO_PAGE(len, page, "Signal Strength: %s\n", signal[strength]);

	PUTM_TO_PAGE(len, page, "Signal Quality: %s\n", signal[quality]);









	return len;

}