projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus
[cascardo/linux.git]
/
drivers
/
block
/
nvme-scsi.c
diff --git
a/drivers/block/nvme-scsi.c
b/drivers/block/nvme-scsi.c
index
fed54b0
..
102de2f
100644
(file)
--- a/
drivers/block/nvme-scsi.c
+++ b/
drivers/block/nvme-scsi.c
@@
-44,7
+44,6
@@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/types.h>
-#include <linux/version.h>
#include <scsi/sg.h>
#include <scsi/scsi.h>
#include <scsi/sg.h>
#include <scsi/scsi.h>
@@
-1654,7
+1653,7
@@
static void nvme_trans_modesel_save_bd(struct nvme_ns *ns, u8 *parm_list,
}
}
}
}
-static
u16
nvme_trans_modesel_get_mp(struct nvme_ns *ns, struct sg_io_hdr *hdr,
+static
int
nvme_trans_modesel_get_mp(struct nvme_ns *ns, struct sg_io_hdr *hdr,
u8 *mode_page, u8 page_code)
{
int res = SNTI_TRANSLATION_SUCCESS;
u8 *mode_page, u8 page_code)
{
int res = SNTI_TRANSLATION_SUCCESS;