From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> To: Arnd Bergmann <arnd@arndb.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jean Delvare <jdelvare@suse.de>, Wolfram Sang <wsa@the-dreams.de>, Rodolfo Giometti <giometti@enneenne.com>, "James E.J. Bottomley" <JBottomley@parallels.com>, Mark Brown <broonie@kernel.org>, Willy Tarreau <willy@meta-x.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de> Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, netdev@vger.kernel.org, linux-scsi@vger.kernel.org, linux-spi@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, Sudip Mukherjee <sudipm.mukherjee@gmail.com> Subject: [PATCH 11/14] net: plip: return proper error values from attach Date: Wed, 8 Apr 2015 16:50:37 +0530 [thread overview] Message-ID: <1428492040-5581-12-git-send-email-sudipm.mukherjee@gmail.com> (raw) In-Reply-To: <1428492040-5581-1-git-send-email-sudipm.mukherjee@gmail.com> now that we are monitoring the return value from attach, make the required changes to return proper value from its attach function. also return the proper error code in module_init. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- drivers/net/plip/plip.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c index 040b897..6706bc3 100644 --- a/drivers/net/plip/plip.c +++ b/drivers/net/plip/plip.c @@ -1243,7 +1243,7 @@ plip_searchfor(int list[], int a) /* plip_attach() is called (by the parport code) when a port is * available to use. */ -static void plip_attach (struct parport *port) +static int plip_attach(struct parport *port) { static int unit; struct net_device *dev; @@ -1254,13 +1254,13 @@ static void plip_attach (struct parport *port) plip_searchfor(parport, port->number)) { if (unit == PLIP_MAX) { printk(KERN_ERR "plip: too many devices\n"); - return; + return -EINVAL; } sprintf(name, "plip%d", unit); dev = alloc_etherdev(sizeof(struct net_local)); if (!dev) - return; + return -ENOMEM; strcpy(dev->name, name); @@ -1300,12 +1300,13 @@ static void plip_attach (struct parport *port) dev->name, dev->base_addr); dev_plip[unit++] = dev; } - return; + return 0; err_parport_unregister: parport_unregister_device(nl->pardev); err_free_dev: free_netdev(dev); + return -ENODEV; } /* plip_detach() is called (by the parport code) when a port is @@ -1379,6 +1380,8 @@ __setup("plip=", plip_setup); static int __init plip_init (void) { + int err; + if (parport[0] == -2) return 0; @@ -1387,9 +1390,10 @@ static int __init plip_init (void) timid = 0; } - if (parport_register_driver (&plip_driver)) { + err = parport_register_driver(&plip_driver); + if (err) { printk (KERN_WARNING "plip: couldn't register driver\n"); - return 1; + return err; } return 0; -- 1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> To: Arnd Bergmann <arnd@arndb.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jean Delvare <jdelvare@suse.de>, Wolfram Sang <wsa@the-dreams.de>, Rodolfo Giometti <giometti@enneenne.com>, "James E.J. Bottomley" <JBottomley@parallels.com>, Mark Brown <broonie@kernel.org>, Willy Tarreau <willy@meta-x.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de> Cc: devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, linux-scsi@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-i2c@vger.kernel.org, Sudip Mukherjee <sudipm.mukherjee@gmail.com> Subject: [PATCH 11/14] net: plip: return proper error values from attach Date: Wed, 8 Apr 2015 16:50:37 +0530 [thread overview] Message-ID: <1428492040-5581-12-git-send-email-sudipm.mukherjee@gmail.com> (raw) In-Reply-To: <1428492040-5581-1-git-send-email-sudipm.mukherjee@gmail.com> now that we are monitoring the return value from attach, make the required changes to return proper value from its attach function. also return the proper error code in module_init. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- drivers/net/plip/plip.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c index 040b897..6706bc3 100644 --- a/drivers/net/plip/plip.c +++ b/drivers/net/plip/plip.c @@ -1243,7 +1243,7 @@ plip_searchfor(int list[], int a) /* plip_attach() is called (by the parport code) when a port is * available to use. */ -static void plip_attach (struct parport *port) +static int plip_attach(struct parport *port) { static int unit; struct net_device *dev; @@ -1254,13 +1254,13 @@ static void plip_attach (struct parport *port) plip_searchfor(parport, port->number)) { if (unit == PLIP_MAX) { printk(KERN_ERR "plip: too many devices\n"); - return; + return -EINVAL; } sprintf(name, "plip%d", unit); dev = alloc_etherdev(sizeof(struct net_local)); if (!dev) - return; + return -ENOMEM; strcpy(dev->name, name); @@ -1300,12 +1300,13 @@ static void plip_attach (struct parport *port) dev->name, dev->base_addr); dev_plip[unit++] = dev; } - return; + return 0; err_parport_unregister: parport_unregister_device(nl->pardev); err_free_dev: free_netdev(dev); + return -ENODEV; } /* plip_detach() is called (by the parport code) when a port is @@ -1379,6 +1380,8 @@ __setup("plip=", plip_setup); static int __init plip_init (void) { + int err; + if (parport[0] == -2) return 0; @@ -1387,9 +1390,10 @@ static int __init plip_init (void) timid = 0; } - if (parport_register_driver (&plip_driver)) { + err = parport_register_driver(&plip_driver); + if (err) { printk (KERN_WARNING "plip: couldn't register driver\n"); - return 1; + return err; } return 0; -- 1.8.1.2
next prev parent reply other threads:[~2015-04-08 11:22 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-08 11:20 [PATCH 00/14] parport: check success of attach call Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 01/14] parport: return value of attach and parport_register_driver Sudip Mukherjee 2015-04-08 11:38 ` Dan Carpenter 2015-04-08 11:38 ` Dan Carpenter 2015-04-08 11:44 ` Dan Carpenter 2015-04-08 11:44 ` Dan Carpenter 2015-04-08 12:14 ` Sudip Mukherjee 2015-04-08 12:14 ` Sudip Mukherjee 2015-04-08 11:50 ` Sudip Mukherjee 2015-04-08 11:50 ` Sudip Mukherjee 2015-04-08 12:27 ` Dan Carpenter 2015-04-08 12:27 ` Dan Carpenter 2015-04-08 17:56 ` Willy Tarreau 2015-04-08 17:56 ` Willy Tarreau 2015-04-08 11:20 ` [PATCH 02/14] ALSA: portman2x4: return proper error values from attach Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 13:32 ` Sergei Shtylyov 2015-04-08 13:32 ` Sergei Shtylyov 2015-04-08 13:40 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 03/14] ALSA: mts64: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 04/14] staging: panel: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 05/14] spi: lm70llp: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 06/14] spi: butterfly: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 07/14] [SCSI] ppa: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 08/14] [SCSI] imm: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 09/14] pps: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 10/14] " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee [this message] 2015-04-08 11:20 ` [PATCH 11/14] net: plip: " Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 12/14] i2c-parport: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee 2015-04-09 7:13 ` Wolfram Sang 2015-04-09 7:13 ` Wolfram Sang 2015-04-09 9:33 ` Jean Delvare 2015-04-09 10:25 ` Wolfram Sang 2015-04-09 10:25 ` Wolfram Sang 2015-04-10 5:05 ` Sudip Mukherjee 2015-04-10 5:05 ` Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 13/14] ppdev: " Sudip Mukherjee 2015-04-08 11:20 ` [PATCH 14/14] char: lp: " Sudip Mukherjee 2015-04-08 11:20 ` Sudip Mukherjee
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1428492040-5581-12-git-send-email-sudipm.mukherjee@gmail.com \ --to=sudipm.mukherjee@gmail.com \ --cc=JBottomley@parallels.com \ --cc=alsa-devel@alsa-project.org \ --cc=arnd@arndb.de \ --cc=broonie@kernel.org \ --cc=devel@driverdev.osuosl.org \ --cc=giometti@enneenne.com \ --cc=gregkh@linuxfoundation.org \ --cc=jdelvare@suse.de \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.de \ --cc=willy@meta-x.org \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.