Commit a0a4d17e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux 

Pull pcmcia updates from Dominik Brodowski:
 "Two minor PCMCIA odd fixes: one replacing zero-length arrays with a
  flexible-array member, and one making a local function static"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: make pccard_loop_tuple() static
  pcmcia: Replace zero-length array with flexible-array
parents 86c67ce2 46d07979

drivers/pcmcia/cs_internal.h

+0 −6
Original line number Diff line number Diff line
@@ -164,12 +164,6 @@ int pcmcia_replace_cis(struct pcmcia_socket *s, 
int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count);

int verify_cis_cache(struct pcmcia_socket *s);



int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function,

		      cisdata_t code, cisparse_t *parse, void *priv_data,

		      int (*loop_tuple) (tuple_t *tuple,

					 cisparse_t *parse,

					 void *priv_data));



int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function,

			tuple_t *tuple);

drivers/pcmcia/pcmcia_cis.c

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ done: 
 * calls the @loop_tuple function for each entry. If the call to @loop_tuple

 * returns 0, the loop exits. Returns 0 on success or errorcode otherwise.

 */

int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function,

static int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function,

			     cisdata_t code, cisparse_t *parse, void *priv_data,

			     int (*loop_tuple) (tuple_t *tuple,

					 cisparse_t *parse,

include/pcmcia/cistpl.h

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ typedef struct cistpl_funcid_t { 


typedef struct cistpl_funce_t {

    u_char	type;

    u_char	data[0];

    u_char	data[];

} cistpl_funce_t;



/*======================================================================
@@ -255,7 +255,7 @@ typedef struct cistpl_data_serv_t { 
    u_char	escape;

    u_char	encrypt;

    u_char	misc_features;

    u_char	ccitt_code[0];

    u_char	ccitt_code[];

} cistpl_data_serv_t;



typedef struct cistpl_fax_serv_t {
@@ -265,7 +265,7 @@ typedef struct cistpl_fax_serv_t { 
    u_char	encrypt;

    u_char	features_0;

    u_char	features_1;

    u_char	ccitt_code[0];

    u_char	ccitt_code[];

} cistpl_fax_serv_t;



typedef struct cistpl_voice_serv_t {

CRA Git | Maintained and supported by SUSTech CRA and CCSE