lkml.org 
[lkml]   [2014]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] staging: slicoss: remove slic_reg_params struct
    Date
    Remove uninitialized struct that is only used to regulate whether
    incorrect eeprom checksums are ignored.

    Signed-off-by: David Matlack <matlackdavid@gmail.com>
    ---
    drivers/staging/slicoss/slic.h | 7 -------
    drivers/staging/slicoss/slicoss.c | 3 +--
    2 files changed, 1 insertion(+), 9 deletions(-)

    diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
    index 0dc73d5..3a5aa88 100644
    --- a/drivers/staging/slicoss/slic.h
    +++ b/drivers/staging/slicoss/slic.h
    @@ -362,12 +362,6 @@ struct slic_shmem {
    volatile struct slic_stats inicstats;
    };

    -struct slic_reg_params {
    - u32 linkspeed;
    - u32 linkduplex;
    - u32 fail_on_bad_eeprom;
    -};
    -
    struct slic_upr {
    uint adapter;
    u32 upr_request;
    @@ -492,7 +486,6 @@ struct adapter {
    u32 intagg_period;
    struct inicpm_state *inicpm_info;
    void *pinicpm_info;
    - struct slic_reg_params reg_params;
    struct slic_ifevents if_events;
    struct slic_stats inicstats_prev;
    struct slicnet_stats slic_stats;
    diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
    index d3fe8a7..1dae641 100644
    --- a/drivers/staging/slicoss/slicoss.c
    +++ b/drivers/staging/slicoss/slicoss.c
    @@ -2876,8 +2876,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
    sizeof(struct slic_eeprom),
    peeprom, phys_config);

    - if ((!card->config.EepromValid) &&
    - (adapter->reg_params.fail_on_bad_eeprom)) {
    + if (!card->config.EepromValid) {
    slic_reg64_write(adapter, &slic_regs->slic_isp, 0,
    &slic_regs->slic_addr_upper,
    0, FLUSH);
    --
    1.9.2


    \
     
     \ /
      Last update: 2014-05-18 06:42    [W:3.625 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site