From patchwork Wed Apr 8 11:20:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 459215 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 5DA101401AD for ; Wed, 8 Apr 2015 21:25:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=dcmOE+Ok; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753852AbbDHLVm (ORCPT ); Wed, 8 Apr 2015 07:21:42 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:36234 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753799AbbDHLVi (ORCPT ); Wed, 8 Apr 2015 07:21:38 -0400 Received: by pdea3 with SMTP id a3so112324148pde.3; Wed, 08 Apr 2015 04:21:37 -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=+g/CC6aSWuSczkOYCq2rduHTPwD7gtJewJ4bsfveO8o=; b=dcmOE+OkpGlowRmJuXg2aGl0HUK495QQC3gTApgxfHMJZ517/GldF5gr2N384HU1Kt 7PF9MQiLl8swlqaUoQKuA5CRpr8RXjjerXeGCTKMUiSimK70BvdgXAjwlBPbOFvyUa8J rqQ400WntsNKCCwmRXQpfXEbEUxTgWza4W7ZZ5RtJcjoq9bcDVP+4WiOonogOqa/tQlo ySyCsgV+DljfhrJyCddS5weKwg3zcQU4mI7GS8hZUwnrALbB1finmL0VJcKcEsAMz1NV rDFTsGrhPCxY+dyvmccfbQ88ABZQUjMQqYoZvR6gFa/rmgmWyFYN/Gxn9ddgYusYKCSV LjYw== X-Received: by 10.70.96.65 with SMTP id dq1mr26935266pdb.79.1428492097212; Wed, 08 Apr 2015 04:21:37 -0700 (PDT) Received: from localhost.localdomain ([122.169.147.27]) by mx.google.com with ESMTPSA id og11sm10973411pdb.91.2015.04.08.04.21.31 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Apr 2015 04:21:36 -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 06/14] spi: butterfly: return proper error values from attach Date: Wed, 8 Apr 2015 16:50:32 +0530 Message-Id: <1428492040-5581-7-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/spi/spi-butterfly.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c index 9a95862..7df16c8 100644 --- a/drivers/spi/spi-butterfly.c +++ b/drivers/spi/spi-butterfly.c @@ -190,7 +190,7 @@ static struct flash_platform_data flash = { /* REVISIT remove this ugly global and its "only one" limitation */ static struct butterfly *butterfly; -static void butterfly_attach(struct parport *p) +static int butterfly_attach(struct parport *p) { struct pardevice *pd; int status; @@ -199,7 +199,7 @@ static void butterfly_attach(struct parport *p) struct device *dev = p->physport->dev; if (butterfly || !dev) - return; + return -ENODEV; /* REVISIT: this just _assumes_ a butterfly is there ... no probe, * and no way to be selective about what it binds to. @@ -287,7 +287,7 @@ static void butterfly_attach(struct parport *p) pr_info("%s: AVR Butterfly\n", p->name); butterfly = pp; - return; + return 0; clean2: /* turn off VCC */ @@ -300,6 +300,7 @@ clean0: (void) spi_master_put(pp->bitbang.master); done: pr_debug("%s: butterfly probe, fail %d\n", p->name, status); + return status; } static void butterfly_detach(struct parport *p)