| Message ID | 20220628131032.213986-2-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390-ccw bios fixes and clean-ups | expand |
On Tue, 2022-06-28 at 15:10 +0200, Thomas Huth wrote: > 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> > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Eric Farman <farman@linux.ibm.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 */ > }
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 */ }