Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1575974 > unrolled thread

[PATCH] staging: comedi: Fix incorrect type assignment

Started byKarthik Nayak <karthik.188@gmail.com>
First post2017-02-07 20:20 +0100
Last post2017-02-08 23:30 +0100
Articles 9 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] staging: comedi: Fix incorrect type assignment Karthik Nayak <karthik.188@gmail.com> - 2017-02-07 20:20 +0100
    Re: [PATCH] staging: comedi: Fix incorrect type assignment Karthik Nayak <karthik.188@gmail.com> - 2017-02-08 14:30 +0100
      Re: [PATCH] staging: comedi: Fix incorrect type assignment Ian Abbott <abbotti@mev.co.uk> - 2017-02-08 15:10 +0100
        Re: [PATCH] staging: comedi: Fix incorrect type assignment Karthik Nayak <karthik.188@gmail.com> - 2017-02-08 16:40 +0100
    Re: [PATCH] staging: comedi: Fix incorrect type assignment Ian Abbott <abbotti@mev.co.uk> - 2017-02-08 14:30 +0100
    [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private' Karthik Nayak <karthik.188@gmail.com> - 2017-02-08 18:30 +0100
      Re: [PATCH 2/2] staging: comedi: drop unused variable from struct  'ni_private' Ian Abbott <abbotti@mev.co.uk> - 2017-02-08 18:50 +0100
        Re: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private' Karthik Nayak <karthik.188@gmail.com> - 2017-02-08 21:20 +0100
          Re: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private' Karthik Nayak <karthik.188@gmail.com> - 2017-02-08 23:30 +0100

#1575974 — [PATCH] staging: comedi: Fix incorrect type assignment

FromKarthik Nayak <karthik.188@gmail.com>
Date2017-02-07 20:20 +0100
Subject[PATCH] staging: comedi: Fix incorrect type assignment
Message-ID<t8jsZ-6U2-7@gated-at.bofh.it>
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

[toc] | [next] | [standalone]

#1576574

FromKarthik Nayak <karthik.188@gmail.com>
Date2017-02-08 14:30 +0100
Message-ID<t8AtP-Rq-3@gated-at.bofh.it>
In reply to#1575974
Hello,

On Wed, Feb 8, 2017 at 6:43 PM, Ian Abbott <abbotti@mev.co.uk> wrote:
> On 07/02/17 19:06, Karthik Nayak wrote:
>>
>> 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;
>>
>
> That looks fine, thanks!
>
> (On a side note, nothing actually uses serial number, so the code that reads
> it from the EEPROM could just be ripped out.)
>
> Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
>

Yea, I saw that, was assuming there might be a purposed use case scenario.

Do you want me to send another patch?

-- 
Regards,
Karthik Nayak

[toc] | [prev] | [next] | [standalone]

#1576608

FromIan Abbott <abbotti@mev.co.uk>
Date2017-02-08 15:10 +0100
Message-ID<t8B6z-1k4-45@gated-at.bofh.it>
In reply to#1576574
On 08/02/17 13:26, Karthik Nayak wrote:
> Hello,
>
> On Wed, Feb 8, 2017 at 6:43 PM, Ian Abbott <abbotti@mev.co.uk> wrote:
>> On 07/02/17 19:06, Karthik Nayak wrote:
>>>
>>> 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(-)
[snip]

>> (On a side note, nothing actually uses serial number, so the code that reads
>> it from the EEPROM could just be ripped out.)
>>
>> Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
>>
>
> Yea, I saw that, was assuming there might be a purposed use case scenario.

AFAICT it's never been used - not even to print a kernel log message or 
anything.

> Do you want me to send another patch?

If you want.  If you plan to do so, could you indicate whether you are 
going to base the patch on top of this one, or whether this patch should 
be discarded.  Thanks!

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

[toc] | [prev] | [next] | [standalone]

#1576658

FromKarthik Nayak <karthik.188@gmail.com>
Date2017-02-08 16:40 +0100
Message-ID<t8CvE-240-5@gated-at.bofh.it>
In reply to#1576608
Hi,

On Wed, Feb 8, 2017 at 7:18 PM, Ian Abbott <abbotti@mev.co.uk> wrote:
> On 08/02/17 13:26, Karthik Nayak wrote:
>>
>> Hello,
>>
>> On Wed, Feb 8, 2017 at 6:43 PM, Ian Abbott <abbotti@mev.co.uk> wrote:
>>>
>>> On 07/02/17 19:06, Karthik Nayak wrote:
>>>>
>>>>
>>>> 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(-)
>
> [snip]
>
>>> (On a side note, nothing actually uses serial number, so the code that
>>> reads
>>> it from the EEPROM could just be ripped out.)
>>>
>>> Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
>>>
>>
>> Yea, I saw that, was assuming there might be a purposed use case scenario.
>
>
> AFAICT it's never been used - not even to print a kernel log message or
> anything.
>
>> Do you want me to send another patch?
>
>
> If you want.  If you plan to do so, could you indicate whether you are going
> to base the patch on top of this one, or whether this patch should be
> discarded.  Thanks!
>

Sure, I'll base it on top of the existing patch. I'll reply to the
first patch with the second one.

-- 
Regards,
Karthik Nayak

[toc] | [prev] | [next] | [standalone]

#1576584

FromIan Abbott <abbotti@mev.co.uk>
Date2017-02-08 14:30 +0100
Message-ID<t8AtP-Rq-5@gated-at.bofh.it>
In reply to#1575974
On 07/02/17 19:06, Karthik Nayak wrote:
> 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;
>

That looks fine, thanks!

(On a side note, nothing actually uses serial number, so the code that 
reads it from the EEPROM could just be ripped out.)

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

[toc] | [prev] | [next] | [standalone]

#1576753 — [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'

FromKarthik Nayak <karthik.188@gmail.com>
Date2017-02-08 18:30 +0100
Subject[PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'
Message-ID<t8Ee7-3aO-41@gated-at.bofh.it>
In reply to#1575974
Drop the 'serial_number' variable from the struct 'ni_private' since
its never used after assignment.

Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---

This is to be based on top of "staging: comedi: Fix incorrect type assignment"
to which this is replied to. 

 drivers/staging/comedi/drivers/ni_pcimio.c | 3 +--
 drivers/staging/comedi/drivers/ni_stc.h    | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 4f45a5c230ad..da4d3da071eb 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1222,12 +1222,11 @@ 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));
+	BUG_ON(serial_number_eeprom_length > sizeof(serial_number));
 	for (i = 0; i < serial_number_eeprom_length; ++i) {
 		char *byte_ptr = (char *)&serial_number + i;
 		*byte_ptr = ni_readb(dev, serial_number_eeprom_offset + i);
 	}
-	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 b5eca0da71eb..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];
-	unsigned int serial_number;
 
 	struct mite *mite;
 	struct mite_channel *ai_mite_chan;
-- 
2.11.1

[toc] | [prev] | [next] | [standalone]

#1576782 — Re: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'

FromIan Abbott <abbotti@mev.co.uk>
Date2017-02-08 18:50 +0100
SubjectRe: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'
Message-ID<t8Exs-3hZ-7@gated-at.bofh.it>
In reply to#1576753
On 08/02/2017 16:55, Karthik Nayak wrote:
> Drop the 'serial_number' variable from the struct 'ni_private' since
> its never used after assignment.
>
> Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
> ---
>
> This is to be based on top of "staging: comedi: Fix incorrect type assignment"
> to which this is replied to.
>
>  drivers/staging/comedi/drivers/ni_pcimio.c | 3 +--
>  drivers/staging/comedi/drivers/ni_stc.h    | 1 -
>  2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
> index 4f45a5c230ad..da4d3da071eb 100644
> --- a/drivers/staging/comedi/drivers/ni_pcimio.c
> +++ b/drivers/staging/comedi/drivers/ni_pcimio.c
> @@ -1222,12 +1222,11 @@ 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);
>

I think it would be preferable to remove the code from here ...

