From patchwork Tue Oct 17 00:28:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 826601 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RILNyj6J"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGGRW4KlHz9sxR for ; Tue, 17 Oct 2017 11:34:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757965AbdJQAeR (ORCPT ); Mon, 16 Oct 2017 20:34:17 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:51505 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933236AbdJQAaJ (ORCPT ); Mon, 16 Oct 2017 20:30:09 -0400 Received: by mail-pg0-f51.google.com with SMTP id p9so40701pgc.8 for ; Mon, 16 Oct 2017 17:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GRaACps0Mc3D/LLzIz5KSl9xVOGSLps4zCBJTcrE6x8=; b=RILNyj6J6RVQEhjrOQCp4dvKlEwL2oGyHC4hbzC3+78pahLbBzMKvpH/FK4FpeLvPr nUeyuAO16uNyk0BlqA9pccDMC9hJ8u+8EYJ2DNj0aOSsrH+3uG4cDwBEduWOgl4UpLJ1 G0ctLGlVMkQh5DZC/1zbZGbFNwPSrROK5OkaU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GRaACps0Mc3D/LLzIz5KSl9xVOGSLps4zCBJTcrE6x8=; b=MDZ9UfE1kasCazzbJ7D1binuJpyVqmQ7pheUWUxT+kmKy1AsNf3yO5K54r8y/hcvAp EDBU5aMQLJkX1kg5R9k8QexuVdRlrpzTxTSzjzg3qu4LFO2qf5rAAv9w1HDD4SbJBDlo gpnz3HXHF28llgfd3FydRhDlaZv/L/z5Mse76WTl0+Gqp21c9TvdHfgQhAhyTTFkvwDm qPCCbvp8Ube6xJBICwFOuW7OWmtUpdirtRCr3AttPgFql2ALQQt65IT6rP+gsLbc0wx7 DfpSL/CHwGtOFPvcsfoOU+7T//yv+aqVSebWWKeEWrRzkT/lOsOJPgdjkKAk8tOn2LVa ckaQ== X-Gm-Message-State: AMCzsaVo4rcxdQcejx82DRBwkj5tNJEakoUfRf9cHMP5BrFta2/HQbjH JXtc56XjZVDvD8ZYHuPyctpBig== X-Google-Smtp-Source: ABhQp+SV0kihhwM3UCRpwQ2YSOpj8vehIJgZEyt+OgKZfSavXPaRmEGulucktVUDfr74iYl1ZHgrOQ== X-Received: by 10.99.104.73 with SMTP id d70mr5246856pgc.58.1508200208986; Mon, 16 Oct 2017 17:30:08 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id 19sm16482284pfj.154.2017.10.16.17.29.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:30:04 -0700 (PDT) From: Kees Cook To: "David S. Miller" Cc: Kees Cook , Michael Ellerman , linux-pcmcia@lists.infradead.org, netdev@vger.kernel.org, Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH 15/58] pcmcia/electra_cf: Convert timers to use timer_setup() Date: Mon, 16 Oct 2017 17:28:59 -0700 Message-Id: <1508200182-104605-16-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org> References: <1508200182-104605-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Michael Ellerman Cc: linux-pcmcia@lists.infradead.org Signed-off-by: Kees Cook --- drivers/pcmcia/electra_cf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index c6fe2a4a7a6a..9671ded549f0 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c @@ -79,9 +79,9 @@ static int electra_cf_ss_init(struct pcmcia_socket *s) } /* the timer is primarily to kick this socket's pccardd */ -static void electra_cf_timer(unsigned long _cf) +static void electra_cf_timer(struct timer_list *t) { - struct electra_cf_socket *cf = (void *) _cf; + struct electra_cf_socket *cf = from_timer(cf, t, timer); int present = electra_cf_present(cf); if (present != cf->present) { @@ -95,7 +95,9 @@ static void electra_cf_timer(unsigned long _cf) static irqreturn_t electra_cf_irq(int irq, void *_cf) { - electra_cf_timer((unsigned long)_cf); + struct electra_cf_socket *cf = _cf; + + electra_cf_timer(&cf->timer); return IRQ_HANDLED; } @@ -206,7 +208,7 @@ static int electra_cf_probe(struct platform_device *ofdev) if (!cf) return -ENOMEM; - setup_timer(&cf->timer, electra_cf_timer, (unsigned long)cf); + timer_setup(&cf->timer, electra_cf_timer, 0); cf->irq = 0; cf->ofdev = ofdev; @@ -305,7 +307,7 @@ static int electra_cf_probe(struct platform_device *ofdev) cf->mem_phys, io.start, cf->irq); cf->active = 1; - electra_cf_timer((unsigned long)cf); + electra_cf_timer(&cf->timer); return 0; fail3: