D55817.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55817.diff
View Options

	diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c
	--- a/sys/dev/nvme/nvme_ahci.c
	+++ b/sys/dev/nvme/nvme_ahci.c
	@@ -79,7 +79,6 @@
	}
	ctrlr->bus_tag = rman_get_bustag(ctrlr->resource);
	ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource);
	- ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle;

	/* Allocate and setup IRQ */
	ctrlr->rid = 0;
	diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c
	--- a/sys/dev/nvme/nvme_pci.c
	+++ b/sys/dev/nvme/nvme_pci.c
	@@ -225,7 +225,6 @@

	ctrlr->bus_tag = rman_get_bustag(ctrlr->resource);
	ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource);
	- ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle;

	return (0);
	}
	diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
	--- a/sys/dev/nvme/nvme_private.h
	+++ b/sys/dev/nvme/nvme_private.h
	@@ -286,8 +286,6 @@
	struct nvme_qpair adminq;
	struct nvme_qpair *ioq;

	- struct nvme_registers *regs;
	-
	struct nvme_controller_data cdata;
	struct nvme_namespace ns[NVME_MAX_NAMESPACES];