staging: slicoss: fail on corrupt eeprom

Remove fail_on_bad_eeprom, which was always 0 and thus being used
to ignore incorrect checksumming. This means devices with corrupt
eeprom will now cause the driver to fail.

Since fail_on_bad_eeprom was the last member in use of struct
slic_reg_params, remove that struct altogether.

Signed-off-by: David Matlack <matlackdavid@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
index 7de57c4c7fe73773a235272caf5ed40d41994b7f..15a24c024d22fbb50342eaee33542e436df43b52 100644 (file)
--- 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;
@@ -493,7 +487,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 6ad180b6ec85f990d470b2f71815cad717fb17d5..9ff1a31faf2eeba2bd9e1358bb9c3c1ae34d660a 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -2850,8 +2850,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);