aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsai Thambi SP <asamymuthupa@micron.com>2015-05-11 18:49:28 -0400
committerJens Axboe <axboe@fb.com>2015-06-16 10:24:44 -0400
commita7806fadc5f68b1551e4fa85f5e655c0448727f1 (patch)
tree053e0fbb2f723caaded6a344cf412910ed8a2ebf
parent02b48265e7437bfe153af16337b14ee74f00905f (diff)
mtip32xx: remove unused variable 'port->allocated'
Remove unused variable 'port->allocated' Signed-off-by: Selvan Mani <smani@micron.com> Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c15
-rw-r--r--drivers/block/mtip32xx/mtip32xx.h8
2 files changed, 2 insertions, 21 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index b79b59a696f1..0dd5d7633b70 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -623,8 +623,7 @@ static void mtip_handle_tfe(struct driver_data *dd)
623 623
624 set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags); 624 set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
625 625
626 if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags) && 626 if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags)) {
627 test_bit(MTIP_TAG_INTERNAL, port->allocated)) {
628 cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL); 627 cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL);
629 dbg_printk(MTIP_DRV_NAME " TFE for the internal command\n"); 628 dbg_printk(MTIP_DRV_NAME " TFE for the internal command\n");
630 629
@@ -2625,18 +2624,6 @@ static ssize_t mtip_hw_read_registers(struct file *f, char __user *ubuf,
2625 readl(dd->mmio + HOST_IRQ_STAT)); 2624 readl(dd->mmio + HOST_IRQ_STAT));
2626 size += sprintf(&buf[size], "\n"); 2625 size += sprintf(&buf[size], "\n");
2627 2626
2628 size += sprintf(&buf[size], "L/ Allocated : [ 0x");
2629
2630 for (n = dd->slot_groups-1; n >= 0; n--) {
2631 if (sizeof(long) > sizeof(u32))
2632 group_allocated =
2633 dd->port->allocated[n/2] >> (32*(n&1));
2634 else
2635 group_allocated = dd->port->allocated[n];
2636 size += sprintf(&buf[size], "%08X ", group_allocated);
2637 }
2638 size += sprintf(&buf[size], "]\n");
2639
2640 size += sprintf(&buf[size], "L/ Commands in Q : [ 0x"); 2627 size += sprintf(&buf[size], "L/ Commands in Q : [ 0x");
2641 2628
2642 for (n = dd->slot_groups-1; n >= 0; n--) { 2629 for (n = dd->slot_groups-1; n >= 0; n--) {
diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
index ba1b31ee22ec..d7a545974c78 100644
--- a/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@ -412,19 +412,13 @@ struct mtip_port {
412 * by the DMA when the driver issues internal commands. 412 * by the DMA when the driver issues internal commands.
413 */ 413 */
414 dma_addr_t sector_buffer_dma; 414 dma_addr_t sector_buffer_dma;
415 /* 415
416 * Bit significant, used to determine if a command slot has
417 * been allocated. i.e. the slot is in use. Bits are cleared
418 * when the command slot and all associated data structures
419 * are no longer needed.
420 */
421 u16 *log_buf; 416 u16 *log_buf;
422 dma_addr_t log_buf_dma; 417 dma_addr_t log_buf_dma;
423 418
424 u8 *smart_buf; 419 u8 *smart_buf;
425 dma_addr_t smart_buf_dma; 420 dma_addr_t smart_buf_dma;
426 421
427 unsigned long allocated[SLOTBITS_IN_LONGS];
428 /* 422 /*
429 * used to queue commands when an internal command is in progress 423 * used to queue commands when an internal command is in progress
430 * or error handling is active 424 * or error handling is active