From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752136AbcAAPun (ORCPT ); Fri, 1 Jan 2016 10:50:43 -0500 Received: from m50-132.163.com ([123.125.50.132]:47183 "EHLO m50-132.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752054AbcAAPtm (ORCPT ); Fri, 1 Jan 2016 10:49:42 -0500 From: Geliang Tang To: Johannes Berg , "David S. Miller" Cc: Geliang Tang , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] cfg80211/mac80211: use to_delayed_work Date: Fri, 1 Jan 2016 23:48:52 +0800 Message-Id: <5df0633bd7779dd21192f7a41c634efd78f8606c.1451661580.git.geliangtang@163.com> X-Mailer: git-send-email 2.5.0 X-CM-TRANSID: DNGowEAZSUfqn4ZWFOtPAA--.36261S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7KFWxJrWrtw1DuFWrCF4xXrb_yoW8Gry7pF Z0ka47t3yUXw1Uur1rXF48ZFyrGr1DKw1akr4vya1Syrn2gr1rJr4DWFnIyFWruFs5Aa4a vr4qqFyxZF4kKrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U4UDXUUUUU= X-Originating-IP: [116.77.129.183] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbivxDimVWBPXPeLgABs- Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use to_delayed_work() instead of open-coding it. Signed-off-by: Geliang Tang --- net/mac80211/mlme.c | 3 +-- net/wireless/mlme.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 1c342e2..ea70917 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1638,8 +1638,7 @@ void ieee80211_dynamic_ps_timer(unsigned long data) void ieee80211_dfs_cac_timer_work(struct work_struct *work) { - struct delayed_work *delayed_work = - container_of(work, struct delayed_work, work); + struct delayed_work *delayed_work = to_delayed_work(work); struct ieee80211_sub_if_data *sdata = container_of(delayed_work, struct ieee80211_sub_if_data, dfs_cac_timer_work); diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index fb44fa3..4fccf52 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -721,7 +721,7 @@ void cfg80211_dfs_channels_update_work(struct work_struct *work) unsigned long timeout, next_time = 0; int bandid, i; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); rdev = container_of(delayed_work, struct cfg80211_registered_device, dfs_update_channels_wk); wiphy = &rdev->wiphy; -- 2.5.0