diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-29 15:01:36 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-29 15:01:36 -0600 |
| commit | c0d269da3c8492d4b81bbcb79a66f6d4a49f7610 (patch) | |
| tree | 302f8dbd5d72be813e15eed94bd661bf2866c3ab /include | |
| parent | 9268c7a5e3e91564739bf0fdfd1df228a0273945 (diff) | |
| parent | 6627fbba203f89a316299d35f6a2ff3f33dd15c8 (diff) | |
| download | u-boot-c0d269da3c8492d4b81bbcb79a66f6d4a49f7610.tar.gz u-boot-c0d269da3c8492d4b81bbcb79a66f6d4a49f7610.tar.bz2 u-boot-c0d269da3c8492d4b81bbcb79a66f6d4a49f7610.zip | |
Merge patch series "include: asm-generic: Remove duplicate newlines"
Drop all duplicate newlines from the include directory files.
Diffstat (limited to 'include')
90 files changed, 0 insertions, 250 deletions
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h index 7451718a61..aa572021cc 100644 --- a/include/asm-generic/int-ll64.h +++ b/include/asm-generic/int-ll64.h @@ -43,5 +43,4 @@ typedef __u64 u64; #endif /* __ASSEMBLY__ */ - #endif /* _ASM_GENERIC_INT_LL64_H */ diff --git a/include/ata.h b/include/ata.h index a7bcee6a64..57be0e8761 100644 --- a/include/ata.h +++ b/include/ata.h @@ -73,7 +73,6 @@ #define ATAPI_CMD_START_STOP 0x1B #define ATAPI_CMD_READ_12 0xA8 - #define ATA_GET_ERR() inb(ATA_STATUS) #define ATA_GET_STAT() inb(ATA_STATUS) #define ATA_OK_STAT(stat,good,bad) (((stat)&((good)|(bad)))==(good)) @@ -189,7 +188,6 @@ typedef struct hd_driveid { unsigned short words164_255[92];/* reserved words 164-255 */ } hd_driveid_t; - /* * PIO Mode Configuration * diff --git a/include/blkmap.h b/include/blkmap.h index 30dc84a7da..d53095437f 100644 --- a/include/blkmap.h +++ b/include/blkmap.h @@ -65,7 +65,6 @@ int blkmap_map_mem(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, int blkmap_map_pmem(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, phys_addr_t paddr); - /** * blkmap_from_label() - Find blkmap from label * diff --git a/include/bzlib.h b/include/bzlib.h index 19314f8f66..e3cf6f9c59 100644 --- a/include/bzlib.h +++ b/include/bzlib.h @@ -62,7 +62,6 @@ For more information on these sources, see the manual. --*/ - #ifndef _BZLIB_H #define _BZLIB_H @@ -117,7 +116,6 @@ typedef } bz_stream; - #ifndef BZ_IMPORT #define BZ_EXPORT #endif @@ -141,7 +139,6 @@ typedef # define BZ_EXTERN extern #endif - /*-- Core (low-level) library functions --*/ BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( @@ -174,7 +171,6 @@ BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( bz_stream *strm ); - /*-- High(er) level library functions --*/ #ifndef BZ_NO_STDIO @@ -247,7 +243,6 @@ BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( ); #endif - /*-- Utility functions --*/ BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( @@ -269,7 +264,6 @@ BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( int verbosity ); - /*-- Code contributed by Yoshioka Tsuneo (QWF00133@niftyserve.or.jp/tsuneo-y@is.aist-nara.ac.jp), diff --git a/include/dfu.h b/include/dfu.h index fa1918cd66..6c5431b394 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -99,7 +99,6 @@ struct virt_internal_data { int dev_num; }; - #if defined(CONFIG_DFU_NAME_MAX_SIZE) #define DFU_NAME_SIZE CONFIG_DFU_NAME_MAX_SIZE #else diff --git a/include/dm/of_addr.h b/include/dm/of_addr.h index e7f3a28081..5fb5a4855b 100644 --- a/include/dm/of_addr.h +++ b/include/dm/of_addr.h @@ -44,7 +44,6 @@ u64 of_translate_address(const struct device_node *np, const __be32 *in_addr); */ u64 of_translate_dma_address(const struct device_node *np, const __be32 *in_addr); - /** * of_get_dma_range() - get dma-ranges for a specific DT node * diff --git a/include/dt-bindings/clock/mt8516-clk.h b/include/dt-bindings/clock/mt8516-clk.h index 745b87f3a0..d6f9a4516c 100644 --- a/include/dt-bindings/clock/mt8516-clk.h +++ b/include/dt-bindings/clock/mt8516-clk.h @@ -8,7 +8,6 @@ #ifndef _DT_BINDINGS_CLK_MT8516_H #define _DT_BINDINGS_CLK_MT8516_H - /* APMIXEDSYS */ #define CLK_APMIXED_ARMPLL 0 diff --git a/include/dt-bindings/clock/qcom,gcc-msm8996.h b/include/dt-bindings/clock/qcom,gcc-msm8996.h index ddfd6fd730..de5c36c780 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8996.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8996.h @@ -347,7 +347,6 @@ #define GCC_USB3PHY_PHY_BCR 104 #define GCC_MSS_RESTART 105 - /* Indexes for GDSCs */ #define AGGRE0_NOC_GDSC 0 #define HLOS1_VOTE_AGGRE0_NOC_GDSC 1 diff --git a/include/dt-bindings/clock/qcom,rpmh.h b/include/dt-bindings/clock/qcom,rpmh.h index 0a7d1be0d1..bf5b59b100 100644 --- a/include/dt-bindings/clock/qcom,rpmh.h +++ b/include/dt-bindings/clock/qcom,rpmh.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2018, 2020, The Linux Foundation. All rights reserved. */ - #ifndef _DT_BINDINGS_CLK_MSM_RPMH_H #define _DT_BINDINGS_CLK_MSM_RPMH_H diff --git a/include/dt-bindings/clock/tegra210-car.h b/include/dt-bindings/clock/tegra210-car.h index bd3530e56d..eddac16800 100644 --- a/include/dt-bindings/clock/tegra210-car.h +++ b/include/dt-bindings/clock/tegra210-car.h @@ -248,7 +248,6 @@ #define TEGRA210_CLK_SOR_SAFE 222 #define TEGRA210_CLK_PLL_P_OUT_CPU 223 - #define TEGRA210_CLK_UARTB 224 #define TEGRA210_CLK_VFIR 225 #define TEGRA210_CLK_SPDIF_IN 226 diff --git a/include/dt-bindings/dma/at91.h b/include/dt-bindings/dma/at91.h index ab6cbba454..0e7814b0dc 100644 --- a/include/dt-bindings/dma/at91.h +++ b/include/dt-bindings/dma/at91.h @@ -26,7 +26,6 @@ #define AT91_DMA_CFG_FIFOCFG_ALAP (0x1 << AT91_DMA_CFG_FIFOCFG_OFFSET) /* largest defined AHB burst */ #define AT91_DMA_CFG_FIFOCFG_ASAP (0x2 << AT91_DMA_CFG_FIFOCFG_OFFSET) /* single AHB access */ - /* ---------- XDMAC ---------- */ #define AT91_XDMAC_DT_MEM_IF_MASK (0x1) #define AT91_XDMAC_DT_MEM_IF_OFFSET (13) diff --git a/include/dt-bindings/mfd/stm32f7-rcc.h b/include/dt-bindings/mfd/stm32f7-rcc.h index a4e4f92713..1aa267e76a 100644 --- a/include/dt-bindings/mfd/stm32f7-rcc.h +++ b/include/dt-bindings/mfd/stm32f7-rcc.h @@ -34,7 +34,6 @@ #define STM32F7_AHB1_RESET(bit) (STM32F7_RCC_AHB1_##bit + (0x10 * 8)) #define STM32F7_AHB1_CLOCK(bit) (STM32F7_RCC_AHB1_##bit) - /* AHB2 */ #define STM32F7_RCC_AHB2_DCMI 0 #define STM32F7_RCC_AHB2_CRYP 4 diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h index f4d66edace..b73518207e 100644 --- a/include/dw_hdmi.h +++ b/include/dw_hdmi.h @@ -309,7 +309,6 @@ enum { HDMI_FC_INVIDCONF_IN_I_P_INTERLACED = 0x1, HDMI_FC_INVIDCONF_IN_I_P_PROGRESSIVE = 0x0, - /* fc_aviconf0-fc_aviconf3 field values */ HDMI_FC_AVICONF0_PIX_FMT_MASK = 0x03, HDMI_FC_AVICONF0_PIX_FMT_RGB = 0x00, diff --git a/include/ec_commands.h b/include/ec_commands.h index 36f4a02f93..23597d28b2 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -345,7 +345,6 @@ /* Current version of ACPI memory address space */ #define EC_ACPI_MEM_VERSION_CURRENT 2 - /* * This header file is used in coreboot both in C and ACPI code. The ACPI code * is pre-processed to handle constants but the ASL compiler is unable to @@ -984,7 +983,6 @@ struct __ec_align4 ec_response_get_protocol_info { uint32_t flags; }; - /*****************************************************************************/ /* Get/Set miscellaneous values */ @@ -1300,7 +1298,6 @@ struct __ec_align4 ec_params_flash_erase { uint32_t size; /* Size to erase in bytes */ }; - #define EC_VER_FLASH_WRITE 1 /* v1 add async erase: * subcommands can returns: @@ -1451,7 +1448,6 @@ struct __ec_align4 ec_response_vbnvcontext { uint8_t block[EC_VBNV_BLOCK_SIZE_V2]; }; - /* Get SPI flash information */ #define EC_CMD_FLASH_SPI_INFO 0x0018 @@ -1469,7 +1465,6 @@ struct __ec_align1 ec_response_flash_spi_info { uint8_t sr1, sr2; }; - /* Select flash during flash operations */ #define EC_CMD_FLASH_SELECT 0x0019 @@ -1801,7 +1796,6 @@ struct __ec_todo_packed ec_response_lightbar { struct lightbar_params_v0 get_params_v0; struct lightbar_params_v1 get_params_v1; - struct lightbar_params_v2_timing get_params_v2_timing; struct lightbar_params_v2_tap get_params_v2_tap; struct lightbar_params_v2_oscillation get_params_v2_osc; @@ -2667,7 +2661,6 @@ struct __ec_align2 ec_response_thermal_get_threshold { uint16_t value; }; - /* The version 1 structs are visible. */ enum ec_temp_thresholds { EC_TEMP_THRESH_WARN = 0, @@ -2765,7 +2758,6 @@ struct __ec_align4 ec_params_tmp006_set_calibration_v1 { float val[0]; }; - /* Read raw TMP006 data */ #define EC_CMD_TMP006_GET_RAW 0x0055 @@ -3082,7 +3074,6 @@ struct __ec_align1 ec_response_temp_sensor_get_info { /*****************************************************************************/ /* Host event commands */ - /* Obsolete. New implementation should use EC_CMD_PROGRAM_HOST_EVENT instead */ /* * Host event mask params and response structures, shared by all of the host @@ -3619,7 +3610,6 @@ struct __ec_align4 ec_response_charge_state { }; }; - /* * Set maximum battery charging current. */ @@ -4207,7 +4197,6 @@ struct __ec_align4 ec_response_pd_log { uint8_t payload[0]; /* optional additional data payload: 0..16 bytes */ }; - /* The timestamp is the microsecond counter shifted to get about a ms. */ #define PD_LOG_TIMESTAMP_SHIFT 10 /* 1 LSB = 1024us */ @@ -4322,7 +4311,6 @@ struct __ec_align1 ec_params_pd_write_log_entry { uint8_t port; /* port#, or 0 for events unrelated to a given port */ }; - /* Control USB-PD chip */ #define EC_CMD_PD_CONTROL 0x0119 diff --git a/include/efi_api.h b/include/efi_api.h index ab40b1b5dd..f07d074f93 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -2017,7 +2017,6 @@ struct efi_firmware_image_authentication { struct win_certificate_uefi_guid auth_info; } __attribute__((__packed__)); - /** * struct efi_signature_data - A format of signature * diff --git a/include/efi_loader.h b/include/efi_loader.h index f2e5063a97..f84852e384 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -153,7 +153,6 @@ static inline void efi_set_bootdev(const char *dev, const char *devnr, EFI_GUID(0xb2ac5fc9, 0x92b7, 0x4acd, \ 0xae, 0xac, 0x11, 0xe8, 0x18, 0xc3, 0x13, 0x0c) - /* Use internal device tree when starting UEFI application */ #define EFI_FDT_USE_INTERNAL NULL diff --git a/include/env_internal.h b/include/env_internal.h index cbd1ef3e91..0a267e3559 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -15,7 +15,6 @@ #ifndef _ENV_INTERNAL_H_ #define _ENV_INTERNAL_H_ - /************************************************************************** * * The "environment" is stored as a list of '\0' terminated diff --git a/include/exports.h b/include/exports.h index 6f8c9cf451..23cc3a66c2 100644 --- a/include/exports.h +++ b/include/exports.h @@ -70,7 +70,6 @@ struct jt_funcs { #undef EXPORT_FUNC }; - #define XF_VERSION 9 #if defined(CONFIG_X86) diff --git a/include/firmware/imx/sci/rpc.h b/include/firmware/imx/sci/rpc.h index 85af6f3996..28adec2a8e 100644 --- a/include/firmware/imx/sci/rpc.h +++ b/include/firmware/imx/sci/rpc.h @@ -44,7 +44,6 @@ #define SC_RPC_SVC_SECO 9U #define SC_RPC_SVC_ABORT 10U - /* Types */ struct sc_rpc_msg_s { diff --git a/include/flash.h b/include/flash.h index 0f73697741..60babe8a80 100644 --- a/include/flash.h +++ b/include/flash.h @@ -256,7 +256,6 @@ void flash_perror(int err); #define AMD_ID_GL128N_2 0x22212221 /* 2nd ID word for S29GL128N */ #define AMD_ID_GL128N_3 0x22012201 /* 3rd ID word for S29GL128N */ - #define AMD_ID_LV320B_2 0x221A221A /* 2d ID word for AM29LV320MB at 0x38 */ #define AMD_ID_LV320B_3 0x22002200 /* 3d ID word for AM29LV320MB at 0x3c */ @@ -476,7 +475,6 @@ void flash_perror(int err); #define FLASH_UNKNOWN 0xFFFF /* unknown flash type */ - /* manufacturer offsets */ #define FLASH_MAN_AMD 0x00000000 /* AMD */ diff --git a/include/fsl-mc/fsl_dprc.h b/include/fsl-mc/fsl_dprc.h index fb95ac544a..22240d88a3 100644 --- a/include/fsl-mc/fsl_dprc.h +++ b/include/fsl-mc/fsl_dprc.h @@ -149,7 +149,6 @@ int dprc_close(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token); */ #define DPRC_CFG_OPT_TOPOLOGY_CHANGES_ALLOWED 0x00000008 - /* AIOP - Indicates that container belongs to AIOP. */ #define DPRC_CFG_OPT_AIOP 0x00000020 diff --git a/include/fsl-mc/fsl_mc_cmd.h b/include/fsl-mc/fsl_mc_cmd.h index c239595ed5..3acc427f99 100644 --- a/include/fsl-mc/fsl_mc_cmd.h +++ b/include/fsl-mc/fsl_mc_cmd.h @@ -68,7 +68,6 @@ enum mc_cmd_status { /* Command completion flag */ #define MC_CMD_FLAG_INTR_DIS 0x01000000 - #define MC_CMD_HDR_CMDID_O 48 /* Command ID field offset */ #define MC_CMD_HDR_CMDID_S 16 /* Command ID field size */ #define MC_CMD_HDR_STATUS_O 16 /* Status field offset */ diff --git a/include/fsl-mc/fsl_qbman_portal.h b/include/fsl-mc/fsl_qbman_portal.h index ee0e4aa50d..11905f491d 100644 --- a/include/fsl-mc/fsl_qbman_portal.h +++ b/include/fsl-mc/fsl_qbman_portal.h @@ -23,7 +23,6 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *); * dependencies we just pre/re-declare it here opaquely. */ struct ldpaa_dq; - /* ------------------- */ /* Pull-mode dequeuing */ /* ------------------- */ @@ -110,7 +109,6 @@ struct qbman_eq_desc { uint32_t dont_manipulate_directly[8]; }; - /* Clear the contents of a descriptor to default/starting state. */ void qbman_eq_desc_clear(struct qbman_eq_desc *); /* Exactly one of the following descriptor "actions" should be set. (Calling diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h index c43f780e4c..182f583653 100644 --- a/include/fsl_ddr_sdram.h +++ b/include/fsl_ddr_sdram.h @@ -197,7 +197,6 @@ typedef struct ddr4_spd_eeprom_s generic_spd_eeprom_t; /* DEBUG_29 register */ #define DDR_TX_BD_DIS (1 << 10) /* Transmit Bit Deskew Disable */ - #if (defined(CONFIG_SYS_FSL_DDR_VER) && \ (CONFIG_SYS_FSL_DDR_VER >= FSL_DDR_VER_4_7)) #ifdef CONFIG_SYS_FSL_DDR3L @@ -473,7 +472,6 @@ extern phys_size_t fixed_sdram(void); extern void ddr_enable_ecc(unsigned int dram_size); #endif - typedef struct fixed_ddr_parm{ int min_freq; int max_freq; diff --git a/include/fsl_dtsec.h b/include/fsl_dtsec.h index ccd6572ae2..d93f50e95b 100644 --- a/include/fsl_dtsec.h +++ b/include/fsl_dtsec.h @@ -97,7 +97,6 @@ struct dtsec { u32 res9[80]; }; - /* TBI register addresses */ #define TBI_CR 0x00 #define TBI_SR 0x01 diff --git a/include/fsl_errata.h b/include/fsl_errata.h index 9f070726ac..c15f9a0484 100644 --- a/include/fsl_errata.h +++ b/include/fsl_errata.h @@ -14,7 +14,6 @@ #include <asm/arch/soc.h> #endif - #ifdef CONFIG_SYS_FSL_ERRATUM_A006379 static inline bool has_erratum_a006379(void) { @@ -62,7 +61,6 @@ static inline bool has_erratum_a008378(void) u32 svr = get_svr(); u32 soc = SVR_SOC_VER(svr); - switch (soc) { #ifdef CONFIG_ARCH_LS1021A case SOC_VER_LS1020: diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h index 4991d93220..3ac2268793 100644 --- a/include/fsl_ifc.h +++ b/include/fsl_ifc.h @@ -33,7 +33,6 @@ #error Neither CONFIG_SYS_FSL_IFC_LE nor CONFIG_SYS_FSL_IFC_BE is defined #endif - /* * CSPR - Chip Select Property Register */ @@ -790,7 +789,6 @@ enum ifc_nand_fir_opcodes { */ #define IFC_GPCM_STAT_BSY 0x80000000 /* GPCM is busy */ - #ifndef __ASSEMBLY__ #include <asm/io.h> diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h index 05fb41f403..f706cfe12a 100644 --- a/include/fsl_mmdc.h +++ b/include/fsl_mmdc.h @@ -12,7 +12,6 @@ /* PHY Pre-defined Compare and CA delay-line Configuration (MPPDCMPR2) */ #define MPPDCMPR2_MPR_COMPARE_EN (1 << 0) - /* MMDC PHY Read DQS gating control register 0 (MPDGCTRL0) */ #define AUTO_RD_DQS_GATING_CALIBRATION_EN (1 << 28) diff --git a/include/fsl_validate.h b/include/fsl_validate.h index 66a5883f1f..4b69de89eb 100644 --- a/include/fsl_validate.h +++ b/include/fsl_validate.h @@ -161,7 +161,6 @@ struct fsl_secboot_img_hdr { #endif /* CONFIG_ESBC_HDR_LS */ - #if defined(CONFIG_FSL_ISBC_KEY_EXT) struct ie_key_table { u32 key_len; diff --git a/include/gt64120.h b/include/gt64120.h index b58afe3c4a..b8d3f03a5e 100644 --- a/include/gt64120.h +++ b/include/gt64120.h @@ -221,7 +221,6 @@ #define GT_PCI0_HICMASK_OFS 0xca4 #define GT_PCI1_SERR1MASK_OFS 0xca8 - /* * I2O Support Registers */ @@ -283,7 +282,6 @@ #define GT_CPU_WR_DXDXDXDX 0 #define GT_CPU_WR_DDDD 1 - #define GT_PCI_DCRM_SHF 21 #define GT_PCI_LD_SHF 0 #define GT_PCI_LD_MSK (MSK(15) << GT_PCI_LD_SHF) @@ -292,7 +290,6 @@ #define GT_PCI_REMAP_SHF 0 #define GT_PCI_REMAP_MSK (MSK(11) << GT_PCI_REMAP_SHF) - #define GT_CFGADDR_CFGEN_SHF 31 #define GT_CFGADDR_CFGEN_MSK (MSK(1) << GT_CFGADDR_CFGEN_SHF) #define GT_CFGADDR_CFGEN_BIT GT_CFGADDR_CFGEN_MSK @@ -309,7 +306,6 @@ #define GT_CFGADDR_REGNUM_SHF 2 #define GT_CFGADDR_REGNUM_MSK (MSK(6) << GT_CFGADDR_REGNUM_SHF) - #define GT_SDRAM_BM_ORDER_SHF 2 #define GT_SDRAM_BM_ORDER_MSK (MSK(1) << GT_SDRAM_BM_ORDER_SHF) #define GT_SDRAM_BM_ORDER_BIT GT_SDRAM_BM_ORDER_MSK @@ -318,7 +314,6 @@ #define GT_SDRAM_BM_RSVD_ALL1 0xffb - #define GT_SDRAM_ADDRDECODE_ADDR_SHF 0 #define GT_SDRAM_ADDRDECODE_ADDR_MSK (MSK(3) << GT_SDRAM_ADDRDECODE_ADDR_SHF) #define GT_SDRAM_ADDRDECODE_ADDR_0 0 @@ -330,7 +325,6 @@ #define GT_SDRAM_ADDRDECODE_ADDR_6 6 #define GT_SDRAM_ADDRDECODE_ADDR_7 7 - #define GT_SDRAM_B0_CASLAT_SHF 0 #define GT_SDRAM_B0_CASLAT_MSK (MSK(2) << GT_SDRAM_B0__SHF) #define GT_SDRAM_B0_CASLAT_2 1 @@ -396,7 +390,6 @@ #define GT_SDRAM_B0_BLEN_8 0 #define GT_SDRAM_B0_BLEN_4 1 - #define GT_SDRAM_CFG_REFINT_SHF 0 #define GT_SDRAM_CFG_REFINT_MSK (MSK(14) << GT_SDRAM_CFG_REFINT_SHF) @@ -443,7 +436,6 @@ #define GT_TC_CONTROL_SELTC0_MSK (MSK(1) << GT_TC_CONTROL_SELTC0_SHF) #define GT_TC_CONTROL_SELTC0_BIT GT_TC_CONTROL_SELTC0_MSK - #define GT_PCI0_BARE_SWSCS3BOOTDIS_SHF 0 #define GT_PCI0_BARE_SWSCS3BOOTDIS_MSK \ (MSK(1) << GT_PCI0_BARE_SWSCS3BOOTDIS_SHF) @@ -481,7 +473,6 @@ #define GT_PCI0_BARE_SCS10DIS_MSK (MSK(1) << GT_PCI0_BARE_SCS10DIS_SHF) #define GT_PCI0_BARE_SCS10DIS_BIT GT_PCI0_BARE_SCS10DIS_MSK - #define GT_INTRCAUSE_MASABORT0_SHF 18 #define GT_INTRCAUSE_MASABORT0_MSK (MSK(1) << GT_INTRCAUSE_MASABORT0_SHF) #define GT_INTRCAUSE_MASABORT0_BIT GT_INTRCAUSE_MASABORT0_MSK @@ -490,7 +481,6 @@ #define GT_INTRCAUSE_TARABORT0_MSK (MSK(1) << GT_INTRCAUSE_TARABORT0_SHF) #define GT_INTRCAUSE_TARABORT0_BIT GT_INTRCAUSE_TARABORT0_MSK - #define GT_PCI0_CMD_MBYTESWAP_SHF 0 #define GT_PCI0_CMD_MBYTESWAP_MSK (MSK(1) << GT_PCI0_CMD_MBYTESWAP_SHF) #define GT_PCI0_CMD_MBYTESWAP_BIT GT_PCI0_CMD_MBYTESWAP_MSK diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index 651f94cf38..e986508c2c 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -109,7 +109,6 @@ #define JFFS2_INO_FLAG_USERCOMPR 2 /* User has requested a specific compression type */ - struct jffs2_unknown_node { /* All start like this */ @@ -212,7 +211,6 @@ enum # define DT_WHT DT_WHT }; - u32 jffs2_1pass_ls(struct part_info *part,const char *fname); u32 jffs2_1pass_load(char *dest, struct part_info *part,const char *fname); u32 jffs2_1pass_info(struct part_info *part); diff --git a/include/key_matrix.h b/include/key_matrix.h index 17f5d12cdd..fffe2ddc53 100644 --- a/include/key_matrix.h +++ b/include/key_matrix.h @@ -8,7 +8,6 @@ #ifndef _KEY_MATRIX_H #define _KEY_MATRIX_H - /* Information about a matrix keyboard */ struct key_matrix { /* Dimensions of the keyboard matrix, in rows and columns */ diff --git a/include/linux/asn1.h b/include/linux/asn1.h index a4d0bdd107..ca208333e1 100644 --- a/include/linux/asn1.h +++ b/include/linux/asn1.h @@ -17,7 +17,6 @@ enum asn1_class { }; #define ASN1_CLASS_BITS 0xc0 - enum asn1_method { ASN1_PRIM = 0, /* Primitive */ ASN1_CONS = 1 /* Constructed */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index d2e5ca026e..f826d7f3b3 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -108,7 +108,6 @@ static inline int generic_fls(int x) return r; } - /* * hweightN: returns the hamming weight (i.e. the number * of bits set) of a N-bit word diff --git a/include/linux/byteorder/swab.h b/include/linux/byteorder/swab.h index 5efc252acf..2b41fbac18 100644 --- a/include/linux/byteorder/swab.h +++ b/include/linux/byteorder/swab.h @@ -76,7 +76,6 @@ # define __arch__swab64s(x) do { *(x) = __swab64p((x)); } while (0) #endif - /* * Allow constant folding */ @@ -99,7 +98,6 @@ # define __swab64(x) __fswab64(x) #endif /* OPTIMIZE */ - static __inline__ __attribute__((const)) __u16 __fswab16(__u16 x) { return __arch__swab16(x); diff --git a/include/linux/edd.h b/include/linux/edd.h index 992ce7cf9f..904e3d218d 100644 --- a/include/linux/edd.h +++ b/include/linux/edd.h @@ -35,7 +35,6 @@ #define EDDMAGIC1 0x55AA #define EDDMAGIC2 0xAA55 - #define READ_SECTORS 0x02 /* int13 AH=0x02 is READ_SECTORS command */ #define EDD_MBR_SIG_OFFSET 0x1B8 /* offset of signature in the MBR */ #define EDD_MBR_SIG_BUF 0x290 /* addr in boot params */ diff --git a/include/linux/err.h b/include/linux/err.h index 5ede82432d..7a0b212c81 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -6,7 +6,6 @@ #include <linux/errno.h> - /* * Kernel pointers have redundant information, so we can use a * scheme where we can return either an error code or a dentry diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index aa7d2fd58f..1b0736c97e 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -376,7 +376,6 @@ struct ethtool_usrip4_spec { __u8 proto; }; - /** * struct ethtool_rxfh_indir - command to get or set RX flow hash indirection * @cmd: Specific command number - %ETHTOOL_GRXFHINDIR or %ETHTOOL_SRXFHINDIR diff --git a/include/linux/fb.h b/include/linux/fb.h index c820a4f77b..5fbc30cf42 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -160,7 +160,6 @@ struct fb_con2fbmap { #define VESA_HSYNC_SUSPEND 2 #define VESA_POWERDOWN 3 - enum { /* screen: unblanked, hsync: on, vsync: on */ FB_BLANK_UNBLANK = VESA_NO_BLANKING, @@ -583,7 +582,6 @@ struct fb_info { #define FB_MODE_IS_FIRST 16 #define FB_MODE_IS_FROM_VAR 32 - /* drivers/video/fbcmap.c */ extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5cd6c9dc82..939465f372 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -255,7 +255,6 @@ */ #define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi) - /* * swap - swap value of @a and @b */ diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index 265e89f02b..00278da3c2 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h @@ -51,7 +51,6 @@ typedef enum { FL_UNKNOWN } flstate_t; - /* NOTE: confusingly, this can be used to refer to more than one chip at a time, if they're interleaved. This can even refer to individual partitions on the same physical chip when present. */ @@ -98,5 +97,4 @@ struct flchip_shared { struct flchip *erasing; }; - #endif /* __MTD_FLASHCHIP_H__ */ diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index ee18a63e46..983a55ce70 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -522,7 +522,6 @@ extern void __put_mtd_device(struct mtd_info *mtd); extern struct mtd_info *get_mtd_device_nm(const char *name); extern void put_mtd_device(struct mtd_info *mtd); - #ifndef __UBOOT__ struct mtd_notifier { void (*add)(struct mtd_info *mtd); @@ -530,7 +529,6 @@ struct mtd_notifier { struct list_head list; }; - extern void register_mtd_user (struct mtd_notifier *new); extern int unregister_mtd_user (struct mtd_notifier *old); #endif diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index 0f5a233266..1959a69585 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -11,7 +11,6 @@ #include <linux/types.h> - /* * Partition definition structure: * @@ -49,7 +48,6 @@ struct mtd_partition { #define MTDPART_OFS_APPEND (-1) #define MTDPART_SIZ_FULL (0) - struct mtd_info; struct device_node; @@ -64,7 +62,6 @@ struct mtd_part_parser_data { struct device_node *of_node; }; - /* * Functions dealing with the various ways of partitioning the space */ diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 4abaf4734c..537c62424a 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -177,7 +177,6 @@ enum nand_ecc_algo { /* Bit mask for flags passed to do_nand_read_ecc */ #define NAND_GET_DEVICE 0x80 - /* * Option constants for bizarre disfunctionality and real * features. @@ -931,7 +930,6 @@ struct nand_chip { int (*setup_data_interface)(struct mtd_info *mtd, int chipnr, const struct nand_data_interface *conf); - int chip_delay; unsigned int options; unsigned int bbt_options; diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h index 1d2b1768c1..3809c3fb8e 100644 --- a/include/linux/rbtree.h +++ b/include/linux/rbtree.h @@ -32,7 +32,6 @@ struct rb_root { struct rb_node *rb_node; }; - #define rb_parent(r) ((struct rb_node *)((r)->__rb_parent_color & ~3)) #define RB_ROOT (struct rb_root) { NULL, } @@ -46,11 +45,9 @@ struct rb_root { #define RB_CLEAR_NODE(node) \ ((node)->__rb_parent_color = (unsigned long)(node)) - extern void rb_insert_color(struct rb_node *, struct rb_root *); extern void rb_erase(struct rb_node *, struct rb_root *); - /* Find logical next and previous nodes in a tree */ extern struct rb_node *rb_next(const struct rb_node *); extern struct rb_node *rb_prev(const struct rb_node *); diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h index da04156e8a..605888dfdf 100644 --- a/include/linux/rbtree_augmented.h +++ b/include/linux/rbtree_augmented.h @@ -70,7 +70,6 @@ rbstatic const struct rb_augment_callbacks rbname = { \ rbname ## _propagate, rbname ## _copy, rbname ## _rotate \ }; - #define RB_RED 0 #define RB_BLACK 1 diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 061371773c..99d0aeb5da 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -287,7 +287,6 @@ #define UART_ACR_ICRRD 0x40 /* ICR Read enable */ #define UART_ACR_ASREN 0x80 /* Additional status enable */ - /* * These definitions are for the RSA-DV II/S card, from * diff --git a/include/linux/string.h b/include/linux/string.h index df1c1c5669..27b2beb9dd 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -14,7 +14,6 @@ extern char * strtok(char *,const char *); extern char * strsep(char **,const char *); extern __kernel_size_t strspn(const char *,const char *); - /* * Include machine specific inline routines */ diff --git a/include/linux/time.h b/include/linux/time.h index 14a144d9c9..0de44cff8d 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -34,7 +34,6 @@ #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) - /* Used by other time functions. */ struct tm { int tm_sec; /* Seconds. [0-60] (1 leap second) */ diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index a8fa5d7449..c8c553b930 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h @@ -248,7 +248,6 @@ struct usb_descriptor_header { __u8 bDescriptorType; } __attribute__ ((packed)); - /*-------------------------------------------------------------------------*/ /* USB_DT_DEVICE: Device descriptor */ @@ -272,7 +271,6 @@ struct usb_device_descriptor { #define USB_DT_DEVICE_SIZE 18 - /* * Device and/or Interface Class codes * as found in bDeviceClass or bInterfaceClass @@ -703,7 +701,6 @@ struct usb_qualifier_descriptor { __u8 bRESERVED; } __attribute__ ((packed)); - /*-------------------------------------------------------------------------*/ /* USB_DT_OTG (from OTG 1.0a supplement) */ @@ -745,7 +742,6 @@ struct usb_interface_assoc_descriptor { __u8 iFunction; } __attribute__ ((packed)); - /*-------------------------------------------------------------------------*/ /* USB_DT_SECURITY: group of wireless security descriptors, including @@ -789,7 +785,6 @@ struct usb_encryption_descriptor { __u8 bAuthKeyIndex; } __attribute__((packed)); - /*-------------------------------------------------------------------------*/ /* USB_DT_BOS: group of device-level capabilities */ diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index cf2161603d..c7927df15a 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -446,7 +446,6 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep) ep->ops->fifo_flush(ep); } - /*-------------------------------------------------------------------------*/ struct usb_dcd_config_params { @@ -567,7 +566,6 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev) #define gadget_for_each_ep(tmp, gadget) \ list_for_each_entry(tmp, &(gadget)->ep_list, ep_list) - /** * gadget_is_dualspeed - return true iff the hardware handles high speed * @g: controller that might support both high and full speeds @@ -769,7 +767,6 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget) return gadget->ops->pullup(gadget, 0); } - /*-------------------------------------------------------------------------*/ /** @@ -856,7 +853,6 @@ struct usb_gadget_driver { void (*reset)(struct usb_gadget *); }; - /*-------------------------------------------------------------------------*/ /* driver modules register and unregister, as usual. diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index a31ce67a81..2083cbe79b 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h @@ -128,7 +128,6 @@ struct musb_hdrc_platform_data { const void *platform_ops; }; - /* TUSB 6010 support */ #define TUSB6010_OSCCLK_60 16667 /* psec/clk @ 60.0 MHz */ diff --git a/include/linux/zstd_errors.h b/include/linux/zstd_errors.h index 58b6dd45a9..edba6e1fab 100644 --- a/include/linux/zstd_errors.h +++ b/include/linux/zstd_errors.h @@ -11,11 +11,9 @@ #ifndef ZSTD_ERRORS_H_398273423 #define ZSTD_ERRORS_H_398273423 - /*===== dependency =====*/ #include <linux/types.h> /* size_t */ - /* ===== ZSTDERRORLIB_API : control library symbols visibility ===== */ #define ZSTDERRORLIB_VISIBILITY #define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBILITY @@ -72,6 +70,4 @@ typedef enum { ZSTDERRORLIB_API ZSTD_ErrorCode ZSTD_getErrorCode(size_t functionResult); ZSTDERRORLIB_API const char* ZSTD_getErrorString(ZSTD_ErrorCode code); /*< Same as ZSTD_getErrorName, but using a `ZSTD_ErrorCode` enum argument */ - - #endif /* ZSTD_ERRORS_H_398273423 */ diff --git a/include/linux/zstd_lib.h b/include/linux/zstd_lib.h index 25f5907427..a4d559c62a 100644 --- a/include/linux/zstd_lib.h +++ b/include/linux/zstd_lib.h @@ -14,7 +14,6 @@ /* ====== Dependency ======*/ #include <linux/types.h> /* size_t */ - /* ===== ZSTDLIB_API : control library symbols visibility ===== */ #ifndef ZSTDLIB_VISIBLE # if (__GNUC__ >= 4) && !defined(__MINGW32__) @@ -27,7 +26,6 @@ #endif #define ZSTDLIB_API ZSTDLIB_VISIBLE - /* ***************************************************************************** Introduction @@ -100,7 +98,6 @@ ZSTDLIB_API const char* ZSTD_versionString(void); #define ZSTD_BLOCKSIZELOG_MAX 17 #define ZSTD_BLOCKSIZE_MAX (1<<ZSTD_BLOCKSIZELOG_MAX) - /* ************************************* * Simple API ***************************************/ @@ -165,7 +162,6 @@ ZSTDLIB_API unsigned long long ZSTD_getDecompressedSize(const void* src, size_t * or an error code if input is invalid */ ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize); - /*====== Helper functions ======*/ #define ZSTD_COMPRESSBOUND(srcSize) ((srcSize) + ((srcSize)>>8) + (((srcSize) < (128<<10)) ? (((128<<10) - (srcSize)) >> 11) /* margin, from 64 to 0 */ : 0)) /* this formula ensures that bound(A) + bound(B) <= bound(A+B) as long as A and B >= 128 KB */ ZSTDLIB_API size_t ZSTD_compressBound(size_t srcSize); /*!< maximum compressed size in worst case single-pass scenario */ @@ -175,7 +171,6 @@ ZSTDLIB_API int ZSTD_minCLevel(void); /*!< minimum negativ ZSTDLIB_API int ZSTD_maxCLevel(void); /*!< maximum compression level available */ ZSTDLIB_API int ZSTD_defaultCLevel(void); /*!< default compression level, specified by ZSTD_CLEVEL_DEFAULT, requires v1.5.0+ */ - /* ************************************* * Explicit context ***************************************/ @@ -225,7 +220,6 @@ ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); - /* ******************************************* * Advanced compression API (Requires v1.4.0+) **********************************************/ @@ -243,7 +237,6 @@ ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx, * In the future, we expect to remove from experimental API entry points which are redundant with this API. */ - /* Compression strategies, listed from fastest to strongest */ typedef enum { ZSTD_fast=1, ZSTD_dfast=2, @@ -513,7 +506,6 @@ ZSTDLIB_API size_t ZSTD_compress2( ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); - /* ********************************************* * Advanced decompression API (Requires v1.4.0+) ************************************************/ @@ -578,7 +570,6 @@ ZSTDLIB_API size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param */ ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset); - /* ************************** * Streaming ****************************/ @@ -595,8 +586,6 @@ typedef struct ZSTD_outBuffer_s { size_t pos; /*< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size */ } ZSTD_outBuffer; - - /*-*********************************************************************** * Streaming compression - HowTo * @@ -705,7 +694,6 @@ ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx, ZSTD_inBuffer* input, ZSTD_EndDirective endOp); - /* These buffer sizes are softly recommended. * They are not required : ZSTD_compressStream*() happily accepts any buffer size, for both input and output. * Respecting the recommended size just makes it a bit easier for ZSTD_compressStream*(), @@ -722,7 +710,6 @@ ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx, ZSTDLIB_API size_t ZSTD_CStreamInSize(void); /*< recommended size for input buffer */ ZSTDLIB_API size_t ZSTD_CStreamOutSize(void); /*< recommended size for output buffer. Guarantee to successfully flush at least one complete compressed block. */ - /* ***************************************************************************** * This following is a legacy streaming API, available since v1.0+ . * It can be replaced by ZSTD_CCtx_reset() and ZSTD_compressStream2(). @@ -751,7 +738,6 @@ ZSTDLIB_API size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output); /*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_end). */ ZSTDLIB_API size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output); - /*-*************************************************************************** * Streaming decompression - HowTo * @@ -799,7 +785,6 @@ ZSTDLIB_API size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* outp ZSTDLIB_API size_t ZSTD_DStreamInSize(void); /*!< recommended size for input buffer */ ZSTDLIB_API size_t ZSTD_DStreamOutSize(void); /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */ - /* ************************ * Simple dictionary API ***************************/ @@ -827,7 +812,6 @@ ZSTDLIB_API size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx, const void* src, size_t srcSize, const void* dict,size_t dictSize); - /* ********************************* * Bulk processing dictionary API **********************************/ @@ -863,7 +847,6 @@ ZSTDLIB_API size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx, const void* src, size_t srcSize, const ZSTD_CDict* cdict); - typedef struct ZSTD_DDict_s ZSTD_DDict; /*! ZSTD_createDDict() : @@ -884,7 +867,6 @@ ZSTDLIB_API size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx, const void* src, size_t srcSize, const ZSTD_DDict* ddict); - /* ****************************** * Dictionary helper functions *******************************/ @@ -919,7 +901,6 @@ ZSTDLIB_API unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict); * When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code. */ ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize); - /* ***************************************************************************** * Advanced dictionary and prefix API (Requires v1.4.0+) * @@ -929,7 +910,6 @@ ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize); * ZSTD_reset_session_and_parameters. Prefixes are single-use. ******************************************************************************/ - /*! ZSTD_CCtx_loadDictionary() : Requires v1.4.0+ * Create an internal CDict from `dict` buffer. * Decompression will have to use same dictionary. @@ -1052,7 +1032,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict); #endif /* ZSTD_H_235446 */ - /* ************************************************************************************** * ADVANCED AND EXPERIMENTAL FUNCTIONS **************************************************************************************** @@ -1123,7 +1102,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict); #define ZSTD_STRATEGY_MIN ZSTD_fast #define ZSTD_STRATEGY_MAX ZSTD_btultra2 - #define ZSTD_OVERLAPLOG_MIN 0 #define ZSTD_OVERLAPLOG_MAX 9 @@ -1133,7 +1111,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict); * This limit can be overridden using ZSTD_DCtx_setParameter(,ZSTD_d_windowLogMax,). * The limit does not apply for one-pass decoders (such as ZSTD_decompress()), since no additional memory is allocated */ - /* LDM parameter bounds */ #define ZSTD_LDM_HASHLOG_MIN ZSTD_HASHLOG_MIN #define ZSTD_LDM_HASHLOG_MAX ZSTD_HASHLOG_MAX @@ -1149,7 +1126,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict); #define ZSTD_TARGETCBLOCKSIZE_MAX ZSTD_BLOCKSIZE_MAX #define ZSTD_SRCSIZEHINT_MIN 0 - /* --- Advanced types --- */ typedef struct ZSTD_CCtx_params_s ZSTD_CCtx_params; @@ -1417,7 +1393,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_compressSequences(ZSTD_CCtx* const cctx, void* ds const ZSTD_Sequence* inSeqs, size_t inSeqsSize, const void* src, size_t srcSize); - /*! ZSTD_writeSkippableFrame() : * Generates a zstd skippable frame containing data given by src, and writes it to dst buffer. * @@ -1453,8 +1428,6 @@ ZSTDLIB_API size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity, unsign */ ZSTDLIB_API unsigned ZSTD_isSkippableFrame(const void* buffer, size_t size); - - /* ************************************* * Memory management ***************************************/ @@ -1555,7 +1528,6 @@ ZSTDLIB_STATIC_API const ZSTD_DDict* ZSTD_initStaticDDict( ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType); - /*! Custom memory allocation : * These prototypes make it possible to pass your own allocation/free functions. * ZSTD_customMem is provided at creation time, using ZSTD_create*_advanced() variants listed below. @@ -1594,7 +1566,6 @@ ZSTDLIB_STATIC_API ZSTD_threadPool* ZSTD_createThreadPool(size_t numThreads); ZSTDLIB_STATIC_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool); /* accept NULL pointer */ ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool); - /* * This API is temporary and is expected to change or disappear in the future! */ @@ -1611,7 +1582,6 @@ ZSTDLIB_STATIC_API ZSTD_DDict* ZSTD_createDDict_advanced( ZSTD_dictContentType_e dictContentType, ZSTD_customMem customMem); - /* ************************************* * Advanced compression functions ***************************************/ @@ -1669,7 +1639,6 @@ size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict, ZSTD_frameParameters fParams); - /*! ZSTD_CCtx_loadDictionary_byReference() : * Same as ZSTD_CCtx_loadDictionary(), but dictionary content is referenced, instead of being copied into CCtx. * It saves some memory, but also requires that `dict` outlives its usage within `cctx` */ @@ -1933,7 +1902,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const vo */ ZSTDLIB_STATIC_API size_t ZSTD_CCtx_getParameter(const ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value); - /*! ZSTD_CCtx_params : * Quick howto : * - ZSTD_createCCtxParams() : Create a ZSTD_CCtx_params structure @@ -2010,7 +1978,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_compressStream2_simpleArgs ( const void* src, size_t srcSize, size_t* srcPos, ZSTD_EndDirective endOp); - /* ************************************* * Advanced decompression functions ***************************************/ @@ -2135,7 +2102,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParamete */ #define ZSTD_d_refMultipleDDicts ZSTD_d_experimentalParam4 - /*! ZSTD_DCtx_setFormat() : * This function is REDUNDANT. Prefer ZSTD_DCtx_setParameter(). * Instruct the decoder context about what kind of data to decode next. @@ -2156,7 +2122,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_decompressStream_simpleArgs ( void* dst, size_t dstCapacity, size_t* dstPos, const void* src, size_t srcSize, size_t* srcPos); - /* ****************************************************************** * Advanced streaming functions * Warning : most of these functions are now redundant with the Advanced API. @@ -2274,7 +2239,6 @@ size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs, ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize); - typedef struct { unsigned long long ingested; /* nb input bytes read and buffered */ unsigned long long consumed; /* nb input bytes actually compressed */ @@ -2307,7 +2271,6 @@ ZSTDLIB_STATIC_API ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCt */ ZSTDLIB_STATIC_API size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx); - /*===== Advanced Streaming decompression functions =====*/ /*! @@ -2342,7 +2305,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* zds, const Z */ ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); - /* ******************************************************************* * Buffer-less and synchronous inner streaming functions * @@ -2504,9 +2466,6 @@ ZSTDLIB_STATIC_API void ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* prepar typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e; ZSTDLIB_STATIC_API ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx); - - - /* ============================ */ /* Block level API */ /* ============================ */ @@ -2544,6 +2503,5 @@ ZSTDLIB_STATIC_API size_t ZSTD_compressBlock (ZSTD_CCtx* cctx, void* dst, size_ ZSTDLIB_STATIC_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); ZSTDLIB_STATIC_API size_t ZSTD_insertBlock (ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize); /*< insert uncompressed block into `dctx` history. Useful for multi-blocks decompression. */ - #endif /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */ diff --git a/include/malloc.h b/include/malloc.h index 161ccbd129..07d3e90a85 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -213,7 +213,6 @@ quickly avoid procedure declaration conflicts and linker symbol conflicts with existing memory allocation routines. - */ @@ -256,12 +255,10 @@ extern "C" { #include <stdio.h> /* needed for malloc_stats */ #endif - /* Compile-time options */ - /* Debugging: @@ -306,10 +303,8 @@ extern "C" { returns a unique pointer for malloc(0), so does realloc(p, 0). */ - /* #define REALLOC_ZERO_BYTES_FREES */ - /* WIN32 causes an emulation of sbrk to be compiled in mmap-based options are not currently supported in WIN32. @@ -335,7 +330,6 @@ extern "C" { #include <windows.h> #endif - /* HAVE_MEMCPY should be defined if you are not otherwise using ANSI STD C, but still have memcpy and memset in your C library @@ -460,7 +454,6 @@ do { \ #endif - /* Define HAVE_MMAP to optionally make malloc() use mmap() to allocate very large blocks. These will be returned to the @@ -563,7 +556,6 @@ do { \ # endif #endif - /* This version of malloc supports the standard SVID/XPG mallinfo @@ -626,7 +618,6 @@ struct mallinfo { #define M_MMAP_THRESHOLD -3 #define M_MMAP_MAX -4 - #ifndef DEFAULT_TRIM_THRESHOLD #define DEFAULT_TRIM_THRESHOLD (128 * 1024) #endif @@ -677,10 +668,8 @@ struct mallinfo { It must be greater than page size to have any useful effect. To disable trimming completely, you can set to (unsigned long)(-1); - */ - #ifndef DEFAULT_TOP_PAD #define DEFAULT_TOP_PAD (0) #endif @@ -713,7 +702,6 @@ struct mallinfo { */ - #ifndef DEFAULT_MMAP_THRESHOLD #define DEFAULT_MMAP_THRESHOLD (128 * 1024) #endif @@ -753,10 +741,8 @@ struct mallinfo { All together, these considerations should lead you to use mmap only for relatively large requests. - */ - #ifndef DEFAULT_MMAP_MAX #ifdef HAVE_MMAP #define DEFAULT_MMAP_MAX (64) @@ -784,7 +770,6 @@ struct mallinfo { in mallopt will fail. */ - /* USE_DL_PREFIX will prefix all public routines with the string 'dl'. Useful to quickly avoid procedure declaration conflicts and linker @@ -815,7 +800,6 @@ struct mallinfo { */ - #ifdef INTERNAL_LINUX_C_LIB #if __STD_C diff --git a/include/mc13892.h b/include/mc13892.h index 8e8b63e769..d9ef53b1e4 100644 --- a/include/mc13892.h +++ b/include/mc13892.h @@ -6,7 +6,6 @@ * (C) Copyright 2009 Freescale Semiconductor, Inc. */ - #ifndef __MC13892_H__ #define __MC13892_H__ diff --git a/include/micrel.h b/include/micrel.h index a2593c5b10..6294bffc58 100644 --- a/include/micrel.h +++ b/include/micrel.h @@ -32,7 +32,6 @@ #define PHY_ID_KSZ9031 0x00221620 #define PHY_ID_KSZ9131 0x00221640 - /* Registers */ #define MMD_ACCESS_CONTROL 0xd #define MMD_ACCESS_REG_DATA 0xe diff --git a/include/mmc.h b/include/mmc.h index 7f1900363b..155a8e9f42 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -73,7 +73,6 @@ struct bd_info; #define MMC_MODE_1BIT BIT(28) #define MMC_MODE_SPI BIT(27) - #define SD_DATA_4BIT 0x00040000 #define IS_SD(x) ((x)->version & SD_VERSION_SD) @@ -113,7 +112,6 @@ struct bd_info; #define MMC_CMD62_ARG1 0xefac62ec #define MMC_CMD62_ARG2 0xcbaea7 - #define SD_CMD_SEND_RELATIVE_ADDR 3 #define SD_CMD_SWITCH_FUNC 6 #define SD_CMD_SEND_IF_COND 8 diff --git a/include/mpc8xx.h b/include/mpc8xx.h index 0e0e0cb70d..53e0be3de4 100644 --- a/include/mpc8xx.h +++ b/include/mpc8xx.h @@ -13,7 +13,6 @@ #ifndef __MPCXX_H__ #define __MPCXX_H__ - /*----------------------------------------------------------------------- * Exception offsets (PowerPC standard) */ @@ -200,7 +199,6 @@ #define SCCR_DFALCD10 0x00000002 /* Division by 5 */ #define SCCR_DFALCD11 0x00000003 /* Division by 7 (maximum) */ - /*----------------------------------------------------------------------- * BR - Memory Controler: Base Register 16-9 */ @@ -253,7 +251,6 @@ #define OR_TRLX 0x00000004 /* Timing Relaxed */ #define OR_EHTR 0x00000002 /* Extended Hold Time on Read */ - /*----------------------------------------------------------------------- * MPTPR - Memory Periodic Timer Prescaler Register 16-17 */ @@ -464,7 +461,6 @@ #define TGCR_STP1 0x0002 /* Stop timer 1 */ #define TGCR_RST1 0x0001 /* Reset timer 1 */ - /*----------------------------------------------------------------------- * Timer Mode Register 18-9 */ @@ -485,7 +481,6 @@ #define TMR_ICLK_TIN_PIN 0x0006 /* TINx pin */ #define TMR_GE 0x0001 /* Gate Enable */ - /*----------------------------------------------------------------------- * I2C Controller Registers */ diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index 8d472cc013..cc95fa2ede 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h @@ -421,7 +421,6 @@ struct ubi_map_req { __s8 padding[3]; } __packed; - /** * struct ubi_set_vol_prop_req - a data structure used to set an UBI volume * property. diff --git a/include/mv88e6352.h b/include/mv88e6352.h index 152a0774fc..4de9dbdb79 100644 --- a/include/mv88e6352.h +++ b/include/mv88e6352.h @@ -7,7 +7,6 @@ #ifndef __MV886352_H #define __MV886352_H - /* PHY registers */ #define PHY(itf) (itf) diff --git a/include/nand.h b/include/nand.h index cdba7384ad..3a0ef6ad9c 100644 --- a/include/nand.h +++ b/include/nand.h @@ -58,7 +58,6 @@ static inline int nand_erase(struct mtd_info *info, loff_t off, size_t size) return mtd_erase(info, &instr); } - /***************************************************************************** * declarations from nand_util.c ****************************************************************************/ diff --git a/include/net.h b/include/net.h index ac511eab10..bb2ae20f52 100644 --- a/include/net.h +++ b/include/net.h @@ -225,7 +225,6 @@ int eth_get_dev_index(void); /* get the device index */ int eth_env_set_enetaddr_by_index(const char *base_name, int index, uchar *enetaddr); - /* * Initialize USB ethernet device with CONFIG_DM_ETH * Returns: diff --git a/include/net/sntp.h b/include/net/sntp.h index 30b44d1c06..5dd9aa36fe 100644 --- a/include/net/sntp.h +++ b/include/net/sntp.h @@ -9,7 +9,6 @@ #define NTP_SERVICE_PORT 123 #define SNTP_PACKET_LEN 48 - /* Leap Indicator */ #define NTP_LI_NOLEAP 0x0 #define NTP_LI_61SECS 0x1 diff --git a/include/part.h b/include/part.h index 32ee404885..b187ec4b4b 100644 --- a/include/part.h +++ b/include/part.h @@ -609,7 +609,6 @@ int gpt_verify_partitions(struct blk_desc *desc, struct disk_partition *partitions, int parts, gpt_header *gpt_head, gpt_entry **gpt_pte); - /** * get_disk_guid() - Read the GUID string from a device's GPT * diff --git a/include/pci.h b/include/pci.h index ea3b73923d..5fea815b48 100644 --- a/include/pci.h +++ b/include/pci.h @@ -272,7 +272,6 @@ #define PCI_X_CMD_MAX_SPLIT 0x0030 /* Max Outstanding Split Transactions */ #define PCI_X_CMD_VERSION(x) (((x) >> 12) & 3) /* Version */ - /* Slot Identification */ #define PCI_SID_ESR 2 /* Expansion Slot Register */ diff --git a/include/pci_gt64120.h b/include/pci_gt64120.h index c9fb9fa8d5..f06e86b98f 100644 --- a/include/pci_gt64120.h +++ b/include/pci_gt64120.h @@ -12,5 +12,4 @@ void gt64120_pci_init(void *regs, unsigned long sys_bus, unsigned long sys_phys, unsigned long io_bus, unsigned long io_phys, unsigned long io_size); - #endif /* _PCI_GT64120_H */ diff --git a/include/pci_ids.h b/include/pci_ids.h index 6f095442ca..191d277bc8 100644 --- a/include/pci_ids.h +++ b/include/pci_ids.h @@ -1535,7 +1535,6 @@ #define PCI_VENDOR_ID_ZIATECH 0x1138 #define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550 - #define PCI_VENDOR_ID_SYSKONNECT 0x1148 #define PCI_DEVICE_ID_SYSKONNECT_TR 0x4200 #define PCI_DEVICE_ID_SYSKONNECT_GE 0x4300 diff --git a/include/power/max17042_fg.h b/include/power/max17042_fg.h index ec8377d370..e417012459 100644 --- a/include/power/max17042_fg.h +++ b/include/power/max17042_fg.h @@ -43,7 +43,6 @@ enum { #define RCOMP0 0x0060 #define TempCo 0x1015 - #define MAX17042_POR (1 << 1) #define MODEL_UNLOCK1 0x0059 diff --git a/include/power/tps65910.h b/include/power/tps65910.h index ccc759acf6..645eabc2c4 100644 --- a/include/power/tps65910.h +++ b/include/power/tps65910.h @@ -51,7 +51,6 @@ enum { #define TPS65910_REG_ST_OFF_1 (0x2) #define TPS65910_REG_ST_ON_LOW_POW (0x3) - /* VDD2 & VDD1 voltage selection register. (VDD2_OP_REG & VDD1_OP_REG) */ #define TPS65910_OP_REG_SEL (0x7F) diff --git a/include/scsi.h b/include/scsi.h index cf756aa62e..b18ae37b86 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -95,7 +95,6 @@ struct scsi_cmd { #define M_X_WIDE_REQ (0x03) #define M_X_PPR_REQ (0x04) - /* ** Status */ @@ -131,7 +130,6 @@ struct scsi_cmd { #define SENSE_VOLUME_OVERFLOW 0xD #define SENSE_MISCOMPARE 0xE - #define SCSI_CHANGE_DEF 0x40 /* Change Definition (Optional) */ #define SCSI_COMPARE 0x39 /* Compare (O) */ #define SCSI_COPY 0x18 /* Copy (O) */ diff --git a/include/spd.h b/include/spd.h index 2bcf46de6d..8b24a1e97f 100644 --- a/include/spd.h +++ b/include/spd.h @@ -77,7 +77,6 @@ typedef struct spd_eeprom_s { unsigned char intel_cas; /* 129 Intel spec: CAS# Latency support */ } spd_eeprom_t; - /* * Byte 2 Fundamental Memory Types. */ diff --git a/include/spl.h b/include/spl.h index 5dfdf778d2..1eebea3f98 100644 --- a/include/spl.h +++ b/include/spl.h @@ -436,7 +436,6 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, struct spl_load_info *load, ulong offset, struct legacy_img_hdr *hdr); - /** * spl_load_imx_container() - Loads a imx container image from a device. * @spl_image: Image description to set up diff --git a/include/tegra-kbc.h b/include/tegra-kbc.h index 1208b75ee7..316e6b1a68 100644 --- a/include/tegra-kbc.h +++ b/include/tegra-kbc.h @@ -7,7 +7,6 @@ #ifndef __include_tegra_kbc_h__ #define __include_tegra_kbc_h__ - #define KEY_IS_MODIFIER(key) ((key) >= KEY_FIRST_MODIFIER) struct kbc_tegra { diff --git a/include/u-boot/sha512.h b/include/u-boot/sha512.h index 90bd96a3f8..83c2119cd2 100644 --- a/include/u-boot/sha512.h +++ b/include/u-boot/sha512.h @@ -36,5 +36,4 @@ void sha384_finish(sha512_context * ctx, uint8_t digest[SHA384_SUM_LEN]); void sha384_csum_wd(const unsigned char *input, unsigned int ilen, unsigned char *output, unsigned int chunk_sz); - #endif /* _SHA512_H */ diff --git a/include/u-boot/zlib.h b/include/u-boot/zlib.h index ee19f46095..dac565497c 100644 --- a/include/u-boot/zlib.h +++ b/include/u-boot/zlib.h @@ -36,7 +36,6 @@ Jean-loup Gailly Mark Adler jloup@gzip.org madler@alumni.caltech.edu - The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). @@ -547,7 +546,6 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, z_streamp source)); - ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, int stream_size)); ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); diff --git a/include/usb.h b/include/usb.h index 3aafdc8bfd..fcbe2146f7 100644 --- a/include/usb.h +++ b/include/usb.h @@ -274,7 +274,6 @@ int usb_init(void); int usb_stop(void); /* stop the USB Controller */ int usb_detect_change(void); /* detect if a USB device has been (un)plugged */ - int usb_set_protocol(struct usb_device *dev, int ifnum, int protocol); int usb_set_idle(struct usb_device *dev, int ifnum, int duration, int report_id); @@ -600,7 +599,6 @@ struct usb_hub_descriptor { } u; } __attribute__ ((packed)); - struct usb_hub_device { struct usb_device *pusb_dev; struct usb_hub_descriptor desc; diff --git a/include/usb/ci_udc.h b/include/usb/ci_udc.h index 06adb2bb4d..9f15dbabe5 100644 --- a/include/usb/ci_udc.h +++ b/include/usb/ci_udc.h @@ -4,7 +4,6 @@ * Lei Wen <leiwen@marvell.com> */ - #ifndef __CI_UDC_H__ #define __CI_UDC_H__ diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index 126623cf9a..10e3122110 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -116,7 +116,6 @@ int ulpi_suspend(struct ulpi_viewport *ulpi_vp); */ int ulpi_reset(struct ulpi_viewport *ulpi_vp); - /* ULPI access methods below must be implemented for each ULPI viewport. */ /* @@ -314,5 +313,4 @@ struct ulpi_regs { #define ULPI_CARKIT_PLS_CTRL_SPKRLEFT_BIASEN (1 << 2) #define ULPI_CARKIT_PLS_CTRL_SPKRRIGHT_BIASEN (1 << 3) - #endif /* __USB_ULPI_H__ */ diff --git a/include/usb/xhci.h b/include/usb/xhci.h index 04d16a256b..5fcdae1421 100644 --- a/include/usb/xhci.h +++ b/include/usb/xhci.h @@ -682,7 +682,6 @@ struct xhci_input_control_ctx { __le32 rsvd2[6]; }; - /** * struct xhci_device_context_array * @dev_context_ptr array of 64-bit DMA addresses for device contexts @@ -699,7 +698,6 @@ struct xhci_device_context_array { * might not be able to handle the maximum number of devices possible. */ - struct xhci_transfer_event { /* 64-bit buffer address, or immediate data */ __le64 buffer; @@ -835,7 +833,6 @@ struct xhci_event_cmd { #define TRB_TO_STREAM_ID(p) ((((p) & (0xffff << 16)) >> 16)) #define STREAM_ID_FOR_TRB(p) ((((p)) & 0xffff) << 16) - /* Port Status Change Event TRB fields */ /* Port ID - bits 31:24 */ #define GET_PORT_ID(p) (((p) & (0xff << 24)) >> 24) @@ -1134,7 +1131,6 @@ int xhci_hcd_init(int index, struct xhci_hccr **ret_hccr, struct xhci_hcor **ret_hcor); void xhci_hcd_stop(int index); - /************************************************************* EXTENDED CAPABILITY DEFINITIONS *************************************************************/ diff --git a/include/usb_defs.h b/include/usb_defs.h index ec00161710..28757c8cae 100644 --- a/include/usb_defs.h +++ b/include/usb_defs.h @@ -30,7 +30,6 @@ #define USB_PROT_HID_KEYBOARD 1 #define USB_PROT_HID_MOUSE 2 - /* Sub STORAGE Classes */ #define US_SC_RBC 1 /* Typically, flash devices */ #define US_SC_8020 2 /* CD-ROM */ @@ -190,7 +189,6 @@ #define USB_TEST_MODE_PACKET 0x04 #define USB_TEST_MODE_FORCE_ENABLE 0x05 - /* * "pipe" definitions, use unsigned so we can compare reliably, since this * value is shifted up to bits 30/31. @@ -225,7 +223,6 @@ #define USB_ST_BIT_ERR 0x40 /* Bitstuff error */ #define USB_ST_NOT_PROC 0x80000000L /* Not yet processed */ - /************************************************************************* * Hub defines */ diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h index 641b4a3e6f..db1d6ef791 100644 --- a/include/usbdescriptors.h +++ b/include/usbdescriptors.h @@ -58,7 +58,6 @@ * */ - #ifndef __USBDESCRIPTORS_H__ #define __USBDESCRIPTORS_H__ @@ -111,7 +110,6 @@ /* c.f. CDC 4.7 Table 19 */ #define DATA_INTERFACE_PROTOCOL_NONE 0x00 /* No class protcol required */ - /* c.f. CDC 5.2.3 Table 24 */ #define CS_INTERFACE 0x24 #define CS_ENDPOINT 0x25 @@ -168,7 +166,6 @@ #define BULK 0x02 #define INTERRUPT 0x03 - /* configuration modifiers */ #define BMATTRIBUTE_RESERVED 0x80 @@ -239,7 +236,6 @@ struct usb_generic_descriptor { u8 bDescriptorSubtype; } __attribute__ ((packed)); - /* * communications class descriptor structures * @@ -319,7 +315,6 @@ struct usb_class_country_selection_descriptor { u16 wCountryCode0[0]; } __attribute__ ((packed)); - struct usb_class_telephone_operational_descriptor { u8 bFunctionLength; u8 bDescriptorType; @@ -327,7 +322,6 @@ struct usb_class_telephone_operational_descriptor { u8 bmCapabilities; } __attribute__ ((packed)); - struct usb_class_usb_terminal_descriptor { u8 bFunctionLength; u8 bDescriptorType; @@ -405,7 +399,6 @@ struct usb_class_atm_networking_descriptor { u16 wMaxVC; } __attribute__ ((packed)); - struct usb_class_mdlm_descriptor { u8 bFunctionLength; u8 bDescriptorType; diff --git a/include/usbdevice.h b/include/usbdevice.h index e59f5587ee..d173c1c4e3 100644 --- a/include/usbdevice.h +++ b/include/usbdevice.h @@ -19,10 +19,8 @@ #include "usbdescriptors.h" - #define MAX_URBS_QUEUED 5 - #if 1 #define usberr(fmt,args...) serial_printf("ERROR: %s(), %d: "fmt"\n",__FUNCTION__,__LINE__,##args) #else @@ -269,14 +267,12 @@ struct usb_bus_instance; #define USB_REQ_SET_IDLE 0x0A #define USB_REQ_SET_PROTOCOL 0x0B - /* * USB Spec Release number */ #define USB_BCD_VERSION 0x0110 - /* * Device Requests (c.f Table 9-2) */ @@ -328,7 +324,6 @@ struct usb_bus_instance; #define USB_DEVICE_REMOTE_WAKEUP 0x01 #define USB_TEST_MODE 0x02 - /* USB Requests * */ @@ -341,7 +336,6 @@ struct usb_device_request { u16 wLength; } __attribute__ ((packed)); - /* USB Status * */ @@ -425,7 +419,6 @@ typedef enum usb_device_event { } usb_device_event_t; - typedef struct urb_link { struct urb_link *next; struct urb_link *prev; @@ -519,7 +512,6 @@ struct usb_configuration_instance { struct usb_interface_instance *interface_instance_array; }; - /* USB Device Instance * * For each physical bus interface we create a logical device structure. This diff --git a/include/valgrind/memcheck.h b/include/valgrind/memcheck.h index 501cb14ed8..4e5127a1a2 100644 --- a/include/valgrind/memcheck.h +++ b/include/valgrind/memcheck.h @@ -9,7 +9,6 @@ #ifndef __MEMCHECK_H #define __MEMCHECK_H - /* This file is for inclusion into client (your!) code. You can use these macros to manipulate and query memory permissions @@ -53,8 +52,6 @@ typedef = VG_USERREQ_TOOL_BASE('M','C') + 256 } Vg_MemCheckClientRequest; - - /* Client-code macros to manipulate the state of memory. */ /* Mark memory at _qzz_addr as unaddressable for _qzz_len bytes. */ @@ -102,7 +99,6 @@ typedef VG_USERREQ__DISCARD, \ 0, (_qzz_blkindex), 0, 0, 0) - /* Client-code macros to check the state of memory. */ /* Check that memory at _qzz_addr is addressable for _qzz_len bytes. @@ -133,7 +129,6 @@ typedef (volatile unsigned char *)&(__lvalue), \ (unsigned long)(sizeof (__lvalue))) - /* Do a full memory leak check (like --leak-check=full) mid-execution. */ #define VALGRIND_DO_LEAK_CHECK \ VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \ @@ -202,7 +197,6 @@ typedef suppressed = _qzz_suppressed; \ } - /* Get the validity data for addresses [zza..zza+zznbytes-1] and copy it into the provided zzvbits array. Return values: 0 if not running on valgrind diff --git a/include/valgrind/valgrind.h b/include/valgrind/valgrind.h index 5d4fa5f43b..6114c4a0e1 100644 --- a/include/valgrind/valgrind.h +++ b/include/valgrind/valgrind.h @@ -24,7 +24,6 @@ #ifndef __VALGRIND_H #define __VALGRIND_H - /* ------------------------------------------------------------------ */ /* VERSION NUMBER OF VALGRIND */ /* ------------------------------------------------------------------ */ @@ -42,7 +41,6 @@ #define __VALGRIND_MAJOR__ 3 #define __VALGRIND_MINOR__ 16 - #include <stdarg.h> /* Nb: this file might be included in a file compiled with -ansi. So @@ -77,7 +75,6 @@ #undef PLAT_x86_solaris #undef PLAT_amd64_solaris - #if defined(__APPLE__) && defined(__i386__) # define PLAT_x86_darwin 1 #elif defined(__APPLE__) && defined(__x86_64__) @@ -126,7 +123,6 @@ # endif #endif - /* ------------------------------------------------------------------ */ /* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS. There is nothing */ /* in here of use to end-users -- skip to the next section. */ @@ -928,7 +924,6 @@ typedef ); \ } while (0) - #endif /* PLAT_mips32_linux */ /* ------------------------- mips64-linux ---------------- */ @@ -1073,7 +1068,6 @@ typedef #endif /* CONFIG_VALGRIND */ - /* ------------------------------------------------------------------ */ /* PLATFORM SPECIFICS for FUNCTION WRAPPING. This is all very */ /* ugly. It's the least-worst tradeoff I can think of. */ @@ -5168,7 +5162,6 @@ typedef lval = (__typeof__(lval)) _res; \ } while (0) - #endif /* PLAT_s390x_linux */ /* ------------------------- mips32-linux ----------------------- */ @@ -6197,7 +6190,6 @@ typedef lval = (__typeof__(lval)) (long)_res; \ } while (0) - #define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3) \ do { \ volatile OrigFn _orig = (orig); \ @@ -6657,7 +6649,6 @@ typedef # define __extension__ /* */ #endif - /* Returns the number of Valgrinds this code is running under. That is, 0 if running natively, 1 if running under Valgrind, 2 if running under Valgrind which is running under another Valgrind, @@ -6667,7 +6658,6 @@ typedef VG_USERREQ__RUNNING_ON_VALGRIND, \ 0, 0, 0, 0, 0) \ - /* Discard translation of code in the range [_qzz_addr .. _qzz_addr + _qzz_len - 1]. Useful if you are debugging a JITter or some such, since it provides a way to make sure valgrind will retranslate the @@ -6680,7 +6670,6 @@ typedef VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__INNER_THREADS, \ _qzz_addr, 0, 0, 0, 0) - /* These requests are for getting Valgrind itself to print something. Possibly with a backtrace. This is a really ugly hack. The return value is the number of characters printed, excluding the "**<pid>** " part at the @@ -6766,7 +6755,6 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) #endif /* CONFIG_VALGRIND */ } - /* These requests allow control to move from the simulated CPU to the real CPU, calling an arbitrary function. @@ -6815,7 +6803,6 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) _qyy_arg1, _qyy_arg2, \ _qyy_arg3, 0) - /* Counts the number of errors that have been recorded by a tool. Nb: the tool must record the errors with VG_(maybe_record_error)() or VG_(unique_error)() for them to be counted. */ @@ -7079,7 +7066,6 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) VALGRIND_DO_CLIENT_REQUEST_EXPR(0, VG_USERREQ__GDB_MONITOR_COMMAND, \ command, 0, 0, 0, 0) - /* Change the value of a dynamic command line option. Note that unknown or not dynamically changeable options will cause a warning message to be output. */ @@ -7087,7 +7073,6 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__CLO_CHANGE, \ option, 0, 0, 0, 0) - #undef PLAT_x86_darwin #undef PLAT_amd64_darwin #undef PLAT_x86_win32 diff --git a/include/xyzModem.h b/include/xyzModem.h index a8911b6bf5..0de8788ca7 100644 --- a/include/xyzModem.h +++ b/include/xyzModem.h @@ -44,7 +44,6 @@ #define xyzModem_close 1 #define xyzModem_abort 2 - #define CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT #define CYGACC_CALL_IF_SET_CONSOLE_COMM(x) @@ -60,8 +59,6 @@ typedef struct { int chan; } connection_info_t; - - int xyzModem_stream_open(connection_info_t *info, int *err); void xyzModem_stream_close(int *err); void xyzModem_stream_terminate(bool method, int (*getc)(void)); diff --git a/include/zfs/spa.h b/include/zfs/spa.h index cd2ddf58e7..df01d4964f 100644 --- a/include/zfs/spa.h +++ b/include/zfs/spa.h @@ -10,7 +10,6 @@ #ifndef ZFS_SPA_HEADER #define ZFS_SPA_HEADER 1 - /* * General-purpose 32-bit and 64-bit bitfield encodings. */ diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h index 72d87452dd..84154377bd 100644 --- a/include/zfs/zfs.h +++ b/include/zfs/zfs.h @@ -10,7 +10,6 @@ #ifndef GRUB_ZFS_HEADER #define GRUB_ZFS_HEADER 1 - /* * On-disk version number. */ diff --git a/include/zfs/zfs_acl.h b/include/zfs/zfs_acl.h index d6cc408d7f..038c68f138 100644 --- a/include/zfs/zfs_acl.h +++ b/include/zfs/zfs_acl.h @@ -38,5 +38,4 @@ typedef struct zfs_znode_acl { uint8_t z_ace_data[ZFS_ACE_SPACE]; /* space for embedded ACEs */ } zfs_znode_acl_t; - #endif /* _SYS_FS_ZFS_ACL_H */ diff --git a/include/zfs_common.h b/include/zfs_common.h index cb83e59e83..8b93d689c9 100644 --- a/include/zfs_common.h +++ b/include/zfs_common.h @@ -27,14 +27,12 @@ #define SECTOR_SIZE 0x200 #define SECTOR_BITS 9 - typedef enum zfs_endian { UNKNOWN_ENDIAN = -2, LITTLE_ENDIAN = -1, BIG_ENDIAN = 0 } zfs_endian_t; - /* Endian macros. */ #define zfs_to_cpu16(x, a) (((a) == BIG_ENDIAN) ? be16_to_cpu(x) \ : le16_to_cpu(x)) @@ -51,7 +49,6 @@ typedef enum zfs_endian { #define cpu_to_zfs64(x, a) (((a) == BIG_ENDIAN) ? cpu_to_be64(x) \ : cpu_to_le64(x)) - enum zfs_errors { ZFS_ERR_NONE = 0, ZFS_ERR_NOT_IMPLEMENTED_YET = -1, @@ -89,9 +86,6 @@ struct zfs_dirhook_info { time_t mtime2; }; - - - struct zfs_filesystem *zfsget_fs(void); int zfs_open(zfs_file_t, const char *filename); uint64_t zfs_read(zfs_file_t, char *buf, uint64_t len); |