From: Marek Vasut Date: Sat, 13 Jul 2024 13:19:18 +0000 (+0200) Subject: disk: Remove duplicate newlines X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20.Permalink%20%7D%7D?a=commitdiff_plain;h=e794b99c0d18274b0cc72d4673485cd53a7b2c91;p=u-boot.git disk: Remove duplicate newlines Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- diff --git a/disk/part_amiga.c b/disk/part_amiga.c index 9b0f2fe749..5b8ae5762d 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -304,7 +304,6 @@ static int part_get_info_amiga(struct blk_desc *desc, int part, info->blksz = rdb.block_bytes; bcpl_strcpy((char *)info->name, p->drive_name); - disk_type = g->dos_type; info->type[0] = (disk_type & 0xFF000000)>>24; diff --git a/disk/part_amiga.h b/disk/part_amiga.h index dfa70bdb8a..3c27bfe8fd 100644 --- a/disk/part_amiga.h +++ b/disk/part_amiga.h @@ -16,7 +16,6 @@ #define DEFAULT_SECTOR_SIZE 512 #endif - #define AMIGA_BLOCK_LIMIT 16 /* @@ -102,7 +101,6 @@ struct bootcode_block u32 load_data[123]; }; - #define AMIGA_ID_RDISK 0x5244534B #define AMIGA_ID_PART 0x50415254 #define AMIGA_ID_BOOT 0x424f4f54 diff --git a/disk/part_dos.c b/disk/part_dos.c index e6b5295e0e..09af2aeeb9 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -197,7 +197,6 @@ static void print_partition_extended(struct blk_desc *desc, return; } - /* Print a partition that is relative to its Extended partition table */ static int part_get_info_extended(struct blk_desc *desc, diff --git a/disk/part_iso.h b/disk/part_iso.h index eb2c3ab66f..6973a2943e 100644 --- a/disk/part_iso.h +++ b/disk/part_iso.h @@ -9,7 +9,6 @@ #define BRVD 0x11 #define PVD_OFFSET 0x10 - typedef struct iso_boot_rec { unsigned char desctype; /* type of Volume descriptor: 0 = boot record, 1 = primary, 2 = Supplement, 3 = volume part 0xff trminator */ unsigned char stand_ident[5]; /* "CD001" */ @@ -19,7 +18,6 @@ typedef struct iso_boot_rec { unsigned char pointer[4]; /* absolute pointer to Boot Catalog */ } iso_boot_rec_t; - typedef struct iso_pri_rec { unsigned char desctype; /* type of Volume descriptor: 0 = boot record, 1 = primary, 2 = Supplement, 3 = volume part 0xff trminator */ unsigned char stand_ident[5]; /* "CD001" */ @@ -109,7 +107,6 @@ typedef struct iso_part_rec { unsigned int partsiz_BE; /* volume partition size BE */ }iso_part_rec_t; - typedef struct iso_val_entry { unsigned char header_id; /* Header ID must be 0x01 */ unsigned char platform; /* Platform: 0=x86, 1=PowerPC, 2=MAC */ @@ -126,7 +123,6 @@ typedef struct iso_header_entry { char id_str[0x1C]; /* Ident String of sectionr */ } iso_header_entry_t; - typedef struct iso_init_def_entry { unsigned char boot_ind; /* Boot indicator 0x88=bootable 0=not bootable */ unsigned char boot_media; /* boot Media Type: 0=no Emulation, 1=1.2MB floppy, 2=1.44MB floppy, 3=2.88MB floppy 4=hd (0x80) */ @@ -137,7 +133,6 @@ typedef struct iso_init_def_entry { unsigned char rel_block_addr[4]; /* relative Block address */ } iso_init_def_entry_t; - void print_partition_cd(int dev); #endif /* _PART_CD_H */ diff --git a/disk/part_mac.c b/disk/part_mac.c index 81a65823be..21c85942fd 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -29,7 +29,6 @@ extern ldiv_t ldiv (long int __numer, long int __denom); # define __ldiv_t_defined 1 #endif - static int part_mac_read_ddb(struct blk_desc *desc, mac_driver_desc_t *ddb_p); static int part_mac_read_pdb(struct blk_desc *desc, int part, mac_partition_t *pdb_p); @@ -90,7 +89,6 @@ static void part_print_mac(struct blk_desc *desc) gb.rem += 512; gb.rem /= 1024; - printf ("Block Size=%d, Number of Blocks=%d, " "Total Capacity: %ld.%ld MB = %ld.%ld GB\n" "DeviceType=0x%x, DeviceId=0x%x\n\n" @@ -148,7 +146,6 @@ static void part_print_mac(struct blk_desc *desc) return; } - /* * Read Device Descriptor Block */ diff --git a/disk/part_mac.h b/disk/part_mac.h index 5f396c9408..b2ee086bb6 100644 --- a/disk/part_mac.h +++ b/disk/part_mac.h @@ -43,7 +43,6 @@ typedef struct mac_driver_entry { __u16 type; /* OS Type */ } mac_driver_entry_t; - #define MAC_PARTITION_MAGIC 0x504d /* type field value for A/UX or other Unix partitions */