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: Wed, 8 Feb 2017 00:36:27 +0530 [thread overview]
Message-ID: <20170207190627.4403-1-Karthik.188@gmail.com> (raw)
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 introducing a temporary variable which is of type
'__be32' and converting the existing variable to type 'unsigned int'.
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
drivers/staging/comedi/drivers/ni_pcimio.c | 5 +++--
drivers/staging/comedi/drivers/ni_stc.h | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index cdb66eab1292..4f45a5c230ad 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1207,6 +1207,7 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
unsigned int old_iodwbsr_bits;
unsigned int old_iodwbsr1_bits;
unsigned int old_iodwcr1_bits;
+ __be32 serial_number;
int i;
/* IO Window 1 needs to be temporarily mapped to read the eeprom */
@@ -1223,10 +1224,10 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
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;
+ char *byte_ptr = (char *)&serial_number + i;
*byte_ptr = ni_readb(dev, serial_number_eeprom_offset + i);
}
- devpriv->serial_number = be32_to_cpu(devpriv->serial_number);
+ devpriv->serial_number = be32_to_cpu(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..b5eca0da71eb 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -1031,7 +1031,7 @@ struct ni_private {
unsigned short ai_fifo_buffer[0x2000];
u8 eeprom_buffer[M_SERIES_EEPROM_SIZE];
- __be32 serial_number;
+ unsigned int serial_number;
struct mite *mite;
struct mite_channel *ai_mite_chan;
--
2.11.0
next reply other threads:[~2017-02-07 19:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 19:06 Karthik Nayak [this message]
2017-02-08 13:13 ` [PATCH] staging: comedi: Fix incorrect type assignment 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 ` [PATCH] staging: comedi: Fix incorrect type assignment Karthik Nayak
2017-02-09 11:04 ` 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=20170207190627.4403-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