Messages in this thread Patch in this message | | | Date | Thu, 4 Jun 2020 18:52:33 +0200 | From | Dominik Brodowski <> | Subject | [GIT PULL] pcmcia updates for v5.8 |
| |
Linus,
the following changes since b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce:
Linux 5.7-rc6 (2020-05-17 16:48:37 -0700)
are available from
https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia-next
up to 46d0797906633d82bd50ef26780ee39fac5d27d6:
pcmcia: make pccard_loop_tuple() static (2020-05-18 11:16:39 +0200)
Two minor PCMCIA odd fixes, one replacing zero-length arrays with a flexible-array member, and one making a local function static.
Thanks, Dominik
---------------------------------------------------------------- Dominik Brodowski (1): pcmcia: make pccard_loop_tuple() static
Gustavo A. R. Silva (1): pcmcia: Replace zero-length array with flexible-array
drivers/pcmcia/cs_internal.h | 6 ------ drivers/pcmcia/pcmcia_cis.c | 6 +++--- include/pcmcia/cistpl.h | 6 +++--- 3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index fb9b17fa0fb5..580369f3c0b0 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -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); diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c index b553f7ab532f..e4c4daf92038 100644 --- a/drivers/pcmcia/pcmcia_cis.c +++ b/drivers/pcmcia/pcmcia_cis.c @@ -78,9 +78,9 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, * 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, - cisdata_t code, cisparse_t *parse, void *priv_data, - int (*loop_tuple) (tuple_t *tuple, +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, void *priv_data)) { diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h index 59a011101e0e..749320cc9aba 100644 --- a/include/pcmcia/cistpl.h +++ b/include/pcmcia/cistpl.h @@ -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 {[unhandled content-type:application/pgp-signature] | |