[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/12] pc-bios/s390-ccw: Add a proper prototype for main()
From: |
Thomas Huth |
Subject: |
[PATCH v2 01/12] pc-bios/s390-ccw: Add a proper prototype for main() |
Date: |
Mon, 4 Jul 2022 13:18:52 +0200 |
Older versions of Clang complain if there is no prototype for main().
Add one, and while we're at it, make sure that we use the same type
for main.c and netmain.c - since the return value does not matter,
declare the return type of main() as "void".
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/s390-ccw.h | 1 +
pc-bios/s390-ccw/main.c | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 79db69ff54..b88e0550ab 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -57,6 +57,7 @@ void write_subsystem_identification(void);
void write_iplb_location(void);
extern char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
unsigned int get_loadparm_index(void);
+void main(void);
/* sclp.c */
void sclp_print(const char *string);
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 5d2b7ba94d..835341457d 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -281,7 +281,7 @@ static void probe_boot_device(void)
sclp_print("Could not find a suitable boot device (none specified)\n");
}
-int main(void)
+void main(void)
{
sclp_setup();
css_setup();
@@ -294,5 +294,4 @@ int main(void)
}
panic("Failed to load OS from hard disk\n");
- return 0; /* make compiler happy */
}
--
2.31.1
- [PATCH v2 00/12] s390-ccw bios fixes and clean-ups, Thomas Huth, 2022/07/04
- [PATCH v2 03/12] pc-bios/s390-ccw/bootmap: Improve the guessing logic in zipl_load_vblk(), Thomas Huth, 2022/07/04
- [PATCH v2 01/12] pc-bios/s390-ccw: Add a proper prototype for main(),
Thomas Huth <=
- [PATCH v2 02/12] pc-bios/s390-ccw/virtio: Introduce a macro for the DASD block size, Thomas Huth, 2022/07/04
- [PATCH v2 04/12] pc-bios/s390-ccw/virtio-blkdev: Simplify/fix virtio_ipl_disk_is_valid(), Thomas Huth, 2022/07/04
- [PATCH v2 05/12] pc-bios/s390-ccw/virtio-blkdev: Remove virtio_assume_scsi(), Thomas Huth, 2022/07/04
- [PATCH v2 07/12] pc-bios/s390-ccw/virtio: Read device config after feature negotiation, Thomas Huth, 2022/07/04
- [PATCH v2 06/12] pc-bios/s390-ccw/virtio: Set missing status bits while initializing, Thomas Huth, 2022/07/04
- [PATCH v2 08/12] pc-bios/s390-ccw/virtio: Beautify the code for reading virtqueue configuration, Thomas Huth, 2022/07/04
- [PATCH v2 10/12] pc-bios/s390-ccw/virtio-blkdev: Request the right feature bits, Thomas Huth, 2022/07/04
- [PATCH v2 09/12] pc-bios/s390-ccw: Split virtio-scsi code from virtio_blk_setup_device(), Thomas Huth, 2022/07/04
- [PATCH v2 11/12] pc-bios/s390-ccw/virtio: Remove "extern" keyword from prototypes, Thomas Huth, 2022/07/04