From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5444AC64EBC for ; Wed, 3 Oct 2018 13:32:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25FA42098A for ; Wed, 3 Oct 2018 13:32:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25FA42098A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726861AbeJCUUg (ORCPT ); Wed, 3 Oct 2018 16:20:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47260 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726720AbeJCUUg (ORCPT ); Wed, 3 Oct 2018 16:20:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A83423097028; Wed, 3 Oct 2018 13:32:10 +0000 (UTC) Received: from localhost (unknown [10.40.205.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 133B95D6A6; Wed, 3 Oct 2018 13:32:07 +0000 (UTC) Date: Wed, 3 Oct 2018 15:32:06 +0200 From: Stanislaw Gruszka To: Felix Fietkau Cc: Lorenzo Bianconi , linux-wireless Subject: Re: [PATCH 06/10] mt76x2: move mt76x2_dev in mt76x02_util.h Message-ID: <20181003133205.GA16914@redhat.com> References: <20181001221908.16005-7-lorenzo.bianconi@redhat.com> <20181003104334.GB2250@redhat.com> <20181003111217.GC2250@redhat.com> <5D5747FB-2C2E-481F-B361-2FA054E4D6E8@nbd.name> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5D5747FB-2C2E-481F-B361-2FA054E4D6E8@nbd.name> User-Agent: Mutt/1.8.3 (2017-05-23) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 03 Oct 2018 13:32:10 +0000 (UTC) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Wed, Oct 03, 2018 at 01:49:23PM +0200, Felix Fietkau wrote: > > > > On 3. Oct 2018, at 13:12, Stanislaw Gruszka wrote: > > > > On Wed, Oct 03, 2018 at 01:01:40PM +0200, Lorenzo Bianconi wrote: > >>> > >>> On Tue, Oct 02, 2018 at 12:19:04AM +0200, Lorenzo Bianconi wrote: > >>>> Move mt76x2_dev in mt76x02_util.h and rename it in mt76x02_dev > >>>> in order to be shared between mt76x2 and mt76x0 driver > >>> > >>>> +struct mt76x02_dev { > >>>> + struct mt76_dev mt76; /* must be first */ > >>>> + > >>>> + struct mac_address macaddr_list[8]; > >>>> + > >>>> + struct mutex mutex; > >>>> + > >>>> + u8 txdone_seq; > >>>> + DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status); > >>>> + > >>>> + struct sk_buff *rx_head; > >>>> + > >>>> + struct tasklet_struct tx_tasklet; > >>>> + struct tasklet_struct pre_tbtt_tasklet; > >>>> + struct delayed_work cal_work; > >>>> + struct delayed_work mac_work; > >>>> + > >>>> + u32 aggr_stats[32]; > >>>> + > >>>> + struct sk_buff *beacons[8]; > >>>> + u8 beacon_mask; > >>>> + u8 beacon_data_mask; > >>>> + > >>>> + u8 tbtt_count; > >>>> + u16 beacon_int; > >>>> + > >>>> + struct mt76x02_calibration cal; > >>>> + > >>>> + s8 target_power; > >>>> + s8 target_power_delta[2]; > >>>> + bool enable_tpc; > >>>> + > >>>> + u8 coverage_class; > >>>> + u8 slottime; > >>>> + > >>>> + struct mt76x02_dfs_pattern_detector dfs_pd; > >>>> +}; > >>>> + > >>> > >>>> static bool > >>>> -mt76x2_has_cal_free_data(struct mt76x2_dev *dev, u8 *efuse) > >>>> +mt76x2_has_cal_free_data(struct mt76x02_dev *dev, u8 *efuse) > >>> > >>> I don't think this is right approach. I would rather prefer to have > >>> common data structures embeded in mt76x2_dev and mt76x0_dev > >>> structures to have chip sepcific fields/data separated. > >>> > >> > >> The reason of this patch is that mt76x0_dev fields are already in mt76x2_dev > >> so I guess there is no need to have different structures. Moreover in > >> this way we can > >> remove a lot of duplicated code between mt76x0 and mt76x2 drivers. > > > > But you can still create additional structures i.e. > > > > mt76x02_power { > > s8 target_power; > > s8 target_power_delta[2]; > > bool enable_tpc; > > } > > > > mt76x02_conf { > > u8 coverage_class; > > u8 slottime; > > } > > > > put them into mt76xN_dev and still remove dupicated code ? > Quite often, mt76_dev would be needed as well for register access, which means extra parameters for a lot of functions. > I think Lorenzo’s approach makes the code a lot more concise, and makes it easier to share more code between mt76x0 and mt76x2. I think this could be solved very easly by container_of() macro if there will be one mt76x02_dev struct just after mt76_dev. Regerds Stanislaw