1 files changed, 25 insertions, 27 deletions

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index a035fb07acda..09249149d96f 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -967,7 +967,7 @@ do_softint(struct work_struct *work)
  */
 static int cyy_issue_cmd(void __iomem * base_addr, u_char cmd, int index)
 {
-        volatile int i;
+        unsigned int i;
 
         /* Check to see that the previous command has completed */
         for (i = 0; i < 100; i++) {
@@ -1043,7 +1043,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
 {
         struct cyclades_port *info;
         struct tty_struct *tty;
-        volatile int char_count;
+        int char_count;
         int i, j, len, mdm_change, mdm_status, outch;
         int save_xir, channel, save_car;
         char data;
@@ -1551,20 +1551,19 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
 }                               /* cyz_issue_cmd */
 
 static void
-cyz_handle_rx(struct cyclades_port *info,
-                volatile struct CH_CTRL __iomem * ch_ctrl,
-                volatile struct BUF_CTRL __iomem * buf_ctrl)
+cyz_handle_rx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
+                struct BUF_CTRL __iomem *buf_ctrl)
 {
         struct cyclades_card *cinfo = &cy_card[info->card];
         struct tty_struct *tty = info->tty;
-        volatile int char_count;
+        int char_count;
         int len;
 #ifdef BLOCKMOVE
         int small_count;
 #else
         char data;
 #endif
-        volatile __u32 rx_put, rx_get, new_rx_get, rx_bufsize, rx_bufaddr;
+        __u32 rx_put, rx_get, new_rx_get, rx_bufsize, rx_bufaddr;
 
         rx_get = new_rx_get = readl(&buf_ctrl->rx_get);
         rx_put = readl(&buf_ctrl->rx_put);
@@ -1648,18 +1647,17 @@ cyz_handle_rx(struct cyclades_port *info,
 }
 
 static void
-cyz_handle_tx(struct cyclades_port *info,
-                volatile struct CH_CTRL __iomem * ch_ctrl,
-                volatile struct BUF_CTRL __iomem * buf_ctrl)
+cyz_handle_tx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
+                struct BUF_CTRL __iomem *buf_ctrl)
 {
         struct cyclades_card *cinfo = &cy_card[info->card];
         struct tty_struct *tty = info->tty;
         char data;
-        volatile int char_count;
+        int char_count;
 #ifdef BLOCKMOVE
         int small_count;
 #endif
-        volatile __u32 tx_put, tx_get, tx_bufsize, tx_bufaddr;
+        __u32 tx_put, tx_get, tx_bufsize, tx_bufaddr;
 
         if (info->xmit_cnt <= 0)        /* Nothing to transmit */
                 return;
@@ -1739,11 +1737,11 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
 {
         struct tty_struct *tty;
         struct cyclades_port *info;
-        static volatile struct FIRM_ID __iomem *firm_id;
-        static volatile struct ZFW_CTRL __iomem *zfw_ctrl;
-        static volatile struct BOARD_CTRL __iomem *board_ctrl;
-        static volatile struct CH_CTRL __iomem *ch_ctrl;
-        static volatile struct BUF_CTRL __iomem *buf_ctrl;
+        static struct FIRM_ID __iomem *firm_id;
+        static struct ZFW_CTRL __iomem *zfw_ctrl;
+        static struct BOARD_CTRL __iomem *board_ctrl;
+        static struct CH_CTRL __iomem *ch_ctrl;
+        static struct BUF_CTRL __iomem *buf_ctrl;
         __u32 channel;
         __u8 cmd;
         __u32 param;
@@ -1900,11 +1898,11 @@ static void cyz_poll(unsigned long arg)
         struct cyclades_card *cinfo;
         struct cyclades_port *info;
         struct tty_struct *tty;
-        static volatile struct FIRM_ID *firm_id;
-        static volatile struct ZFW_CTRL *zfw_ctrl;
-        static volatile struct BOARD_CTRL *board_ctrl;
-        static volatile struct CH_CTRL *ch_ctrl;
-        static volatile struct BUF_CTRL *buf_ctrl;
+        static struct FIRM_ID *firm_id;
+        static struct ZFW_CTRL *zfw_ctrl;
+        static struct BOARD_CTRL *board_ctrl;
+        static struct CH_CTRL *ch_ctrl;
+        static struct BUF_CTRL *buf_ctrl;
         unsigned long expires = jiffies + HZ;
         int card, port;
 
@@ -3003,12 +3001,12 @@ static int cy_chars_in_buffer(struct tty_struct *tty)
                 return info->xmit_cnt;
 #ifdef Z_EXT_CHARS_IN_BUFFER
         } else {
-                static volatile struct FIRM_ID *firm_id;
-                static volatile struct ZFW_CTRL *zfw_ctrl;
-                static volatile struct CH_CTRL *ch_ctrl;
-                static volatile struct BUF_CTRL *buf_ctrl;
+                static struct FIRM_ID *firm_id;
+                static struct ZFW_CTRL *zfw_ctrl;
+                static struct CH_CTRL *ch_ctrl;
+                static struct BUF_CTRL *buf_ctrl;
                 int char_count;
-                volatile __u32 tx_put, tx_get, tx_bufsize;
+                __u32 tx_put, tx_get, tx_bufsize;
 
                 firm_id = cy_card[card].base_addr + ID_ADDRESS;
                 zfw_ctrl = cy_card[card].base_addr +