target: Change sbc_emulate_noop to return sense_reason_t

As reported by Fengguang Wu + 0 day build team, the sense_reason_t conversion
in for-next did not catch the recent sbc_emulate_noop() addition in mainline,
producing the following build warning in auto-next:

drivers/target/target_core_sbc.c: In function ‘sbc_parse_cdb’:
drivers/target/target_core_sbc.c:555: warning: assignment from incompatible pointer type

Go ahead and remove duplicate sbc_emulate_verify(), and change VERIFY to
use sbc_emulate_noop() as well.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index 3929fa201088d98e446d48d3cb8ff7a739b0feef..b8024219cd4fa9fec6b0ede1583f99f74fcc03fe 100644 (file)
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -134,13 +134,7 @@ int spc_get_write_same_sectors(struct se_cmd *cmd)
 EXPORT_SYMBOL(spc_get_write_same_sectors);
 
 static sense_reason_t
-sbc_emulate_verify(struct se_cmd *cmd)
-{
-       target_complete_cmd(cmd, GOOD);
-       return 0;
-}
-
-static int sbc_emulate_noop(struct se_cmd *cmd)
+sbc_emulate_noop(struct se_cmd *cmd)
 {
        target_complete_cmd(cmd, GOOD);
        return 0;
@@ -540,7 +534,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                break;
        case VERIFY:
                size = 0;
-               cmd->execute_cmd = sbc_emulate_verify;
+               cmd->execute_cmd = sbc_emulate_noop;
                break;
        case REZERO_UNIT:
        case SEEK_6: