From patchwork Sat Mar 11 00:46:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 737618 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 3vg57d1qv4z9s7m for ; Sat, 11 Mar 2017 11:47:25 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pTeckjJ0"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933608AbdCKArY (ORCPT ); Fri, 10 Mar 2017 19:47:24 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34138 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933434AbdCKArP (ORCPT ); Fri, 10 Mar 2017 19:47:15 -0500 Received: by mail-pf0-f193.google.com with SMTP id o126so12411132pfb.1; Fri, 10 Mar 2017 16:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ukM2VZkgCJW8VRNLUieT/qQSJlyivCX8g8WcnnOcwa4=; b=pTeckjJ0O+NNfSSQxD3ITN7HOsQw19JviVA8nV79YGEa2AI7DO6s2OBGY2k7PaE7m4 YTxqc7g1cyGmN6o2q6viY9dhHJv8IuFBkQCKfoWMw3+jQhgaEN0ZTEyspxSrhlrf97Qv fV/WmsYgBwYhyogqVeVftcrrBeSLqZecHKwT6dltCK+AnKr5UTD2oZvE8gZQgdDsVHfX o3AK5g8f/kaOPxUP2ghfj+idOhFlvv8XqF9D9Y2XGIl9B+s4fAUCFiLuUC+UPXqREpxb hK/ge5dICmbBhIJtD6poYHexc0SzwDZxnoUM6Yecj20P7Ljm4G53SHSxXrGZqB13jc4X mhaw== 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=ukM2VZkgCJW8VRNLUieT/qQSJlyivCX8g8WcnnOcwa4=; b=WyGopJigzVnJktSHOGBZiLp9x5QFacbtEOigX1rR5rDcQWyi/XJ/lY23rNhQ0H8jkb etj3zHx702YAq8G0Kyk7fy1KWy5nJVZtKdmWCxhSE08Jft/3nGYmElb3G13EqnCTn3CP apfM/k4cZ3fGpknZJuFoUJ+pnqqEOBSXrAsU3TpvUKI9CYBISn6DpuYVovEp7HTSlDOn +af0mkyKCp6zNlQIcrpujOG5Oe+gGx48bt6daq/pUrQpaybb347L7U1q9v8M9iFAsDmT fBLk793IsgGSNvb0uyCElM5BvpVG7pIuX77KsIt+TWTRUX3igbk8jNryHsZLaTl3K0bN hdlw== X-Gm-Message-State: AMke39mnIIP0+t749sjwEhfpTOtsZnvth7bLC0pxQ6d/1zFD+yHL8ApyJz09JiAT4F16yA== X-Received: by 10.99.7.206 with SMTP id 197mr23334893pgh.95.1489193234081; Fri, 10 Mar 2017 16:47:14 -0800 (PST) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id t12sm20711943pfg.14.2017.03.10.16.47.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2017 16:47:13 -0800 (PST) From: Geliang Tang To: Chas Williams <3chas3@gmail.com> Cc: Geliang Tang , linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ambassador: use setup_timer Date: Sat, 11 Mar 2017 08:46:56 +0800 Message-Id: <964049df314453bb891ce71df7cd7a63540e6210.1489061130.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <3afa5498142ef68256023257dad37b9f8352e65e.1489060803.git.geliangtang@gmail.com> References: <3afa5498142ef68256023257dad37b9f8352e65e.1489060803.git.geliangtang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang --- drivers/atm/ambassador.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 4a61079..906705e 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -2267,9 +2267,8 @@ static int amb_probe(struct pci_dev *pci_dev, dev->atm_dev->ci_range.vpi_bits = NUM_VPI_BITS; dev->atm_dev->ci_range.vci_bits = NUM_VCI_BITS; - init_timer(&dev->housekeeping); - dev->housekeeping.function = do_housekeeping; - dev->housekeeping.data = (unsigned long) dev; + setup_timer(&dev->housekeeping, do_housekeeping, + (unsigned long)dev); mod_timer(&dev->housekeeping, jiffies); // enable host interrupts