From: Karthik Nayak <karthik.188@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: devel@driverdev.osuosl.org, abbotti@mev.co.uk,
hsweeten@visionengravers.com, kastolom@gmail.com,
gregkh@linuxfoundation.org, Karthik Nayak <Karthik.188@gmail.com>
Subject: [PATCH] staging: comedi: Fix incorrect type assignment
Date: Thu, 9 Feb 2017 01:53:56 +0530 [thread overview]
Message-ID: <20170208202356.5662-1-Karthik.188@gmail.com> (raw)
In-Reply-To: <CAOLa=ZQ96WsBNuBtZccXk_MUz4qPbot1hkwy2wmgLgavCe_v6Q@mail.gmail.com>
This patch fixes the following sparse error:
drivers/staging/comedi/drivers//ni_pcimio.c:1229:32: warning: incorrect type in assignment (different base types)
drivers/staging/comedi/drivers//ni_pcimio.c:1229:32: expected restricted __be32 [usertype] serial_number
drivers/staging/comedi/drivers//ni_pcimio.c:1229:32: got unsigned int
This is done by removing the whole code block, since the variable
'serial_number' is only assigned but never used.
Helped-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
drivers/staging/comedi/drivers/ni_pcimio.c | 9 ---------
drivers/staging/comedi/drivers/ni_stc.h | 1 -
2 files changed, 10 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index cdb66eab1292..3a96913c025e 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1202,8 +1202,6 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
resource_size_t daq_phys_addr;
static const int Start_Cal_EEPROM = 0x400;
static const unsigned int window_size = 10;
- static const int serial_number_eeprom_offset = 0x4;
- static const int serial_number_eeprom_length = 0x4;
unsigned int old_iodwbsr_bits;
unsigned int old_iodwbsr1_bits;
unsigned int old_iodwcr1_bits;
@@ -1221,13 +1219,6 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
writel(0x1 | old_iodwcr1_bits, mite->mmio + MITE_IODWCR_1);
writel(0xf, mite->mmio + 0x30);
- BUG_ON(serial_number_eeprom_length > sizeof(devpriv->serial_number));
- for (i = 0; i < serial_number_eeprom_length; ++i) {
- char *byte_ptr = (char *)&devpriv->serial_number + i;
- *byte_ptr = ni_readb(dev, serial_number_eeprom_offset + i);
- }
- devpriv->serial_number = be32_to_cpu(devpriv->serial_number);
-
for (i = 0; i < M_SERIES_EEPROM_SIZE; ++i)
devpriv->eeprom_buffer[i] = ni_readb(dev, Start_Cal_EEPROM + i);
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index f27b545f83eb..61138e86a455 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -1031,7 +1031,6 @@ struct ni_private {
unsigned short ai_fifo_buffer[0x2000];
u8 eeprom_buffer[M_SERIES_EEPROM_SIZE];
- __be32 serial_number;
struct mite *mite;
struct mite_channel *ai_mite_chan;
--
2.11.1
next prev parent reply other threads:[~2017-02-08 20:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 19:06 Karthik Nayak
2017-02-08 13:13 ` Ian Abbott
2017-02-08 13:26 ` Karthik Nayak
2017-02-08 13:48 ` Ian Abbott
2017-02-08 15:30 ` Karthik Nayak
2017-02-08 16:55 ` [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private' Karthik Nayak
2017-02-08 17:40 ` Ian Abbott
2017-02-08 20:05 ` Karthik Nayak
2017-02-08 20:18 ` Karthik Nayak
2017-02-08 20:23 ` Karthik Nayak [this message]
2017-02-09 11:04 ` [PATCH] staging: comedi: Fix incorrect type assignment Greg KH
2017-02-09 11:22 ` Ian Abbott
2017-02-09 11:34 ` Karthik Nayak
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=20170208202356.5662-1-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--cc=kastolom@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®