From patchwork Thu Aug 25 01:33:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 662637 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 3sKXqy2TSZz9sBc for ; Thu, 25 Aug 2016 15:32:30 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=QX0zssJT; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755948AbcHYFc0 (ORCPT ); Thu, 25 Aug 2016 01:32:26 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34767 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755685AbcHYFc0 (ORCPT ); Thu, 25 Aug 2016 01:32:26 -0400 Received: by mail-pa0-f65.google.com with SMTP id hh10so2474252pac.1 for ; Wed, 24 Aug 2016 22:31:21 -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=/fiCJkklKN8XSNMK7kcJRWllp+Xs+Jtwtksoe2HfPjw=; b=QX0zssJT67QLkDYW0zE/OEyRJJmH2eB0klWofSqBwsuQdHk5GmaMdkl5Fug1LRdZXw 7Mh9Yhm2EEEifoUS8cvjwZJrPg0bPiTUg6c9dU9NC/3XOLgYpcJgcE9YRxQQ2vMsyYqN Oza7hD0MKPS8qFaII2mOPIjWImPo9Qjvmk2Q/ygk9CrFBvCbjqi7eU9yaKZWEBzzni0F s9o0zHEz6IJXc9bDo+/cpmpLi/OzkCcCIg27Yvj3B0ezKeMKFML0lqjVRHKbrNSyUFK2 juGTnp6a+44cuM59liIjarW/cO4GDjH/VI/Iud94TXwr+7wMwMqOyClwq1a4JbgKPMxH B8cw== 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=/fiCJkklKN8XSNMK7kcJRWllp+Xs+Jtwtksoe2HfPjw=; b=K+aa+s5PuGdALLE5JrNGIvFSj9hJua+0XPAuAJi9gmTBqNTgonhUhBr8Ih9g4vKTji kgEBkRhMneaQRjJHTuiLnVlNzetbI9q6LI+loaBNsrr5JIMbx25Pa0o+VFId/MpzVxSE I6vmtYRK43lsdOs5ZWrMzahZH2+wvCVLk+LVEIYCKnG02BgFgfPy7GVpVLx0DLbTd+f2 +sVAsDJRTXy+sLUvSyAQP2PggeuPO6fmtZorX5sF75QCqoulrZKNgN84Zaokq1GW/xsJ AQNFoduh0dFWXOpgmp1eJW9GbfOQq+yME4jmj8qrvnIJ8c1wW6bL73IbM87oRUOXBArG frPw== X-Gm-Message-State: AE9vXwNubBHaMZzgmyq/qPULwzuaElX9R3aSHD1YNFWvQfh8LNxtyS4KscHWtwrj21Sssw== X-Received: by 10.66.191.66 with SMTP id gw2mr11282714pac.153.1472088838504; Wed, 24 Aug 2016 18:33:58 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id c82sm16481625pfb.72.2016.08.24.18.33.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Aug 2016 18:33:57 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, jon.mason@broadcom.com, Florian Fainelli Subject: [PATCH net-next 1/6] net: dsa: b53: Initialize ds->drv in b53_switch_alloc Date: Wed, 24 Aug 2016 18:33:40 -0700 Message-Id: <1472088825-20181-2-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472088825-20181-1-git-send-email-f.fainelli@gmail.com> References: <1472088825-20181-1-git-send-email-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to alloc drivers to override specific dsa_switch_driver callbacks, initialize ds->drv to b53_switch_ops earlier, which avoids having to expose this structure to glue drivers. Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 65ecb51f99e5..30377ceb1928 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1602,7 +1602,6 @@ static const struct b53_chip_data b53_switch_chips[] = { static int b53_switch_init(struct b53_device *dev) { - struct dsa_switch *ds = dev->ds; unsigned int i; int ret; @@ -1618,7 +1617,6 @@ static int b53_switch_init(struct b53_device *dev) dev->vta_regs[1] = chip->vta_regs[1]; dev->vta_regs[2] = chip->vta_regs[2]; dev->jumbo_pm_reg = chip->jumbo_pm_reg; - ds->drv = &b53_switch_ops; dev->cpu_port = chip->cpu_port; dev->num_vlans = chip->vlans; dev->num_arl_entries = chip->arl_entries; @@ -1706,6 +1704,7 @@ struct b53_device *b53_switch_alloc(struct device *base, dev->ds = ds; dev->priv = priv; dev->ops = ops; + ds->drv = &b53_switch_ops; mutex_init(&dev->reg_mutex); mutex_init(&dev->stats_mutex);