From: David Matlack <matlackdavid@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
liodot@gmail.com, charrer@alacritech.com,
David Matlack <matlackdavid@gmail.com>
Subject: [PATCH 2/2] staging: slicoss: remove slic_reg_params struct
Date: Sat, 17 May 2014 21:00:04 -0700 [thread overview]
Message-ID: <1400385604-21086-3-git-send-email-matlackdavid@gmail.com> (raw)
In-Reply-To: <1400385604-21086-1-git-send-email-matlackdavid@gmail.com>
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
next prev parent reply other threads:[~2014-05-18 4:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-18 4:00 [PATCH 0/2] staging: slicoss: cleanup checksum computation David Matlack
2014-05-18 4:00 ` [PATCH 1/2] staging: slicoss: rewrite eeprom checksum code David Matlack
2014-05-18 4:12 ` Joe Perches
2014-05-18 4:51 ` David Matlack
2014-05-18 22:43 ` David Matlack
2014-05-19 9:16 ` Dan Carpenter
2014-05-19 20:49 ` David Matlack
2014-05-19 21:15 ` Dan Carpenter
2014-05-19 21:21 ` Dan Carpenter
2014-05-18 4:00 ` David Matlack [this message]
2014-05-19 9:21 ` [PATCH 2/2] staging: slicoss: remove slic_reg_params struct Dan Carpenter
2014-05-19 15:57 ` David Matlack
2014-05-19 19:52 ` Dan Carpenter
2014-05-19 20:54 ` David Matlack
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400385604-21086-3-git-send-email-matlackdavid@gmail.com \
--to=matlackdavid@gmail.com \
--cc=charrer@alacritech.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liodot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.