Six files define one or two macros twice, with the same value and under the same preprocessor conditions: two SPI NOR opcodes, two SCSI opcodes, an ACPI PPTT cache type, two GT-64120 register offsets, an i.MX8 power domain name and two constants in the video test. An identical redefinition is valid C, so the compiler never warned about them. This series drops the second copy, one patch per file.
Three of them need a word of explanation. In include/scsi.h the two SCSI_SEND_DIAG copies also disagreed on the command type, optional in one table and mandatory in the other. SCSI-2 makes SEND DIAGNOSTIC mandatory for all device types, so the copy patch 2 keeps now says mandatory. include/gt64120.h was imported from Linux, which had the same duplicate until the fix for it was applied to mips-next [1]. Apart from that, Linux has only changed the header's SPDX tag since the import, so rather than re-syncing, patch 4 drops the duplicate here as well. In test/dm/video.c both copies sit inside test functions, although check_vidconsole_output() further down uses SCROLL_LINES too, so patch 6 defines both constants once at file scope instead. No functional change is intended. Built for sandbox, malta, imx8qxp_mek, imx8qm_mek, qemu-arm-sbsa, rpi_arm64 and evb-ast2600, which between them cover every touched file, all objects rebuilt by the series are identical before and after once debug info is stripped and the embedded version string and timestamp are held fixed, and so are the final images and the i.MX8 device trees. The only exception is test/dm/video.o, and with it the sandbox binary: its assertions record __LINE__ values that patch 6 moves by three lines. Each patch builds for all seven boards, and the sandbox video tests pass. The patches are independent of each other and touch different areas (SPI NOR, SCSI, ACPI, the GT-64120 PCI driver, the i.MX8 device tree bindings and the video test), so they can be applied one by one or as a whole. The series is based on next. [1] https://lore.kernel.org/all/[email protected]/ Aristo Chen (6): mtd: spi-nor: drop the duplicate EN4B/EX4B opcode definitions scsi: drop the duplicate COMPARE and SEND DIAGNOSTIC opcodes acpi: drop the duplicate ACPI_PPTT_CACHE_TYPE_DATA definition pci: gt64120: drop the duplicate GT_PCI1M1LD/HD_OFS definitions dt-bindings: soc: imx8_pd: drop the duplicate PD_LVDS0_PWM definition test: video: define WHITE and SCROLL_LINES once at file scope include/acpi/acpi_table.h | 1 - include/dt-bindings/soc/imx8_pd.h | 1 - include/gt64120.h | 2 -- include/linux/mtd/spi-nor.h | 2 -- include/scsi.h | 4 +--- test/dm/video.c | 9 +++------ 6 files changed, 4 insertions(+), 15 deletions(-) -- 2.43.0
