Commit f4c57a78 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: fix initcall return values

A number of UML initcalls were improperly returning 1.  Also removed any
nearby emacs formatting comments.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9902abd7
...@@ -95,18 +95,7 @@ static struct transport daemon_transport = { ...@@ -95,18 +95,7 @@ static struct transport daemon_transport = {
static int register_daemon(void) static int register_daemon(void)
{ {
register_transport(&daemon_transport); register_transport(&daemon_transport);
return(1); return 0;
} }
__initcall(register_daemon); __initcall(register_daemon);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
...@@ -124,18 +124,7 @@ static struct transport mcast_transport = { ...@@ -124,18 +124,7 @@ static struct transport mcast_transport = {
static int register_mcast(void) static int register_mcast(void)
{ {
register_transport(&mcast_transport); register_transport(&mcast_transport);
return(1); return 0;
} }
__initcall(register_mcast); __initcall(register_mcast);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
...@@ -106,18 +106,7 @@ static struct transport pcap_transport = { ...@@ -106,18 +106,7 @@ static struct transport pcap_transport = {
static int register_pcap(void) static int register_pcap(void)
{ {
register_transport(&pcap_transport); register_transport(&pcap_transport);
return(1); return 0;
} }
__initcall(register_pcap); __initcall(register_pcap);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
...@@ -93,18 +93,7 @@ static struct transport slip_transport = { ...@@ -93,18 +93,7 @@ static struct transport slip_transport = {
static int register_slip(void) static int register_slip(void)
{ {
register_transport(&slip_transport); register_transport(&slip_transport);
return(1); return 0;
} }
__initcall(register_slip); __initcall(register_slip);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
...@@ -116,18 +116,7 @@ static struct transport slirp_transport = { ...@@ -116,18 +116,7 @@ static struct transport slirp_transport = {
static int register_slirp(void) static int register_slirp(void)
{ {
register_transport(&slirp_transport); register_transport(&slirp_transport);
return(1); return 0;
} }
__initcall(register_slirp); __initcall(register_slirp);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
...@@ -891,7 +891,7 @@ int ubd_driver_init(void){ ...@@ -891,7 +891,7 @@ int ubd_driver_init(void){
SA_INTERRUPT, "ubd", ubd_dev); SA_INTERRUPT, "ubd", ubd_dev);
if(err != 0) if(err != 0)
printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err); printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
return(err); return 0;
} }
device_initcall(ubd_driver_init); device_initcall(ubd_driver_init);
......
...@@ -102,18 +102,7 @@ static struct transport ethertap_transport = { ...@@ -102,18 +102,7 @@ static struct transport ethertap_transport = {
static int register_ethertap(void) static int register_ethertap(void)
{ {
register_transport(&ethertap_transport); register_transport(&ethertap_transport);
return(1); return 0;
} }
__initcall(register_ethertap); __initcall(register_ethertap);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
...@@ -87,18 +87,7 @@ static struct transport tuntap_transport = { ...@@ -87,18 +87,7 @@ static struct transport tuntap_transport = {
static int register_tuntap(void) static int register_tuntap(void)
{ {
register_transport(&tuntap_transport); register_transport(&tuntap_transport);
return(1); return 0;
} }
__initcall(register_tuntap); __initcall(register_tuntap);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment