Merge branch 'i2c-embedded/for-3.4' of git://git.pengutronix.de/git/wsa/linux

[~andy/linux] / drivers / target / target_core_ua.c

diff --git a/drivers/target/target_core_ua.c b/drivers/target/target_core_ua.c
index 31e3c652527e0d3999983f022fd1a5627a99ed63..6666a0c74f607393cdc0aa9e1d1507fd6bcb89ed 100644 (file)
--- a/drivers/target/target_core_ua.c
+++ b/drivers/target/target_core_ua.c
@@ -24,20 +24,17 @@
  *
  ******************************************************************************/
 
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 
 #include <target/target_core_base.h>
-#include <target/target_core_device.h>
-#include <target/target_core_transport.h>
-#include <target/target_core_fabric_ops.h>
+#include <target/target_core_fabric.h>
 #include <target/target_core_configfs.h>
 
+#include "target_core_internal.h"
 #include "target_core_alua.h"
-#include "target_core_hba.h"
 #include "target_core_pr.h"
 #include "target_core_ua.h"
 
@@ -56,7 +53,7 @@ int core_scsi3_ua_check(
        if (!nacl)
                return 0;
 
-       deve = &nacl->device_list[cmd->orig_fe_lun];
+       deve = nacl->device_list[cmd->orig_fe_lun];
        if (!atomic_read(&deve->ua_count))
                return 0;
        /*
@@ -113,7 +110,7 @@ int core_scsi3_ua_allocate(
        ua->ua_ascq = ascq;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[unpacked_lun];
+       deve = nacl->device_list[unpacked_lun];
 
        spin_lock(&deve->ua_lock);
        list_for_each_entry_safe(ua_p, ua_tmp, &deve->ua_list, ua_nacl_list) {
@@ -223,7 +220,7 @@ void core_scsi3_ua_for_check_condition(
                return;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[cmd->orig_fe_lun];
+       deve = nacl->device_list[cmd->orig_fe_lun];
        if (!atomic_read(&deve->ua_count)) {
                spin_unlock_irq(&nacl->device_list_lock);
                return;
@@ -292,7 +289,7 @@ int core_scsi3_ua_clear_for_request_sense(
                return -EINVAL;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[cmd->orig_fe_lun];
+       deve = nacl->device_list[cmd->orig_fe_lun];
        if (!atomic_read(&deve->ua_count)) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -EPERM;