diff mbox series

[15/30] net: eepro100: Remove volatile misuse

Message ID 20200523163837.407592-15-marek.vasut+renesas@gmail.com
State New
Delegated to: Joe Hershberger
Headers show
Series [01/30] net: eepro100: Remove EEPRO100_SROM_WRITE | expand

Commit Message

Marek Vasut May 23, 2020, 4:38 p.m. UTC
Remove all the remaining use of the 'volatile' keyword, as this is
no longer required. All the accesses which might have needed this
use of 'volatile' have been repaired properly.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
---
 drivers/net/eepro100.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

Comments

Ramon Fried May 23, 2020, 5:17 p.m. UTC | #1
On Sat, May 23, 2020 at 7:42 PM Marek Vasut <marek.vasut@gmail.com> wrote:
>
> Remove all the remaining use of the 'volatile' keyword, as this is
> no longer required. All the accesses which might have needed this
> use of 'volatile' have been repaired properly.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> ---
>  drivers/net/eepro100.c | 42 +++++++++++++++++++++---------------------
>  1 file changed, 21 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
> index 89bfcfba0a..f3bcb0dfe4 100644
> --- a/drivers/net/eepro100.c
> +++ b/drivers/net/eepro100.c
> @@ -103,13 +103,13 @@
>
>  /* Receive frame descriptors. */
>  struct eepro100_rxfd {
> -       volatile u16 status;
> -       volatile u16 control;
> -       volatile u32 link;              /* struct eepro100_rxfd * */
> -       volatile u32 rx_buf_addr;       /* void * */
> -       volatile u32 count;
> +       u16 status;
> +       u16 control;
> +       u32 link;               /* struct eepro100_rxfd * */
> +       u32 rx_buf_addr;        /* void * */
> +       u32 count;
>
> -       volatile u8 data[PKTSIZE_ALIGN];
> +       u8 data[PKTSIZE_ALIGN];
>  };
>
>  #define RFD_STATUS_C           0x8000  /* completion of received frame */
> @@ -136,17 +136,17 @@ struct eepro100_rxfd {
>  #define RFD_RX_TCO             0x0001  /* TCO indication */
>
>  /* Transmit frame descriptors */
> -struct eepro100_txfd {                 /* Transmit frame descriptor set. */
> -       volatile u16 status;
> -       volatile u16 command;
> -       volatile u32 link;              /* void * */
> -       volatile u32 tx_desc_addr;      /* Always points to the tx_buf_addr element. */
> -       volatile s32 count;
> -
> -       volatile u32 tx_buf_addr0;      /* void *, frame to be transmitted. */
> -       volatile s32 tx_buf_size0;      /* Length of Tx frame. */
> -       volatile u32 tx_buf_addr1;      /* void *, frame to be transmitted. */
> -       volatile s32 tx_buf_size1;      /* Length of Tx frame. */
> +struct eepro100_txfd {         /* Transmit frame descriptor set. */
> +       u16 status;
> +       u16 command;
> +       u32 link;               /* void * */
> +       u32 tx_desc_addr;       /* Always points to the tx_buf_addr element. */
> +       s32 count;
> +
> +       u32 tx_buf_addr0;       /* void *, frame to be transmitted. */
> +       s32 tx_buf_size0;       /* Length of Tx frame. */
> +       u32 tx_buf_addr1;       /* void *, frame to be transmitted. */
> +       s32 tx_buf_size1;       /* Length of Tx frame. */
>  };
>
>  #define TXCB_CMD_TRANSMIT      0x0004  /* transmit command */
> @@ -160,10 +160,10 @@ struct eepro100_txfd {                    /* Transmit frame descriptor set. */
>  #define TXCB_COUNT_EOF         0x8000
>
>  /* The Speedo3 Rx and Tx frame/buffer descriptors. */
> -struct descriptor {                    /* A generic descriptor. */
> -       volatile u16 status;
> -       volatile u16 command;
> -       volatile u32 link;              /* struct descriptor * */
> +struct descriptor {            /* A generic descriptor. */
> +       u16 status;
> +       u16 command;
> +       u32 link;               /* struct descriptor * */
>
>         unsigned char params[0];
>  };
> --
> 2.25.1
>
Reviewed-By: Ramon Fried <rfried.dev@gmail.com>
diff mbox series

Patch

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 89bfcfba0a..f3bcb0dfe4 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -103,13 +103,13 @@ 
 
 /* Receive frame descriptors. */
 struct eepro100_rxfd {
-	volatile u16 status;
-	volatile u16 control;
-	volatile u32 link;		/* struct eepro100_rxfd * */
-	volatile u32 rx_buf_addr;	/* void * */
-	volatile u32 count;
+	u16 status;
+	u16 control;
+	u32 link;		/* struct eepro100_rxfd * */
+	u32 rx_buf_addr;	/* void * */
+	u32 count;
 
-	volatile u8 data[PKTSIZE_ALIGN];
+	u8 data[PKTSIZE_ALIGN];
 };
 
 #define RFD_STATUS_C		0x8000	/* completion of received frame */
@@ -136,17 +136,17 @@  struct eepro100_rxfd {
 #define RFD_RX_TCO		0x0001	/* TCO indication */
 
 /* Transmit frame descriptors */
-struct eepro100_txfd {			/* Transmit frame descriptor set. */
-	volatile u16 status;
-	volatile u16 command;
-	volatile u32 link;		/* void * */
-	volatile u32 tx_desc_addr;	/* Always points to the tx_buf_addr element. */
-	volatile s32 count;
-
-	volatile u32 tx_buf_addr0;	/* void *, frame to be transmitted. */
-	volatile s32 tx_buf_size0;	/* Length of Tx frame. */
-	volatile u32 tx_buf_addr1;	/* void *, frame to be transmitted. */
-	volatile s32 tx_buf_size1;	/* Length of Tx frame. */
+struct eepro100_txfd {		/* Transmit frame descriptor set. */
+	u16 status;
+	u16 command;
+	u32 link;		/* void * */
+	u32 tx_desc_addr;	/* Always points to the tx_buf_addr element. */
+	s32 count;
+
+	u32 tx_buf_addr0;	/* void *, frame to be transmitted. */
+	s32 tx_buf_size0;	/* Length of Tx frame. */
+	u32 tx_buf_addr1;	/* void *, frame to be transmitted. */
+	s32 tx_buf_size1;	/* Length of Tx frame. */
 };
 
 #define TXCB_CMD_TRANSMIT	0x0004	/* transmit command */
@@ -160,10 +160,10 @@  struct eepro100_txfd {			/* Transmit frame descriptor set. */
 #define TXCB_COUNT_EOF		0x8000
 
 /* The Speedo3 Rx and Tx frame/buffer descriptors. */
-struct descriptor {			/* A generic descriptor. */
-	volatile u16 status;
-	volatile u16 command;
-	volatile u32 link;		/* struct descriptor * */
+struct descriptor {		/* A generic descriptor. */
+	u16 status;
+	u16 command;
+	u32 link;		/* struct descriptor * */
 
 	unsigned char params[0];
 };