3 files changed, 19 insertions, 20 deletions

diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index bba467fe4bce..5e0e960df456 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -271,7 +271,7 @@ void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc,
                 mrq->data_dir = READ;
 
         mrq->sg = *sg;
-        mrq->io_type = MEMSTICK_IO_SG;
+        mrq->long_data = 1;
 
         if (tpc == MS_TPC_SET_CMD || tpc == MS_TPC_EX_SET_CMD)
                 mrq->need_card_int = 1;
@@ -306,7 +306,7 @@ void memstick_init_req(struct memstick_request *mrq, unsigned char tpc,
         if (mrq->data_dir == WRITE)
                 memcpy(mrq->data, buf, mrq->data_len);
 
-        mrq->io_type = MEMSTICK_IO_VAL;
+        mrq->long_data = 0;
 
         if (tpc == MS_TPC_SET_CMD || tpc == MS_TPC_EX_SET_CMD)
                 mrq->need_card_int = 1;
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 423ad8cf4bb9..214211c8ac9a 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -629,7 +629,7 @@ static void mspro_block_process_request(struct memstick_dev *card,
                         param.system = msb->system;
                         param.data_count = cpu_to_be16(page_count);
                         param.data_address = cpu_to_be32((uint32_t)t_sec);
-                        param.cmd_param = 0;
+                        param.tpc_param = 0;
 
                         msb->data_dir = rq_data_dir(req);
                         msb->transfer_cmd = msb->data_dir == READ
@@ -761,7 +761,7 @@ static int mspro_block_switch_to_parallel(struct memstick_dev *card)
                 .system = 0,
                 .data_count = 0,
                 .data_address = 0,
-                .cmd_param = 0
+                .tpc_param = 0
         };
 
         card->next_request = h_mspro_block_req_init;
@@ -773,8 +773,8 @@ static int mspro_block_switch_to_parallel(struct memstick_dev *card)
         if (card->current_mrq.error)
                 return card->current_mrq.error;
 
-        msb->system = 0;
-        host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_PARALLEL);
+        msb->system = MEMSTICK_SYS_PAR4;
+        host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_PAR4);
 
         card->next_request = h_mspro_block_req_init;
         msb->mrq_handler = h_mspro_block_default;
@@ -802,7 +802,7 @@ static int mspro_block_read_attributes(struct memstick_dev *card)
                 .system = msb->system,
                 .data_count = cpu_to_be16(1),
                 .data_address = 0,
-                .cmd_param = 0
+                .tpc_param = 0
         };
         struct mspro_attribute *attr = NULL;
         struct mspro_sys_attr *s_attr = NULL;
@@ -922,7 +922,7 @@ static int mspro_block_read_attributes(struct memstick_dev *card)
                 param.system = msb->system;
                 param.data_count = cpu_to_be16((rc / msb->page_size) + 1);
                 param.data_address = cpu_to_be32(addr / msb->page_size);
-                param.cmd_param = 0;
+                param.tpc_param = 0;
 
                 sg_init_one(&msb->req_sg[0], buffer,
                             be16_to_cpu(param.data_count) * msb->page_size);
@@ -964,7 +964,7 @@ static int mspro_block_init_card(struct memstick_dev *card)
         struct memstick_host *host = card->host;
         int rc = 0;
 
-        msb->system = 0x80;
+        msb->system = MEMSTICK_SYS_SERIAL;
         card->reg_addr.r_offset = offsetof(struct mspro_register, status);
         card->reg_addr.r_length = sizeof(struct ms_status_register);
         card->reg_addr.w_offset = offsetof(struct mspro_register, param);
@@ -973,7 +973,7 @@ static int mspro_block_init_card(struct memstick_dev *card)
         if (memstick_set_rw_addr(card))
                 return -EIO;
 
