From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751499AbaETFEt (ORCPT ); Tue, 20 May 2014 01:04:49 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:45541 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751338AbaETFEf (ORCPT ); Tue, 20 May 2014 01:04:35 -0400 From: David Matlack To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, liodot@gmail.com, charrer@alacritech.com, dan.carpenter@oracle.com, David Matlack Subject: [PATCH V2 2/2] staging: slicoss: fail on corrupt eeprom Date: Mon, 19 May 2014 22:04:00 -0700 Message-Id: <1400562240-15159-3-git-send-email-matlackdavid@gmail.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400562240-15159-1-git-send-email-matlackdavid@gmail.com> References: <1400562240-15159-1-git-send-email-matlackdavid@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 9eb2434..b9fd94f 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -2841,8 +2841,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