Merge branch 'next'

2 files changed, 1 insertions, 5 deletions

diff --git a/drivers/scsi/sandbox_scsi.c b/drivers/scsi/sandbox_scsi.c
index 544a0247083..5f0b01d86d5 100644
--- a/drivers/scsi/sandbox_scsi.c
+++ b/drivers/scsi/sandbox_scsi.c
@@ -128,7 +128,7 @@ static int sandbox_scsi_remove(struct udevice *dev)
 	return 0;
 }
 
-struct scsi_ops sandbox_scsi_ops = {
+static const struct scsi_ops sandbox_scsi_ops = {
 	.exec		= sandbox_scsi_exec,
 	.bus_reset	= sandbox_scsi_bus_reset,
 };
diff --git a/drivers/scsi/scsi_bootdev.c b/drivers/scsi/scsi_bootdev.c
index 28e4612f337..541b021b732 100644
--- a/drivers/scsi/scsi_bootdev.c
+++ b/drivers/scsi/scsi_bootdev.c
@@ -37,9 +37,6 @@ static int scsi_bootdev_hunt(struct bootdev_hunter *info, bool show)
 	return 0;
 }
 
-struct bootdev_ops scsi_bootdev_ops = {
-};
-
 static const struct udevice_id scsi_bootdev_ids[] = {
 	{ .compatible = "u-boot,bootdev-scsi" },
 	{ }
@@ -48,7 +45,6 @@ static const struct udevice_id scsi_bootdev_ids[] = {
 U_BOOT_DRIVER(scsi_bootdev) = {
 	.name		= "scsi_bootdev",
 	.id		= UCLASS_BOOTDEV,
-	.ops		= &scsi_bootdev_ops,
 	.bind		= scsi_bootdev_bind,
 	.of_match	= scsi_bootdev_ids,
 };