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

Commit c2236956 authored by V. ANANDA KRISHNAN's avatar V. ANANDA KRISHNAN Committed by Linus Torvalds
Browse files

[PATCH] jsm: warning fixes 



- updates the version

- fix mixing of declarations and code.  The mixing of declarations and
  code displays warnings when used against RedHat RHEL4.0 distro (compiler
  version is 3.4.3-22.1) and hence I separated them out.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9539c1d4

drivers/serial/jsm/jsm.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ enum { 
#define WRITEBUFLEN	((4096) + 4)

#define MYFLIPLEN	N_TTY_BUF_SIZE



#define JSM_VERSION	"jsm: 1.1-1-INKERNEL"

#define JSM_VERSION	"jsm: 1.2-1-INKERNEL"

#define JSM_PARTNUM	"40002438_A-INKERNEL"



struct jsm_board;

drivers/serial/jsm/jsm_driver.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 * Scott H Kilau <Scott_Kilau@digi.com>

 * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>

 *

 *

 ***********************************************************************/

#include <linux/moduleparam.h>

#include <linux/pci.h>

drivers/serial/jsm/jsm_neo.c

+18 −12
Original line number Diff line number Diff line
@@ -48,8 +48,9 @@ static inline void neo_pci_posting_flush(struct jsm_board *bd) 


static void neo_set_cts_flow_control(struct jsm_channel *ch)

{

	u8 ier = readb(&ch->ch_neo_uart->ier);

	u8 efr = readb(&ch->ch_neo_uart->efr);

	u8 ier, efr;

	ier = readb(&ch->ch_neo_uart->ier);

	efr = readb(&ch->ch_neo_uart->efr);



	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n");
@@ -78,8 +79,9 @@ static void neo_set_cts_flow_control(struct jsm_channel *ch) 


static void neo_set_rts_flow_control(struct jsm_channel *ch)

{

	u8 ier = readb(&ch->ch_neo_uart->ier);

	u8 efr = readb(&ch->ch_neo_uart->efr);

	u8 ier, efr;

	ier = readb(&ch->ch_neo_uart->ier);

	efr = readb(&ch->ch_neo_uart->efr);



	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n");
@@ -117,8 +119,9 @@ static void neo_set_rts_flow_control(struct jsm_channel *ch) 


static void neo_set_ixon_flow_control(struct jsm_channel *ch)

{

	u8 ier = readb(&ch->ch_neo_uart->ier);

	u8 efr = readb(&ch->ch_neo_uart->efr);

	u8 ier, efr;

	ier = readb(&ch->ch_neo_uart->ier);

	efr = readb(&ch->ch_neo_uart->efr);



	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n");
@@ -153,8 +156,9 @@ static void neo_set_ixon_flow_control(struct jsm_channel *ch) 


static void neo_set_ixoff_flow_control(struct jsm_channel *ch)

{

	u8 ier = readb(&ch->ch_neo_uart->ier);

	u8 efr = readb(&ch->ch_neo_uart->efr);

	u8 ier, efr;

	ier = readb(&ch->ch_neo_uart->ier);

	efr = readb(&ch->ch_neo_uart->efr);



	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n");
@@ -190,8 +194,9 @@ static void neo_set_ixoff_flow_control(struct jsm_channel *ch) 


static void neo_set_no_input_flow_control(struct jsm_channel *ch)

{

	u8 ier = readb(&ch->ch_neo_uart->ier);

	u8 efr = readb(&ch->ch_neo_uart->efr);

	u8 ier, efr;

	ier = readb(&ch->ch_neo_uart->ier);

	efr = readb(&ch->ch_neo_uart->efr);



	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n");
@@ -228,8 +233,9 @@ static void neo_set_no_input_flow_control(struct jsm_channel *ch) 


static void neo_set_no_output_flow_control(struct jsm_channel *ch)

{

	u8 ier = readb(&ch->ch_neo_uart->ier);

	u8 efr = readb(&ch->ch_neo_uart->efr);

	u8 ier, efr;

	ier = readb(&ch->ch_neo_uart->ier);

	efr = readb(&ch->ch_neo_uart->efr);



	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");