From patchwork Wed Apr 8 11:20:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 459211 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 862D41401AD for ; Wed, 8 Apr 2015 21:23:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=MVdt6S0B; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754151AbbDHLXx (ORCPT ); Wed, 8 Apr 2015 07:23:53 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:33920 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753961AbbDHLV5 (ORCPT ); Wed, 8 Apr 2015 07:21:57 -0400 Received: by pdbqa5 with SMTP id qa5so55214385pdb.1; Wed, 08 Apr 2015 04:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Jb30VWOwnVwMtt5QGIIuW3FTfnLPocQZ/KL2UYIj8LA=; b=MVdt6S0BwS2l/rDw87VwNf3U2MXa/FkwIZkl9CLwcQhVlVgkITPZOYRag6EfQBSnIg LEXB9OgwSb9ssYyoZ4SVNBcnoUMHC4PnDS/LaQqDyJ9HrzCepozB1ClEK/NHMVZbA5tJ NHXhIqm/dGzHrCLLApQJIcadXmEzIenMkk/t3jhHxY2RW/nwfJPDd+uwHIKLDyPF6TmH 2xxq89XFa154cvUp7KxaOLFLNR0VZWg9RqJ4KmHlrEsKYi051Q3dVOIzIPD4MlbfaDN0 YMumfnbyWgVENtVbmHO3RnNjcTsRQk230nADBzkpq/bFcedhd0Xt8RvLBlIKPAA05rEC /GJw== X-Received: by 10.68.222.131 with SMTP id qm3mr45225555pbc.55.1428492116134; Wed, 08 Apr 2015 04:21:56 -0700 (PDT) Received: from localhost.localdomain ([122.169.147.27]) by mx.google.com with ESMTPSA id og11sm10973411pdb.91.2015.04.08.04.21.50 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Apr 2015 04:21:55 -0700 (PDT) From: Sudip Mukherjee To: Arnd Bergmann , Greg Kroah-Hartman , Jean Delvare , Wolfram Sang , Rodolfo Giometti , "James E.J. Bottomley" , Mark Brown , Willy Tarreau , Jaroslav Kysela , Takashi Iwai 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 Subject: [PATCH 09/14] pps: return proper error values from attach Date: Wed, 8 Apr 2015 16:50:35 +0530 Message-Id: <1428492040-5581-10-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1428492040-5581-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1428492040-5581-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org now that we are monitoring the return value from attach, make the required changes to return proper value from its attach function. Signed-off-by: Sudip Mukherjee --- drivers/pps/generators/pps_gen_parport.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/pps/generators/pps_gen_parport.c b/drivers/pps/generators/pps_gen_parport.c index dcd39fb..499f410 100644 --- a/drivers/pps/generators/pps_gen_parport.c +++ b/drivers/pps/generators/pps_gen_parport.c @@ -190,18 +190,18 @@ static inline ktime_t next_intr_time(struct pps_generator_pp *dev) dev->port_write_time + 3 * SAFETY_INTERVAL)); } -static void parport_attach(struct parport *port) +static int parport_attach(struct parport *port) { if (attached) { /* we already have a port */ - return; + return -EALREADY; } device.pardev = parport_register_device(port, KBUILD_MODNAME, NULL, NULL, NULL, PARPORT_FLAG_EXCL, &device); if (!device.pardev) { pr_err("couldn't register with %s\n", port->name); - return; + return -ENODEV; } if (parport_claim_or_block(device.pardev) < 0) { @@ -218,10 +218,11 @@ static void parport_attach(struct parport *port) device.timer.function = hrtimer_event; hrtimer_start(&device.timer, next_intr_time(&device), HRTIMER_MODE_ABS); - return; + return 0; err_unregister_dev: parport_unregister_device(device.pardev); + return -ENODEV; } static void parport_detach(struct parport *port)