From patchwork Fri Mar 18 02:21:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 8615741 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7AFEC9F3D1 for ; Fri, 18 Mar 2016 02:21:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80455202F0 for ; Fri, 18 Mar 2016 02:21:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8016720279 for ; Fri, 18 Mar 2016 02:21:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752600AbcCRCVj (ORCPT ); Thu, 17 Mar 2016 22:21:39 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:33139 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751316AbcCRCVh (ORCPT ); Thu, 17 Mar 2016 22:21:37 -0400 Received: by mail-pf0-f175.google.com with SMTP id 4so15013528pfd.0 for ; Thu, 17 Mar 2016 19: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=dTe2MQ7MVa8wEj783JPNlhmYEZQh+s/zOWmXaiOo3GY=; b=TpQYPTIhUjPmOTjkwFgCwGWj1nY4r9OSWu4Xgd7oOjBD2FnMhc3qwgTqCu5DCTraR7 m1PR/N9Y8zNoKLUwSEOa+3aCE18kl95ofwA0svgUZmv9MbupdHM0/5BeK0Q31N2hYYbw LMHL1nXNwc5BJPGnUwkmF67vRjHVGpfq2NAGW/vuEVDUKXoLveZSkq/03C66pWUG0DF2 Tiq1Jf/+QP/KNU1YZcaNbScMMu8xIeAopVIfXA3zgndPIuj3fOqW68DWshYsxTE4M3rP zJI1Zg0UNwyjcnkb9213jbeARet9NpCSKPe40BmuV58k4aJhG6d8qzyDVXb2EN2vGflA XqQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dTe2MQ7MVa8wEj783JPNlhmYEZQh+s/zOWmXaiOo3GY=; b=AZkwQxlwERYmVTXy94cg7AvFGHCK0mPb1VU0mjhpYHDEtQ0rmLv6V2AYxHyr9Ih4Xm kPK9ikBmWe+zQl1zpzYt/MHcIpD8fDWSdxW95mjfgwbtIrclfTcP+fYqm+fna00v07kI 19wuFrCD66YBpr+0+3QAc9WfIHRgdZHZFCv5idX6RaZcSf2mvlnXDBF7Duibj+aBp0nh XPdOuDJtC6ycxpJOqA8d0s9wTypBIELIL6TnDqEsXuMcnXXktSEJBmsWhl76iw88t/+i KDaFPjUemmjSa7hX/z34Qz2Ec2r1QhWohEjiIasxfFMT5voPEKGKG76GIDkTQ7vrInYo qSrg== X-Gm-Message-State: AD7BkJLpf3BJU7aoeYOFfdlUAiEUTm5UtzMYba/MhpZOYGcWbvTOkk7knTPuWcYT0ooywg== X-Received: by 10.67.3.67 with SMTP id bu3mr19721565pad.39.1458267696797; Thu, 17 Mar 2016 19:21:36 -0700 (PDT) Received: from multimedia.lan (C-59-101-14-180.hay.connect.net.au. [59.101.14.180]) by smtp.gmail.com with ESMTPSA id p75sm16366053pfi.29.2016.03.17.19.21.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 19:21:36 -0700 (PDT) From: Julian Calaby To: Kalle Valo Cc: Johannes Berg , Eliad Peller , Tony Lindgren , Luciano Coelho , Shahar Patury , Emmanuel Grumbach , Eyal Reizer , Geliang Tang , linux-wireless@vger.kernel.org Subject: [PATCH 03/19] wlcore: use to_delayed_work() Date: Fri, 18 Mar 2016 13:21:28 +1100 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geliang Tang Use to_delayed_work() instead of open-coding it. Signed-off-by: Geliang Tang [Update commit message] Signed-off-by: Julian Calaby --- drivers/net/wireless/ti/wlcore/main.c | 10 +++++----- drivers/net/wireless/ti/wlcore/ps.c | 2 +- drivers/net/wireless/ti/wlcore/scan.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index dde3620..a872a07 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -243,7 +243,7 @@ static void wl12xx_tx_watchdog_work(struct work_struct *work) struct delayed_work *dwork; struct wl1271 *wl; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wl = container_of(dwork, struct wl1271, tx_watchdog_work); mutex_lock(&wl->mutex); @@ -2011,7 +2011,7 @@ static void wlcore_channel_switch_work(struct work_struct *work) struct wl12xx_vif *wlvif; int ret; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wlvif = container_of(dwork, struct wl12xx_vif, channel_switch_work); wl = wlvif->wl; @@ -2047,7 +2047,7 @@ static void wlcore_connection_loss_work(struct work_struct *work) struct ieee80211_vif *vif; struct wl12xx_vif *wlvif; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wlvif = container_of(dwork, struct wl12xx_vif, connection_loss_work); wl = wlvif->wl; @@ -2076,7 +2076,7 @@ static void wlcore_pending_auth_complete_work(struct work_struct *work) unsigned long time_spare; int ret; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wlvif = container_of(dwork, struct wl12xx_vif, pending_auth_complete_work); wl = wlvif->wl; @@ -5588,7 +5588,7 @@ static void wlcore_roc_complete_work(struct work_struct *work) struct wl1271 *wl; int ret; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wl = container_of(dwork, struct wl1271, roc_complete_work); ret = wlcore_roc_completed(wl); diff --git a/drivers/net/wireless/ti/wlcore/ps.c b/drivers/net/wireless/ti/wlcore/ps.c index 4cd316e..d4420da 100644 --- a/drivers/net/wireless/ti/wlcore/ps.c +++ b/drivers/net/wireless/ti/wlcore/ps.c @@ -38,7 +38,7 @@ void wl1271_elp_work(struct work_struct *work) struct wl12xx_vif *wlvif; int ret; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wl = container_of(dwork, struct wl1271, elp_work); wl1271_debug(DEBUG_PSM, "elp work"); diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c index 1e3d51c..a384f3f 100644 --- a/drivers/net/wireless/ti/wlcore/scan.c +++ b/drivers/net/wireless/ti/wlcore/scan.c @@ -38,7 +38,7 @@ void wl1271_scan_complete_work(struct work_struct *work) struct wl12xx_vif *wlvif; int ret; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wl = container_of(dwork, struct wl1271, scan_complete_work); wl1271_debug(DEBUG_SCAN, "Scanning complete");