From 652d48d5f53562b8fea7ee34a9103d9191668102 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Fri, 31 Mar 2017 14:34:44 -0700 Subject: [PATCH] nvme: Fix up long lines in nvme_quirks.c This isn't the indentation pattern I would have chosen, but it's a complicated negotiation between what I want and what astyle will let me get away with. Change-Id: I4909587823931842ac3f227134e1d05e7d80da74 Signed-off-by: Ben Walker --- lib/nvme/nvme_quirks.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/nvme/nvme_quirks.c b/lib/nvme/nvme_quirks.c index dd69d0ebb..7e552af83 100644 --- a/lib/nvme/nvme_quirks.c +++ b/lib/nvme/nvme_quirks.c @@ -39,11 +39,21 @@ struct nvme_quirk { }; static const struct nvme_quirk nvme_quirks[] = { - {{SPDK_PCI_VID_INTEL, 0x0953, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, NVME_INTEL_QUIRK_READ_LATENCY | NVME_INTEL_QUIRK_WRITE_LATENCY | NVME_INTEL_QUIRK_STRIPING}, - {{SPDK_PCI_VID_INTEL, 0x0A53, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, NVME_INTEL_QUIRK_STRIPING }, - {{SPDK_PCI_VID_INTEL, 0x0A54, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, NVME_INTEL_QUIRK_STRIPING }, - {{SPDK_PCI_VID_MEMBLAZE, 0x0540, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, NVME_QUIRK_DELAY_BEFORE_CHK_RDY }, - {{0x0000, 0x0000, 0x0000, 0x0000}, 0 } + { {SPDK_PCI_VID_INTEL, 0x0953, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, + NVME_INTEL_QUIRK_READ_LATENCY | + NVME_INTEL_QUIRK_WRITE_LATENCY | + NVME_INTEL_QUIRK_STRIPING + }, + { {SPDK_PCI_VID_INTEL, 0x0A53, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, + NVME_INTEL_QUIRK_STRIPING + }, + { {SPDK_PCI_VID_INTEL, 0x0A54, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, + NVME_INTEL_QUIRK_STRIPING + }, + { {SPDK_PCI_VID_MEMBLAZE, 0x0540, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, + NVME_QUIRK_DELAY_BEFORE_CHK_RDY + }, + { {0x0000, 0x0000, 0x0000, 0x0000}, 0} }; /* Compare each field. SPDK_PCI_ANY_ID in s1 matches everything */