Skip to content

Commit

Permalink
[PATCH] uml: fix initcall return values
Browse files Browse the repository at this point in the history
A number of UML initcalls were improperly returning 1.  Also removed any
nearby emacs formatting comments.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Mar 31, 2006
1 parent 9902abd commit f4c57a7
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 85 deletions.
13 changes: 1 addition & 12 deletions arch/um/drivers/daemon_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,7 @@ static struct transport daemon_transport = {
static int register_daemon(void)
{
register_transport(&daemon_transport);
return(1);
return 0;
}

__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:
*/
13 changes: 1 addition & 12 deletions arch/um/drivers/mcast_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,7 @@ static struct transport mcast_transport = {
static int register_mcast(void)
{
register_transport(&mcast_transport);
return(1);
return 0;
}

__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:
*/
13 changes: 1 addition & 12 deletions arch/um/drivers/pcap_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,7 @@ static struct transport pcap_transport = {
static int register_pcap(void)
{
register_transport(&pcap_transport);
return(1);
return 0;
}

__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:
*/
13 changes: 1 addition & 12 deletions arch/um/drivers/slip_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,7 @@ static struct transport slip_transport = {
static int register_slip(void)
{
register_transport(&slip_transport);
return(1);
return 0;
}

__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:
*/
13 changes: 1 addition & 12 deletions arch/um/drivers/slirp_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,7 @@ static struct transport slirp_transport = {
static int register_slirp(void)
{
register_transport(&slirp_transport);
return(1);
return 0;
}

__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:
*/
2 changes: 1 addition & 1 deletion arch/um/drivers/ubd_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ int ubd_driver_init(void){
SA_INTERRUPT, "ubd", ubd_dev);
if(err != 0)
printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
return(err);
return 0;
}

device_initcall(ubd_driver_init);
Expand Down
13 changes: 1 addition & 12 deletions arch/um/os-Linux/drivers/ethertap_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,7 @@ static struct transport ethertap_transport = {
static int register_ethertap(void)
{
register_transport(&ethertap_transport);
return(1);
return 0;
}

__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:
*/
13 changes: 1 addition & 12 deletions arch/um/os-Linux/drivers/tuntap_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,7 @@ static struct transport tuntap_transport = {
static int register_tuntap(void)
{
register_transport(&tuntap_transport);
return(1);
return 0;
}

__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:
*/

0 comments on commit f4c57a7

Please sign in to comment.