From patchwork Tue Nov 2 08:33:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 69866 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gy0-f184.google.com (mail-gy0-f184.google.com [209.85.160.184]) by ozlabs.org (Postfix) with ESMTP id 5B98BB6EEE for ; Tue, 2 Nov 2010 19:30:23 +1100 (EST) Received: by gyg4 with SMTP id 4sf10126037gyg.11 for ; Tue, 02 Nov 2010 01:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:received:received:subject:from:to:cc :date:message-id:mime-version:x-mailer:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; bh=tj5GPB9HgC2cdgeqbkA0Yf8hIUMjocPcZFrdd8Mn1Rw=; b=YxCsRTt52qsyv6MDlQDbchubq7XuF2I1LhYLI8d6YQwX8dsWI1/6xy38eZGHaEInx2 wzxsrABLUPan2wuhrkox4V3n/FLVjxyZIBtvk6UpdfSEVTmDcdY8JceXRQ99A/kpQEAq DfXhdiGa70YsBshCsELLfD4gmIUtLmV8/JGSY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:subject:from:to:cc:date:message-id :mime-version:x-mailer:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; b=FKBMXP6yyEYqUO2ePnbU1fRo4cZYHVtu0yWImh6DSDXIYDtXvyHbeRFXgbvwZC8eqm fn6igFrIntBFSqE6uNxoSIL7RVeGf32ocg+p1oBbtayyvVoM0OBAShm/+obYfhUlN2Y+ KlQOWK76MFbGBR7MP234JCJ9S00M+ADBV5S9M= Received: by 10.90.79.20 with SMTP id c20mr98685agb.53.1288686620264; Tue, 02 Nov 2010 01:30:20 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.90.102.16 with SMTP id z16ls1218439agb.4.p; Tue, 02 Nov 2010 01:30:19 -0700 (PDT) Received: by 10.90.114.11 with SMTP id m11mr560967agc.6.1288686619956; Tue, 02 Nov 2010 01:30:19 -0700 (PDT) Received: by 10.90.114.11 with SMTP id m11mr560966agc.6.1288686619945; Tue, 02 Nov 2010 01:30:19 -0700 (PDT) Received: from mail-yx0-f181.google.com (mail-yx0-f181.google.com [209.85.213.181]) by gmr-mx.google.com with ESMTP id 3si1188725ano.2.2010.11.02.01.30.18; Tue, 02 Nov 2010 01:30:18 -0700 (PDT) Received-SPF: pass (google.com: domain of axel.lin@gmail.com designates 209.85.213.181 as permitted sender) client-ip=209.85.213.181; Received: by yxn35 with SMTP id 35so3938252yxn.40 for ; Tue, 02 Nov 2010 01:30:18 -0700 (PDT) Received: by 10.150.92.2 with SMTP id p2mr462395ybb.116.1288686618764; Tue, 02 Nov 2010 01:30:18 -0700 (PDT) Received: from [192.168.100.50] (60-251-136-127.HINET-IP.hinet.net [60.251.136.127]) by mx.google.com with ESMTPS id z5sm6060382yhc.27.2010.11.02.01.30.16 (version=SSLv3 cipher=RC4-MD5); Tue, 02 Nov 2010 01:30:18 -0700 (PDT) Subject: [rtc-linux] [PATCH] rtc: rtc-max6902 - set driver data in max6902_probe() From: Axel Lin To: linux-kernel Cc: Alessandro Zummo , rtc-linux@googlegroups.com, Andrew Morton Date: Tue, 02 Nov 2010 16:33:27 +0800 Message-Id: <1288686807.19912.2.camel@mola> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-Original-Sender: axel.lin@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of axel.lin@gmail.com designates 209.85.213.181 as permitted sender) smtp.mail=axel.lin@gmail.com; dkim=pass (test mode) header.i=@gmail.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Current implementation does not set driver data in max6902_probe(), thus calling platform_get_drvdata(spi) in max6902_remove() returns NULL. Since this is a spi driver, use spi_set_drvdata/spi_get_drvdata to set/get driver data. Signed-off-by: Axel Lin --- drivers/rtc/rtc-max6902.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c index 657403e..23faecb 100644 --- a/drivers/rtc/rtc-max6902.c +++ b/drivers/rtc/rtc-max6902.c @@ -138,15 +138,17 @@ static int __devinit max6902_probe(struct spi_device *spi) &spi->dev, &max6902_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); + spi_set_drvdata(spi, rtc); return 0; } static int __devexit max6902_remove(struct spi_device *spi) { - struct rtc_device *rtc = platform_get_drvdata(spi); + struct rtc_device *rtc = spi_get_drvdata(spi); rtc_device_unregister(rtc); + spi_set_drvdata(spi, NULL); return 0; }