[PATCH] ieee1394: SBP-2 - rename some constants to fix clash with new SCSI core defines.

Acked by Ben Collins.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 935f0e1546d176109e2f18e22e0d6acb1f6273af..aa9ab3378e4c7510a7dccb8372f1b97d454ef04a 100644 (file)
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1087,7 +1087,7 @@ static int sbp2_query_logins(struct scsi_id_instance_data *scsi_id)
        scsi_id->query_logins_orb->query_response_hi = ORB_SET_NODE_ID(hi->host->node_id);
        SBP2_DEBUG("sbp2_query_logins: query_response_hi/lo initialized");
 
-       scsi_id->query_logins_orb->lun_misc = ORB_SET_FUNCTION(QUERY_LOGINS_REQUEST);
+       scsi_id->query_logins_orb->lun_misc = ORB_SET_FUNCTION(SBP2_QUERY_LOGINS_REQUEST);
        scsi_id->query_logins_orb->lun_misc |= ORB_SET_NOTIFY(1);
        if (scsi_id->sbp2_device_type_and_lun != SBP2_DEVICE_TYPE_LUN_UNINITIALIZED) {
                scsi_id->query_logins_orb->lun_misc |= ORB_SET_LUN(scsi_id->sbp2_device_type_and_lun);
@@ -1198,7 +1198,7 @@ static int sbp2_login_device(struct scsi_id_instance_data *scsi_id)
        scsi_id->login_orb->login_response_hi = ORB_SET_NODE_ID(hi->host->node_id);
        SBP2_DEBUG("sbp2_login_device: login_response_hi/lo initialized");
 
-       scsi_id->login_orb->lun_misc = ORB_SET_FUNCTION(LOGIN_REQUEST);
+       scsi_id->login_orb->lun_misc = ORB_SET_FUNCTION(SBP2_LOGIN_REQUEST);
        scsi_id->login_orb->lun_misc |= ORB_SET_RECONNECT(0);   /* One second reconnect time */
        scsi_id->login_orb->lun_misc |= ORB_SET_EXCLUSIVE(exclusive_login);     /* Exclusive access to device */
        scsi_id->login_orb->lun_misc |= ORB_SET_NOTIFY(1);      /* Notify us of login complete */
@@ -1324,7 +1324,7 @@ static int sbp2_logout_device(struct scsi_id_instance_data *scsi_id)
        scsi_id->logout_orb->reserved3 = 0x0;
        scsi_id->logout_orb->reserved4 = 0x0;
 
-       scsi_id->logout_orb->login_ID_misc = ORB_SET_FUNCTION(LOGOUT_REQUEST);
+       scsi_id->logout_orb->login_ID_misc = ORB_SET_FUNCTION(SBP2_LOGOUT_REQUEST);
        scsi_id->logout_orb->login_ID_misc |= ORB_SET_LOGIN_ID(scsi_id->login_response->length_login_ID);
 
        /* Notify us when complete */
@@ -1389,7 +1389,7 @@ static int sbp2_reconnect_device(struct scsi_id_instance_data *scsi_id)
        scsi_id->reconnect_orb->reserved3 = 0x0;
        scsi_id->reconnect_orb->reserved4 = 0x0;
 
-       scsi_id->reconnect_orb->login_ID_misc = ORB_SET_FUNCTION(RECONNECT_REQUEST);
+       scsi_id->reconnect_orb->login_ID_misc = ORB_SET_FUNCTION(SBP2_RECONNECT_REQUEST);
        scsi_id->reconnect_orb->login_ID_misc |=
                ORB_SET_LOGIN_ID(scsi_id->login_response->length_login_ID);
 

diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index d12f8e160a8092924d2b9c2216257b588093f88c..94b59f80bf90d43255001847e4054d94728289e6 100644 (file)
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -52,15 +52,15 @@ struct sbp2_command_orb {
        u8 cdb[12];
 };
 
-#define LOGIN_REQUEST                  0x0
-#define QUERY_LOGINS_REQUEST           0x1
-#define RECONNECT_REQUEST              0x3
-#define SET_PASSWORD_REQUEST           0x4
-#define LOGOUT_REQUEST                 0x7
-#define ABORT_TASK_REQUEST             0xb
-#define ABORT_TASK_SET                 0xc
-#define LOGICAL_UNIT_RESET             0xe
-#define TARGET_RESET_REQUEST           0xf
+#define SBP2_LOGIN_REQUEST             0x0
+#define SBP2_QUERY_LOGINS_REQUEST      0x1
+#define SBP2_RECONNECT_REQUEST         0x3
+#define SBP2_SET_PASSWORD_REQUEST      0x4
+#define SBP2_LOGOUT_REQUEST            0x7
+#define SBP2_ABORT_TASK_REQUEST                0xb
+#define SBP2_ABORT_TASK_SET            0xc
+#define SBP2_LOGICAL_UNIT_RESET                0xe
+#define SBP2_TARGET_RESET_REQUEST      0xf
 
 #define ORB_SET_LUN(value)                      (value & 0xffff)
 #define ORB_SET_FUNCTION(value)                 ((value & 0xf) << 16)