lkml.org 
[lkml]   [2005]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] drivers/pcmcia/cistpl.c: fix endian warnings
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    ---

    drivers/pcmcia/cistpl.c | 30 +++++++++++++++---------------
    1 file changed, 15 insertions(+), 15 deletions(-)

    --- a/drivers/pcmcia/cistpl.c
    +++ b/drivers/pcmcia/cistpl.c
    @@ -463,7 +463,7 @@ static int follow_link(struct pcmcia_soc
    /* Get indirect link from the MFC tuple */
    read_cis_cache(s, LINK_SPACE(tuple->Flags),
    tuple->LinkOffset, 5, link);
    - ofs = le32_to_cpu(*(u_int *)(link+1));
    + ofs = le32_to_cpu(*(__le32 *)(link+1));
    SPACE(tuple->Flags) = (link[0] == CISTPL_MFC_ATTR);
    /* Move to the next indirect link */
    tuple->LinkOffset += 5;
    @@ -671,8 +671,8 @@ static int parse_checksum(tuple_t *tuple
    if (tuple->TupleDataLen < 5)
    return CS_BAD_TUPLE;
    p = (u_char *)tuple->TupleData;
    - csum->addr = tuple->CISOffset+(short)le16_to_cpu(*(u_short *)p)-2;
    - csum->len = le16_to_cpu(*(u_short *)(p + 2));
    + csum->addr = tuple->CISOffset+(short)le16_to_cpu(*(__le16 *)p)-2;
    + csum->len = le16_to_cpu(*(__le16 *)(p + 2));
    csum->sum = *(p+4);
    return CS_SUCCESS;
    }
    @@ -683,7 +683,7 @@ static int parse_longlink(tuple_t *tuple
    {
    if (tuple->TupleDataLen < 4)
    return CS_BAD_TUPLE;
    - link->addr = le32_to_cpu(*(u_int *)tuple->TupleData);
    + link->addr = le32_to_cpu(*(__le32 *)tuple->TupleData);
    return CS_SUCCESS;
    }

    @@ -702,7 +702,7 @@ static int parse_longlink_mfc(tuple_t *t
    return CS_BAD_TUPLE;
    for (i = 0; i < link->nfn; i++) {
    link->fn[i].space = *p; p++;
    - link->fn[i].addr = le32_to_cpu(*(u_int *)p); p += 4;
    + link->fn[i].addr = le32_to_cpu(*(__le32 *)p); p += 4;
    }
    return CS_SUCCESS;
    }
    @@ -789,10 +789,10 @@ static int parse_jedec(tuple_t *tuple, c

    static int parse_manfid(tuple_t *tuple, cistpl_manfid_t *m)
    {
    - u_short *p;
    + __le16 *p;
    if (tuple->TupleDataLen < 4)
    return CS_BAD_TUPLE;
    - p = (u_short *)tuple->TupleData;
    + p = (__le16 *)tuple->TupleData;
    m->manf = le16_to_cpu(p[0]);
    m->card = le16_to_cpu(p[1]);
    return CS_SUCCESS;
    @@ -1093,7 +1093,7 @@ static int parse_cftable_entry(tuple_t *
    break;
    case 0x20:
    entry->mem.nwin = 1;
    - entry->mem.win[0].len = le16_to_cpu(*(u_short *)p) << 8;
    + entry->mem.win[0].len = le16_to_cpu(*(__le16 *)p) << 8;
    entry->mem.win[0].card_addr = 0;
    entry->mem.win[0].host_addr = 0;
    p += 2;
    @@ -1101,9 +1101,9 @@ static int parse_cftable_entry(tuple_t *
    break;
    case 0x40:
    entry->mem.nwin = 1;
    - entry->mem.win[0].len = le16_to_cpu(*(u_short *)p) << 8;
    + entry->mem.win[0].len = le16_to_cpu(*(__le16 *)p) << 8;
    entry->mem.win[0].card_addr =
    - le16_to_cpu(*(u_short *)(p+2)) << 8;
    + le16_to_cpu(*(__le16 *)(p+2)) << 8;
    entry->mem.win[0].host_addr = 0;
    p += 4;
    if (p > q) return CS_BAD_TUPLE;
    @@ -1140,7 +1140,7 @@ static int parse_bar(tuple_t *tuple, cis
    p = (u_char *)tuple->TupleData;
    bar->attr = *p;
    p += 2;
    - bar->size = le32_to_cpu(*(u_int *)p);
    + bar->size = le32_to_cpu(*(__le32 *)p);
    return CS_SUCCESS;
    }

    @@ -1153,7 +1153,7 @@ static int parse_config_cb(tuple_t *tupl
    return CS_BAD_TUPLE;
    config->last_idx = *(++p);
    p++;
    - config->base = le32_to_cpu(*(u_int *)p);
    + config->base = le32_to_cpu(*(__le32 *)p);
    config->subtuples = tuple->TupleDataLen - 6;
    return CS_SUCCESS;
    }
    @@ -1269,7 +1269,7 @@ static int parse_vers_2(tuple_t *tuple,

    v2->vers = p[0];
    v2->comply = p[1];
    - v2->dindex = le16_to_cpu(*(u_short *)(p+2));
    + v2->dindex = le16_to_cpu(*(__le16 *)(p+2));
    v2->vspec8 = p[6];
    v2->vspec9 = p[7];
    v2->nhdr = p[8];
    @@ -1310,8 +1310,8 @@ static int parse_format(tuple_t *tuple,

    fmt->type = p[0];
    fmt->edc = p[1];
    - fmt->offset = le32_to_cpu(*(u_int *)(p+2));
    - fmt->length = le32_to_cpu(*(u_int *)(p+6));
    + fmt->offset = le32_to_cpu(*(__le32 *)(p+2));
    + fmt->length = le32_to_cpu(*(__le32 *)(p+6));

    return CS_SUCCESS;
    }
    -
    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/

    \
     
     \ /
      Last update: 2005-12-23 21:37    [W:0.029 / U:97.876 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site