> -	BUG_ON(serial_number_eeprom_length > sizeof(devpriv->serial_number));
> +	BUG_ON(serial_number_eeprom_length > sizeof(serial_number));
>  	for (i = 0; i < serial_number_eeprom_length; ++i) {
>  		char *byte_ptr = (char *)&serial_number + i;
>  		*byte_ptr = ni_readb(dev, serial_number_eeprom_offset + i);
>  	}
> -	devpriv->serial_number = be32_to_cpu(serial_number);

... to here.  And remove the serial_number_eeprom_length, 
serial_number_eeprom_offset, and serial_number variables too.  There is 
no need to continue reading the serial number bytes from the EEPROM.

>
>  	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 b5eca0da71eb..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];
> -	unsigned int serial_number;
>
>  	struct mite *mite;
>  	struct mite_channel *ai_mite_chan;
>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

[toc] | [prev] | [next] | [standalone]

#1577020 — Re: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'

FromKarthik Nayak <karthik.188@gmail.com>
Date2017-02-08 21:20 +0100
SubjectRe: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'
Message-ID<t8GSC-4S1-29@gated-at.bofh.it>
In reply to#1576782
Hey,

On Wed, Feb 8, 2017 at 11:10 PM, Ian Abbott <abbotti@mev.co.uk> wrote:
> On 08/02/2017 16:55, Karthik Nayak wrote:
>>
>> Drop the 'serial_number' variable from the struct 'ni_private' since
>> its never used after assignment.
>>
>> Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
>> ---
>>
>> This is to be based on top of "staging: comedi: Fix incorrect type
>> assignment"
>> to which this is replied to.
>>
>>  drivers/staging/comedi/drivers/ni_pcimio.c | 3 +--
>>  drivers/staging/comedi/drivers/ni_stc.h    | 1 -
>>  2 files changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c
>> b/drivers/staging/comedi/drivers/ni_pcimio.c
>> index 4f45a5c230ad..da4d3da071eb 100644
>> --- a/drivers/staging/comedi/drivers/ni_pcimio.c
>> +++ b/drivers/staging/comedi/drivers/ni_pcimio.c
>> @@ -1222,12 +1222,11 @@ 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);
>>
>
> I think it would be preferable to remove the code from here ...
>
>> -       BUG_ON(serial_number_eeprom_length >
>> sizeof(devpriv->serial_number));
>> +       BUG_ON(serial_number_eeprom_length > sizeof(serial_number));
>>         for (i = 0; i < serial_number_eeprom_length; ++i) {
>>                 char *byte_ptr = (char *)&serial_number + i;
>>                 *byte_ptr = ni_readb(dev, serial_number_eeprom_offset +
>> i);
>>         }
>> -       devpriv->serial_number = be32_to_cpu(serial_number);
>
>
> ... to here.  And remove the serial_number_eeprom_length,
> serial_number_eeprom_offset, and serial_number variables too.  There is no
> need to continue reading the serial number bytes from the EEPROM.
>

Ah! I'll do that and send a patch, thanks :)

>>
>>         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 b5eca0da71eb..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];
>> -       unsigned int serial_number;
>>
>>         struct mite *mite;
>>         struct mite_channel *ai_mite_chan;
>>
>
> --
> -=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
> -=(                          Web: http://www.mev.co.uk/  )=-



-- 
Regards,
Karthik Nayak

[toc] | [prev] | [next] | [standalone]

#1577157 — Re: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'

FromKarthik Nayak <karthik.188@gmail.com>
Date2017-02-08 23:30 +0100
SubjectRe: [PATCH 2/2] staging: comedi: drop unused variable from struct 'ni_private'
Message-ID<t8H2h-4VH-9@gated-at.bofh.it>
In reply to#1577020
Hello,

>>
>> ... to here.  And remove the serial_number_eeprom_length,
>> serial_number_eeprom_offset, and serial_number variables too.  There is no
>> need to continue reading the serial number bytes from the EEPROM.
>>
>
> Ah! I'll do that and send a patch, thanks :)
>

Sorry for the multiple messages, now that we're deleting the whole
block, I think it makes sense to
squash the commits, so I'll send one single patch.

-- 
Regards,
Karthik Nayak

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web