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

Groups > linux.kernel > #1576753

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

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[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

csiph-web