diff for duplicates of <200706151956.34968.lists-receive@programmierforen.de> diff --git a/a/1.txt b/N1/1.txt index 1e292ed..0d56e97 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,143 +55,179 @@ index 1f90cf7..4eea301 100644 * @@ -202,7 +200,7 @@ AcpiRsDumpDescriptor ( - ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] { + ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIrq), "IRQ", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpIrq), "IRQ", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Polarity), "Polarity", AcpiGbl_LlDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Sharable), "Sharing", AcpiGbl_ShrDecode}, -@@ -212,7 +210,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] - ACPI_RSDUMP_INFO AcpiRsDumpDma[6] { +@@ -212,7 +210,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] = + + ACPI_RSDUMP_INFO AcpiRsDumpDma[6] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpDma), "DMA", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpDma), "DMA", NULL}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Dma.Type), "Speed", AcpiGbl_TypDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Dma.BusMaster), "Mastering", AcpiGbl_BmDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Dma.Transfer), "Transfer Type", AcpiGbl_SizDecode}, -@@ -222,19 +220,19 @@ ACPI_RSDUMP_INFO AcpiRsDumpDma[6] - ACPI_RSDUMP_INFO AcpiRsDumpStartDpf[3] { +@@ -222,19 +220,19 @@ ACPI_RSDUMP_INFO AcpiRsDumpDma[6] = + + ACPI_RSDUMP_INFO AcpiRsDumpStartDpf[3] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpStartDpf), "Start-Dependent-Functions",NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpStartDpf), "Start-Dependent-Functions",NULL}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (StartDpf.CompatibilityPriority), "Compatibility Priority", AcpiGbl_ConfigDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (StartDpf.PerformanceRobustness), "Performance/Robustness", AcpiGbl_ConfigDecode} }; - ACPI_RSDUMP_INFO AcpiRsDumpEndDpf[1] { + ACPI_RSDUMP_INFO AcpiRsDumpEndDpf[1] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpEndDpf), "End-Dependent-Functions", NULL} + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpEndDpf), "End-Dependent-Functions", NULL} }; - ACPI_RSDUMP_INFO AcpiRsDumpIo[6] { + ACPI_RSDUMP_INFO AcpiRsDumpIo[6] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIo), "I/O", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpIo), "I/O", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Io.IoDecode), "Address Decoding", AcpiGbl_IoDecode}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Io.Minimum), "Address Minimum", NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Io.Maximum), "Address Maximum", NULL}, -@@ -244,26 +242,26 @@ ACPI_RSDUMP_INFO AcpiRsDumpIo[6] - ACPI_RSDUMP_INFO AcpiRsDumpFixedIo[3] { +@@ -244,26 +242,26 @@ ACPI_RSDUMP_INFO AcpiRsDumpIo[6] = + + ACPI_RSDUMP_INFO AcpiRsDumpFixedIo[3] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpFixedIo), "Fixed I/O", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpFixedIo), "Fixed I/O", NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (FixedIo.Address), "Address", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (FixedIo.AddressLength), "Address Length", NULL} }; - ACPI_RSDUMP_INFO AcpiRsDumpVendor[3] { + ACPI_RSDUMP_INFO AcpiRsDumpVendor[3] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpVendor), "Vendor Specific", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpVendor), "Vendor Specific", NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Vendor.ByteLength), "Length", NULL}, {ACPI_RSD_LONGLIST, ACPI_RSD_OFFSET (Vendor.ByteData[0]), "Vendor Data", NULL} }; - ACPI_RSDUMP_INFO AcpiRsDumpEndTag[1] { + ACPI_RSDUMP_INFO AcpiRsDumpEndTag[1] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpEndTag), "EndTag", NULL} + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpEndTag), "EndTag", NULL} }; - ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] { + ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemory24), "24-Bit Memory Range", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpMemory24), "24-Bit Memory Range", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Memory24.WriteProtect), "Write Protect", AcpiGbl_RwDecode}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Memory24.Minimum), "Address Minimum", NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Memory24.Maximum), "Address Maximum", NULL}, -@@ -273,7 +271,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] - ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] { +@@ -273,7 +271,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] = + + ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemory32), "32-Bit Memory Range", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpMemory32), "32-Bit Memory Range", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Memory32.WriteProtect), "Write Protect", AcpiGbl_RwDecode}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Memory32.Minimum), "Address Minimum", NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Memory32.Maximum), "Address Maximum", NULL}, -@@ -283,7 +281,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] - ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] { +@@ -283,7 +281,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] = + + ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpFixedMemory32), "32-Bit Fixed Memory Range",NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpFixedMemory32), "32-Bit Fixed Memory Range",NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (FixedMemory32.WriteProtect), "Write Protect", AcpiGbl_RwDecode}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (FixedMemory32.Address), "Address", NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (FixedMemory32.AddressLength), "Address Length", NULL} -@@ -291,7 +289,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] - ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] { +@@ -291,7 +289,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] = + + ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpAddress16), "16-Bit WORD Address Space",NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpAddress16), "16-Bit WORD Address Space",NULL}, {ACPI_RSD_ADDRESS, 0, NULL, NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Address16.Granularity), "Granularity", NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Address16.Minimum), "Address Minimum", NULL}, -@@ -303,7 +301,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] - ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] { +@@ -303,7 +301,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] = + + ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpAddress32), "32-Bit DWORD Address Space", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpAddress32), "32-Bit DWORD Address Space", NULL}, {ACPI_RSD_ADDRESS, 0, NULL, NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Address32.Granularity), "Granularity", NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Address32.Minimum), "Address Minimum", NULL}, -@@ -315,7 +313,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] - ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] { +@@ -315,7 +313,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] = + + ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpAddress64), "64-Bit QWORD Address Space", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpAddress64), "64-Bit QWORD Address Space", NULL}, {ACPI_RSD_ADDRESS, 0, NULL, NULL}, {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (Address64.Granularity), "Granularity", NULL}, {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (Address64.Minimum), "Address Minimum", NULL}, -@@ -327,7 +325,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] - ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] { +@@ -327,7 +325,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] = + + ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpExtAddress64), "64-Bit Extended Address Space", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpExtAddress64), "64-Bit Extended Address Space", NULL}, {ACPI_RSD_ADDRESS, 0, NULL, NULL}, {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (ExtAddress64.Granularity), "Granularity", NULL}, {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (ExtAddress64.Minimum), "Address Minimum", NULL}, -@@ -339,7 +337,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] - ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] { +@@ -339,7 +337,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] = + + ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpExtIrq), "Extended IRQ", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpExtIrq), "Extended IRQ", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.ProducerConsumer), "Type", AcpiGbl_ConsumeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Polarity), "Polarity", AcpiGbl_LlDecode}, -@@ -351,7 +349,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] - ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] { +@@ -351,7 +349,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] = + + ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpGenericReg), "Generic Register", NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpGenericReg), "Generic Register", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (GenericReg.SpaceId), "Space ID", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (GenericReg.BitWidth), "Bit Width", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (GenericReg.BitOffset), "Bit Offset", NULL}, -@@ -365,7 +363,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] */ - static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] { +@@ -365,7 +363,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] = + */ + static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpGeneralFlags), NULL, NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpGeneralFlags), NULL, NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.ProducerConsumer), "Consumer/Producer", AcpiGbl_ConsumeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Decode), "Address Decode", AcpiGbl_DecDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.MinAddressFixed), "Min Relocatability", AcpiGbl_MinDecode}, -@@ -374,7 +372,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] - static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] { +@@ -374,7 +372,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] = + + static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] = + { - {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags), "Resource Type", (void *) "Memory Range"}, + {ACPI_RSD_LITERAL, ARRAY_SIZE (AcpiRsDumpMemoryFlags), "Resource Type", (void *) "Memory Range"}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.WriteProtect), "Write Protect", AcpiGbl_RwDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.Caching), "Caching", AcpiGbl_MemDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.RangeType), "Range Type", AcpiGbl_MtpDecode}, -@@ -383,7 +381,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] - static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] { +@@ -383,7 +381,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] = + + static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] = + { - {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags), "Resource Type", (void *) "I/O Range"}, + {ACPI_RSD_LITERAL, ARRAY_SIZE (AcpiRsDumpIoFlags), "Resource Type", (void *) "I/O Range"}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.RangeType), "Range Type", AcpiGbl_RngDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.Translation), "Translation", AcpiGbl_TtpDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.TranslationType), "Translation Type", AcpiGbl_TrsDecode} -@@ -395,7 +393,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] */ - static ACPI_RSDUMP_INFO AcpiRsDumpPrt[5] { +@@ -395,7 +393,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] = + */ + static ACPI_RSDUMP_INFO AcpiRsDumpPrt[5] = + { - {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPrt), NULL, NULL}, + {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpPrt), NULL, NULL}, {ACPI_RSD_UINT64, ACPI_PRT_OFFSET (Address), "Address", NULL}, @@ -201,7 +237,8 @@ diff --git a/tables/tbfadt.c b/tables/tbfadt.c index a1afd6d..04f2fac 100644 --- a/tables/tbfadt.c +++ b/tables/tbfadt.c -@@ -189,9 +189,6 @@ static ACPI_FADT_INFO FadtInfoTable[] ACPI_FADT_OFFSET (Gpe1BlockLength), ACPI_FADT_SEPARATE_LENGTH} +@@ -189,9 +189,6 @@ static ACPI_FADT_INFO FadtInfoTable[] = + ACPI_FADT_OFFSET (Gpe1BlockLength), ACPI_FADT_SEPARATE_LENGTH} }; -#define ACPI_FADT_INFO_ENTRIES (sizeof (FadtInfoTable) / sizeof (ACPI_FADT_INFO)) @@ -227,8 +264,3 @@ index a1afd6d..04f2fac 100644 + for (i = 0; i < ARRAY_SIZE(FadtInfoTable); i++) { /* Generate pointers to the 32-bit and 64-bit addresses and get the length */ - -_______________________________________________ -Kernel-janitors mailing list -Kernel-janitors@lists.linux-foundation.org -https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors diff --git a/a/content_digest b/N1/content_digest index bd5d72a..19290eb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,8 @@ "ref\0200706122041.06252.lists-receive@programmierforen.de\0" "ref\0200706121253.07395.bjorn.helgaas@hp.com\0" "From\0Andi Drebes <lists-receive@programmierforen.de>\0" - "Subject\0Re: [KJ] [PATCH] drivers/acpi: sizeof/sizeof array size calculations\0" - "Date\0Fri, 15 Jun 2007 17:56:34 +0000\0" + "Subject\0Re: [KJ] [PATCH] drivers/acpi: sizeof/sizeof array size calculations replaced with ARRAY_SIZE\0" + "Date\0Fri, 15 Jun 2007 19:56:34 +0200\0" "To\0Len Brown <lenb@kernel.org>\0" "Cc\0Bjorn Helgaas <bjorn.helgaas@hp.com>" Pavel Machek <pavel@ucw.cz> @@ -70,143 +70,179 @@ " *\n" "@@ -202,7 +200,7 @@ AcpiRsDumpDescriptor (\n" " \n" - " ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] {\n" + " ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIrq), \"IRQ\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpIrq), \"IRQ\", NULL},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Triggering), \"Triggering\", AcpiGbl_HeDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Polarity), \"Polarity\", AcpiGbl_LlDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Sharable), \"Sharing\", AcpiGbl_ShrDecode},\n" - "@@ -212,7 +210,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpDma[6] {\n" + "@@ -212,7 +210,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpIrq[6] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpDma[6] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpDma), \"DMA\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpDma), \"DMA\", NULL},\n" " {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Dma.Type), \"Speed\", AcpiGbl_TypDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Dma.BusMaster), \"Mastering\", AcpiGbl_BmDecode},\n" " {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Dma.Transfer), \"Transfer Type\", AcpiGbl_SizDecode},\n" - "@@ -222,19 +220,19 @@ ACPI_RSDUMP_INFO AcpiRsDumpDma[6] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpStartDpf[3] {\n" + "@@ -222,19 +220,19 @@ ACPI_RSDUMP_INFO AcpiRsDumpDma[6] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpStartDpf[3] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpStartDpf), \"Start-Dependent-Functions\",NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpStartDpf), \"Start-Dependent-Functions\",NULL},\n" " {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (StartDpf.CompatibilityPriority), \"Compatibility Priority\", AcpiGbl_ConfigDecode},\n" " {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (StartDpf.PerformanceRobustness), \"Performance/Robustness\", AcpiGbl_ConfigDecode}\n" " };\n" " \n" - " ACPI_RSDUMP_INFO AcpiRsDumpEndDpf[1] {\n" + " ACPI_RSDUMP_INFO AcpiRsDumpEndDpf[1] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpEndDpf), \"End-Dependent-Functions\", NULL}\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpEndDpf), \"End-Dependent-Functions\", NULL}\n" " };\n" " \n" - " ACPI_RSDUMP_INFO AcpiRsDumpIo[6] {\n" + " ACPI_RSDUMP_INFO AcpiRsDumpIo[6] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIo), \"I/O\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpIo), \"I/O\", NULL},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Io.IoDecode), \"Address Decoding\", AcpiGbl_IoDecode},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Io.Minimum), \"Address Minimum\", NULL},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Io.Maximum), \"Address Maximum\", NULL},\n" - "@@ -244,26 +242,26 @@ ACPI_RSDUMP_INFO AcpiRsDumpIo[6] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpFixedIo[3] {\n" + "@@ -244,26 +242,26 @@ ACPI_RSDUMP_INFO AcpiRsDumpIo[6] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpFixedIo[3] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpFixedIo), \"Fixed I/O\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpFixedIo), \"Fixed I/O\", NULL},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (FixedIo.Address), \"Address\", NULL},\n" " {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (FixedIo.AddressLength), \"Address Length\", NULL}\n" " };\n" " \n" - " ACPI_RSDUMP_INFO AcpiRsDumpVendor[3] {\n" + " ACPI_RSDUMP_INFO AcpiRsDumpVendor[3] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpVendor), \"Vendor Specific\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpVendor), \"Vendor Specific\", NULL},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Vendor.ByteLength), \"Length\", NULL},\n" " {ACPI_RSD_LONGLIST, ACPI_RSD_OFFSET (Vendor.ByteData[0]), \"Vendor Data\", NULL}\n" " };\n" " \n" - " ACPI_RSDUMP_INFO AcpiRsDumpEndTag[1] {\n" + " ACPI_RSDUMP_INFO AcpiRsDumpEndTag[1] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpEndTag), \"EndTag\", NULL}\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpEndTag), \"EndTag\", NULL}\n" " };\n" " \n" - " ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] {\n" + " ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemory24), \"24-Bit Memory Range\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpMemory24), \"24-Bit Memory Range\", NULL},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Memory24.WriteProtect), \"Write Protect\", AcpiGbl_RwDecode},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Memory24.Minimum), \"Address Minimum\", NULL},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Memory24.Maximum), \"Address Maximum\", NULL},\n" - "@@ -273,7 +271,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] {\n" + "@@ -273,7 +271,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory24[6] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemory32), \"32-Bit Memory Range\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpMemory32), \"32-Bit Memory Range\", NULL},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Memory32.WriteProtect), \"Write Protect\", AcpiGbl_RwDecode},\n" " {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Memory32.Minimum), \"Address Minimum\", NULL},\n" " {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Memory32.Maximum), \"Address Maximum\", NULL},\n" - "@@ -283,7 +281,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] {\n" + "@@ -283,7 +281,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpMemory32[6] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpFixedMemory32), \"32-Bit Fixed Memory Range\",NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpFixedMemory32), \"32-Bit Fixed Memory Range\",NULL},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (FixedMemory32.WriteProtect), \"Write Protect\", AcpiGbl_RwDecode},\n" " {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (FixedMemory32.Address), \"Address\", NULL},\n" " {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (FixedMemory32.AddressLength), \"Address Length\", NULL}\n" - "@@ -291,7 +289,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] {\n" + "@@ -291,7 +289,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[4] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpAddress16), \"16-Bit WORD Address Space\",NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpAddress16), \"16-Bit WORD Address Space\",NULL},\n" " {ACPI_RSD_ADDRESS, 0, NULL, NULL},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Address16.Granularity), \"Granularity\", NULL},\n" " {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (Address16.Minimum), \"Address Minimum\", NULL},\n" - "@@ -303,7 +301,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] {\n" + "@@ -303,7 +301,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress16[8] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpAddress32), \"32-Bit DWORD Address Space\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpAddress32), \"32-Bit DWORD Address Space\", NULL},\n" " {ACPI_RSD_ADDRESS, 0, NULL, NULL},\n" " {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Address32.Granularity), \"Granularity\", NULL},\n" " {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (Address32.Minimum), \"Address Minimum\", NULL},\n" - "@@ -315,7 +313,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] {\n" + "@@ -315,7 +313,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress32[8] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpAddress64), \"64-Bit QWORD Address Space\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpAddress64), \"64-Bit QWORD Address Space\", NULL},\n" " {ACPI_RSD_ADDRESS, 0, NULL, NULL},\n" " {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (Address64.Granularity), \"Granularity\", NULL},\n" " {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (Address64.Minimum), \"Address Minimum\", NULL},\n" - "@@ -327,7 +325,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] {\n" + "@@ -327,7 +325,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpAddress64[8] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpExtAddress64), \"64-Bit Extended Address Space\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpExtAddress64), \"64-Bit Extended Address Space\", NULL},\n" " {ACPI_RSD_ADDRESS, 0, NULL, NULL},\n" " {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (ExtAddress64.Granularity), \"Granularity\", NULL},\n" " {ACPI_RSD_UINT64, ACPI_RSD_OFFSET (ExtAddress64.Minimum), \"Address Minimum\", NULL},\n" - "@@ -339,7 +337,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] {\n" + "@@ -339,7 +337,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[8] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpExtIrq), \"Extended IRQ\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpExtIrq), \"Extended IRQ\", NULL},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.ProducerConsumer), \"Type\", AcpiGbl_ConsumeDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Triggering), \"Triggering\", AcpiGbl_HeDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Polarity), \"Polarity\", AcpiGbl_LlDecode},\n" - "@@ -351,7 +349,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] \n" - " ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] {\n" + "@@ -351,7 +349,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] =\n" + " \n" + " ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpGenericReg), \"Generic Register\", NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpGenericReg), \"Generic Register\", NULL},\n" " {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (GenericReg.SpaceId), \"Space ID\", NULL},\n" " {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (GenericReg.BitWidth), \"Bit Width\", NULL},\n" " {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (GenericReg.BitOffset), \"Bit Offset\", NULL},\n" - "@@ -365,7 +363,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] */\n" - " static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] {\n" + "@@ -365,7 +363,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[6] =\n" + " */\n" + " static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpGeneralFlags), NULL, NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpGeneralFlags), NULL, NULL},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.ProducerConsumer), \"Consumer/Producer\", AcpiGbl_ConsumeDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Decode), \"Address Decode\", AcpiGbl_DecDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.MinAddressFixed), \"Min Relocatability\", AcpiGbl_MinDecode},\n" - "@@ -374,7 +372,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] \n" - " static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] {\n" + "@@ -374,7 +372,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] =\n" + " \n" + " static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] =\n" + " {\n" "- {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags), \"Resource Type\", (void *) \"Memory Range\"},\n" "+ {ACPI_RSD_LITERAL, ARRAY_SIZE (AcpiRsDumpMemoryFlags), \"Resource Type\", (void *) \"Memory Range\"},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.WriteProtect), \"Write Protect\", AcpiGbl_RwDecode},\n" " {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.Caching), \"Caching\", AcpiGbl_MemDecode},\n" " {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.RangeType), \"Range Type\", AcpiGbl_MtpDecode},\n" - "@@ -383,7 +381,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] \n" - " static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] {\n" + "@@ -383,7 +381,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] =\n" + " \n" + " static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] =\n" + " {\n" "- {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags), \"Resource Type\", (void *) \"I/O Range\"},\n" "+ {ACPI_RSD_LITERAL, ARRAY_SIZE (AcpiRsDumpIoFlags), \"Resource Type\", (void *) \"I/O Range\"},\n" " {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.RangeType), \"Range Type\", AcpiGbl_RngDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.Translation), \"Translation\", AcpiGbl_TtpDecode},\n" " {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.TranslationType), \"Translation Type\", AcpiGbl_TrsDecode}\n" - "@@ -395,7 +393,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] */\n" - " static ACPI_RSDUMP_INFO AcpiRsDumpPrt[5] {\n" + "@@ -395,7 +393,7 @@ static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] =\n" + " */\n" + " static ACPI_RSDUMP_INFO AcpiRsDumpPrt[5] =\n" + " {\n" "- {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPrt), NULL, NULL},\n" "+ {ACPI_RSD_TITLE, ARRAY_SIZE (AcpiRsDumpPrt), NULL, NULL},\n" " {ACPI_RSD_UINT64, ACPI_PRT_OFFSET (Address), \"Address\", NULL},\n" @@ -216,7 +252,8 @@ "index a1afd6d..04f2fac 100644\n" "--- a/tables/tbfadt.c\n" "+++ b/tables/tbfadt.c\n" - "@@ -189,9 +189,6 @@ static ACPI_FADT_INFO FadtInfoTable[] ACPI_FADT_OFFSET (Gpe1BlockLength), ACPI_FADT_SEPARATE_LENGTH}\n" + "@@ -189,9 +189,6 @@ static ACPI_FADT_INFO FadtInfoTable[] =\n" + " ACPI_FADT_OFFSET (Gpe1BlockLength), ACPI_FADT_SEPARATE_LENGTH}\n" " };\n" " \n" "-#define ACPI_FADT_INFO_ENTRIES (sizeof (FadtInfoTable) / sizeof (ACPI_FADT_INFO))\n" @@ -241,11 +278,6 @@ "- for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++)\n" "+ for (i = 0; i < ARRAY_SIZE(FadtInfoTable); i++)\n" " {\n" - " /* Generate pointers to the 32-bit and 64-bit addresses and get the length */\n" - " \n" - "_______________________________________________\n" - "Kernel-janitors mailing list\n" - "Kernel-janitors@lists.linux-foundation.org\n" - https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors + /* Generate pointers to the 32-bit and 64-bit addresses and get the length */ -5e26d224bb81b92702bbdd6143d21391327587928ba364af8f92e5c567617994 +715c7dbe44bef215e33f9317a1f37e57389d887608563b39c026be564cdb0a58
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.