-        if (host->caps & MEMSTICK_CAP_PARALLEL) {
+        if (host->caps & MEMSTICK_CAP_PAR4) {
                 if (mspro_block_switch_to_parallel(card))
                         printk(KERN_WARNING "%s: could not switch to "
                                "parallel interface\n", card->dev.bus_id);
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index 4fb24215bd95..5b5bd61b3a4a 100644
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -209,7 +209,7 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)
 
         host->cmd_flags = 0;
 
-        if (host->req->io_type == MEMSTICK_IO_SG) {
+        if (host->req->long_data) {
                 if (!host->no_dma) {
                         if (1 != tifm_map_sg(sock, &host->req->sg, 1,
                                              host->req->data_dir == READ
@@ -248,7 +248,7 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)
                 cmd_mask = readl(sock->addr + SOCK_MS_SYSTEM);
                 cmd_mask |= TIFM_MS_SYS_DATA | TIFM_MS_SYS_NOT_RDY;
                 writel(cmd_mask, sock->addr + SOCK_MS_SYSTEM);
-        } else if (host->req->io_type == MEMSTICK_IO_VAL) {
+        } else {
                 data = host->req->data;
                 data_len = host->req->data_len;
 
@@ -294,8 +294,7 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)
                 cmd_mask |= TIFM_MS_SYS_NOT_RDY;
                 dev_dbg(&sock->dev, "mask %x\n", cmd_mask);
                 writel(cmd_mask, sock->addr + SOCK_MS_SYSTEM);
-        } else
-                BUG();
+        }
 
         mod_timer(&host->timer, jiffies + host->timeout_jiffies);
         writel(TIFM_CTRL_LED | readl(sock->addr + SOCK_CONTROL),
@@ -319,13 +318,13 @@ static void tifm_ms_complete_cmd(struct tifm_ms *host)
         int rc;
 
         del_timer(&host->timer);
-        if (host->req->io_type == MEMSTICK_IO_SG) {
+        if (host->req->long_data) {
                 if (!host->no_dma)
                         tifm_unmap_sg(sock, &host->req->sg, 1,
                                       host->req->data_dir == READ
                                       ? PCI_DMA_FROMDEVICE
                                       : PCI_DMA_TODEVICE);
-        } else if (host->req->io_type == MEMSTICK_IO_VAL) {
+        } else {
                 writel(~TIFM_MS_SYS_DATA & readl(sock->addr + SOCK_MS_SYSTEM),
                        sock->addr + SOCK_MS_SYSTEM);
 
@@ -365,7 +364,7 @@ static int tifm_ms_check_status(struct tifm_ms *host)
         if (!host->req->error) {
                 if (!(host->cmd_flags & CMD_READY))
                         return 1;
-                if ((host->req->io_type == MEMSTICK_IO_SG)
+                if (host->req->long_data
                     && !(host->cmd_flags & FIFO_READY))
                         return 1;
                 if (host->req->need_card_int
@@ -505,7 +504,7 @@ static void tifm_ms_set_param(struct memstick_host *msh,
                         writel((~TIFM_CTRL_FAST_CLK)
                                & readl(sock->addr + SOCK_CONTROL),
                                sock->addr + SOCK_CONTROL);
-                } else if (value == MEMSTICK_PARALLEL) {
+                } else if (value == MEMSTICK_PAR4) {
                         host->mode_mask = 0;
                         writel(TIFM_CTRL_FAST_CLK
                                | readl(sock->addr + SOCK_CONTROL),
@@ -542,7 +541,7 @@ static int tifm_ms_initialize_host(struct tifm_ms *host)
         writel(0x0200 | TIFM_MS_SYS_NOT_RDY, sock->addr + SOCK_MS_SYSTEM);
         writel(0xffffffff, sock->addr + SOCK_MS_STATUS);
         if (tifm_has_ms_pif(sock))
-                msh->caps |= MEMSTICK_CAP_PARALLEL;
+                msh->caps |= MEMSTICK_CAP_PAR4;
 
         return 0;
 }
@@ -601,7 +600,7 @@ static void tifm_ms_remove(struct tifm_dev *sock)
                 writel(TIFM_FIFO_INT_SETALL,
                        sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
                 writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
-                if ((host->req->io_type == MEMSTICK_IO_SG) && !host->no_dma)
+                if (host->req->long_data && !host->no_dma)
                         tifm_unmap_sg(sock, &host->req->sg, 1,
                                       host->req->data_dir == READ
                                       ? PCI_DMA_TODEVICE