[2.6 patch] drivers/char/ip2*: misc cleanups (fwd)

From: Adrian Bunk (bunk_at_stusta.de)
Date: 12/22/04

  • Next message: Adrian Bunk: "[2.6 patch] drivers/char/hw_random.c: make a variable static (fwd)" 
    Date:	Wed, 22 Dec 2004 12:49:57 +0100
To: Andrew Morton <akpm@osdl.org>

    The patch forwarded below still applies and compiles against
    2.6.10-rc3-mm1.

    Please apply.

    ----- Forwarded message from Adrian Bunk <bunk@stusta.de> -----

    Date: Sun, 5 Dec 2004 17:57:14 +0100
    From: Adrian Bunk <bunk@stusta.de>
    To: linux-kernel@vger.kernel.org
    Subject: [2.6 patch] drivers/char/ip2*: misc cleanups

    The patch below contains cleanups including the following:
    - remove unused variables and functions
    - make needlessly global code static

    diffstat output:
     drivers/char/ip2/fip_firm.h | 2 -
     drivers/char/ip2/i2cmd.c | 59 +-----------------------------------
     drivers/char/ip2/i2cmd.h | 17 ----------
     drivers/char/ip2/i2lib.c | 2 -
     drivers/char/ip2main.c | 5 +--
     5 files changed, 6 insertions(+), 79 deletions(-)

    Signed-off-by: Adrian Bunk <bunk@stusta.de>

    --- linux-2.6.10-rc1-mm3-full/drivers/char/ip2/fip_firm.h.old 2004-11-07 00:11:09.000000000 +0100
    +++ linux-2.6.10-rc1-mm3-full/drivers/char/ip2/fip_firm.h 2004-11-07 00:11:15.000000000 +0100
    @@ -1,7 +1,7 @@
     /* fip_firm.h - Intelliport II loadware */
     /* -31232 bytes read from ff.lod */
     
    -unsigned char fip_firm[] __initdata = {
    +static unsigned char fip_firm[] __initdata = {
     0x3C,0x42,0x37,0x18,0x02,0x01,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
     0x57,0x65,0x64,0x20,0x44,0x65,0x63,0x20,0x30,0x31,0x20,0x31,0x32,0x3A,0x32,0x34,
     0x3A,0x33,0x30,0x20,0x31,0x39,0x39,0x39,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
    --- linux-2.6.10-rc1-mm3-full/drivers/char/ip2/i2cmd.c.old 2004-11-07 00:15:10.000000000 +0100
    +++ linux-2.6.10-rc1-mm3-full/drivers/char/ip2/i2cmd.c 2004-11-07 01:41:45.000000000 +0100
    @@ -88,7 +88,7 @@
     //static UCHAR ct37[]={ 5, BYP|VIP, 0x25,0,0,0,0 }; // FLOW PACKET
     
     // Back to normal
    -static UCHAR ct38[] = {11, BTH|VAR, 0x26,0,0,0,0,0,0,0,0,0,0 }; // DEF KEY SEQ
    +//static UCHAR ct38[] = {11, BTH|VAR, 0x26,0,0,0,0,0,0,0,0,0,0 }; // DEF KEY SEQ
     //static UCHAR ct39[]={ 3, BTH|END, 0x27,0,0 }; // OPOSTON
     //static UCHAR ct40[]={ 1, BTH|END, 0x28 }; // OPOSTOFF
     static UCHAR ct41[] = { 1, BYP, 0x29 }; // RESUME
    @@ -103,7 +103,7 @@
     //static UCHAR ct50[]={ 1, BTH, 0x32 }; // DTRFLOWENAB
     //static UCHAR ct51[]={ 1, BTH, 0x33 }; // DTRFLOWDSAB
     //static UCHAR ct52[]={ 1, BTH, 0x34 }; // BAUDTABRESET
    -static UCHAR ct53[] = { 3, BTH, 0x35,0,0 }; // BAUDREMAP
    +//static UCHAR ct53[] = { 3, BTH, 0x35,0,0 }; // BAUDREMAP
     static UCHAR ct54[] = { 3, BTH, 0x36,0,0 }; // CUSTOMBAUD1
     static UCHAR ct55[] = { 3, BTH, 0x37,0,0 }; // CUSTOMBAUD2
     static UCHAR ct56[] = { 2, BTH|END, 0x38,0 }; // PAUSE
    @@ -152,40 +152,6 @@
     //********
     
     //******************************************************************************
    -// Function: i2cmdSetSeq(type, size, string)
    -// Parameters: type - sequence number
    -// size - length of sequence
    -// string - substitution string
    -//
    -// Returns: Pointer to command structure
    -//
    -// Description:
    -//
    -// This routine sets the parameters of command 38 Define Hot Key sequence (alias
    -// "special receive sequence"). Returns a pointer to the structure. Endeavours
    -// to be bullet-proof in that the sequence number is forced in range, and any
    -// out-of-range sizes are forced to zero.
    -//******************************************************************************
    -cmdSyntaxPtr
    -i2cmdSetSeq(unsigned char type, unsigned char size, unsigned char *string)
    -{
    - cmdSyntaxPtr pCM = (cmdSyntaxPtr) ct38;
    - unsigned char *pc;
    -
    - pCM->cmd[1] = ((type > 0xf) ? 0xf : type); // Sequence number
    - size = ((size > 0x8) ? 0 : size); // size
    - pCM->cmd[2] = size;
    - pCM->length = 3 + size; // UPDATES THE LENGTH!
    -
    - pc = &(pCM->cmd[3]);
    -
    - while(size--) {
    - *pc++ = *string++;
    - }
    - return pCM;
    -}
    -
    -//******************************************************************************
     // Function: i2cmdUnixFlags(iflag, cflag, lflag)
     // Parameters: Unix tty flags
     //
    @@ -211,27 +177,6 @@
     }
     
     //******************************************************************************
    -// Function: i2cmdBaudRemap(dest,src)
    -// Parameters: ?
    -//
    -// Returns: Pointer to command structure
    -//
    -// Description:
    -//
    -// This routine sets the parameters of command 53 and returns a pointer to the
    -// appropriate structure.
    -//******************************************************************************
    -cmdSyntaxPtr
    -i2cmdBaudRemap(unsigned char dest, unsigned char src)
    -{
    - cmdSyntaxPtr pCM = (cmdSyntaxPtr) ct53;
    -
    - pCM->cmd[1] = dest;
    - pCM->cmd[2] = src;
    - return pCM;
    -}
    -
    -//******************************************************************************
     // Function: i2cmdBaudDef(which, rate)
     // Parameters: ?
     //
    --- linux-2.6.10-rc1-mm3-full/drivers/char/ip2/i2cmd.h.old 2004-11-07 00:14:35.000000000 +0100
    +++ linux-2.6.10-rc1-mm3-full/drivers/char/ip2/i2cmd.h 2004-11-07 00:16:06.000000000 +0100
    @@ -71,9 +71,7 @@
     // there is more than one parameter to assign, we must use a function rather
     // than a macro (used usually).
     //
    -extern cmdSyntaxPtr i2cmdSetSeq(UCHAR seqno, UCHAR size, UCHAR *string);
     extern cmdSyntaxPtr i2cmdUnixFlags(USHORT iflag,USHORT cflag,USHORT lflag);
    -extern cmdSyntaxPtr i2cmdBaudRemap(UCHAR dest, UCHAR src);
     extern cmdSyntaxPtr i2cmdBaudDef(int which, USHORT rate);
     
     // Declarations for the global arrays used to bear the commands and their
    @@ -397,14 +395,6 @@
     // library code in response to data movement and shouldn't ever be sent by the
     // user code. See i2pack.h and the body of i2lib.c for details.
     
    -// COMMAND 38: Define the hot-key sequence
    -// seqno: sequence number 0-15
    -// size: number of characters in sequence (1-8)
    -// string: pointer to the characters
    -// (if size == 0, "undefines" this sequence
    -//
    -#define CMD_SET_SEQ(seqno,size,string) i2cmdSetSeq(seqno,size,string)
    -
     // Enable on-board post-processing, using options given in oflag argument.
     // Formerly, this command was automatically preceded by a CMD_OPOST_OFF command
     // because the loadware does not permit sending back-to-back CMD_OPOST_ON
    @@ -458,13 +448,6 @@
     #define CMD_DTRFL_DSAB (cmdSyntaxPtr)(ct51) // Disable DTR flow control
     #define CMD_BAUD_RESET (cmdSyntaxPtr)(ct52) // Reset baudrate table
     
    -// COMMAND 53: Remap baud rate table
    -// dest = index of table entry to be changed
    -// src = index value to substitute.
    -// at default mapping table is f(x) = x
    -//
    -#define CMD_BAUD_REMAP(dest,src) i2cmdBaudRemap(dest,src)
    -
     // COMMAND 54: Define custom rate #1
     // rate = (short) 1/10 of the desired baud rate
     //
    --- linux-2.6.10-rc1-mm3-full/drivers/char/ip2/i2lib.c.old 2004-11-07 00:11:52.000000000 +0100
    +++ linux-2.6.10-rc1-mm3-full/drivers/char/ip2/i2lib.c 2004-11-07 00:12:01.000000000 +0100
    @@ -141,7 +141,7 @@
     //* Code *
     //********
     
    -inline int
    +static inline int
     i2Validate ( i2ChanStrPtr pCh )
     {
             //ip2trace(pCh->port_index, ITRC_VERIFY,ITRC_ENTER,2,pCh->validity,
    --- linux-2.6.10-rc1-mm3-full/drivers/char/ip2main.c.old 2004-11-07 00:17:07.000000000 +0100
    +++ linux-2.6.10-rc1-mm3-full/drivers/char/ip2main.c 2004-11-07 01:41:13.000000000 +0100
    @@ -138,7 +138,7 @@
     #include <linux/proc_fs.h>
     
     static int ip2_read_procmem(char *, char **, off_t, int);
    -int ip2_read_proc(char *, char **, off_t, int, int *, void * );
    +static int ip2_read_proc(char *, char **, off_t, int, int *, void * );
     
     /********************/
     /* Type Definitions */
    @@ -202,7 +202,6 @@
     static void ip2_wait_until_sent(PTTY,int);
     
     static void set_params (i2ChanStrPtr, struct termios *);
    -static int set_modem_info(i2ChanStrPtr, unsigned int, unsigned int *);
     static int get_serial_info(i2ChanStrPtr, struct serial_struct __user *);
     static int set_serial_info(i2ChanStrPtr, struct serial_struct __user *);
     
    @@ -3097,7 +3096,7 @@
      * different sources including ip2mkdev.c and a couple of other drivers.
      * The bugs are all mine. :-) =mhw=
      */
    -int ip2_read_proc(char *page, char **start, off_t off,
    +static int ip2_read_proc(char *page, char **start, off_t off,
                                     int count, int *eof, void *data)
     {
             int i, j, box;

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    ----- End forwarded message -----

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Adrian Bunk: "[2.6 patch] drivers/char/hw_random.c: make a variable static (fwd)"

    Relevant Pages

    • hints needed for IRQ Programming serial Device, difference between DOS running in QEMU and and real
      ... static int write_byte_to_serial0{ ... unsigned char input; ... @param commandlen how many chars the command string has ... @param command pointer to command string ...
      (de.comp.os.msdos)
    • [2.6 patch] drivers/char/ip2*: misc cleanups
      ... -// This routine sets the parameters of command 38 Define Hot Key sequence (alias ... -i2cmdSetSeq(unsigned char type, unsigned char size, unsigned char *string) ... +static inline int ...
      (Linux-Kernel)
    • [patch 6/22] __early_param for arm26
      ... - Remove saved_command_line. ... unsigned char aux_device_present; ... +static int __init early_mem{ ... static void __init setup_ramdisk(int doload, int prompt, int image_start, unsigned int rd_sz) ...
      (Linux-Kernel)
    • Re: Data type problem in encryption algorithm
      ... int hexdigit_to_int{ ... unsigned char* result; ... Keep in mind that the input string must not begin with "0x", that you must freethe result and that it is *not* a null-terminated string but a sequence of bytes of a length you must keep track of yourself, so no calling strlenon it. ...
      (comp.lang.c)
    • [patch 15/22] __early_param for ppc64
      ... Remove saved_command_line. ... int powersave_nap; ... unsigned char aux_device_present; void parse_cmd_line(unsigned long r3, unsigned long r4, unsigned long r5, ... To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ ...
      (Linux-Kernel)