From patchwork Wed Sep 1 12:27:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 505067 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp211576jai; Wed, 1 Sep 2021 05:36:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzH3aBpVr63tSSv5FXrBf5Yal2BMmjKBtGjU635AKahd3YerJROuLLlv5XkAzbsEY6CsRt X-Received: by 2002:a6b:8d8a:: with SMTP id p132mr26714569iod.81.1630499784996; Wed, 01 Sep 2021 05:36:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630499784; cv=none; d=google.com; s=arc-20160816; b=lMIXO4JGrDj2b9xYUK0NTm6EWQOjL9I/XWVc2iWKFNntawAa3+xqsvCYmaZ0huu8rh Hck7PBCFsKXp/QVg+e4OsPxvXDbh608Gh32/HUpsPxYlKFjFxsB3tL1y1LbIdpn7R5Pe BlIA36kvLETl1w3BPTijqg6/4dU6T5LERUY20RkHdEQ9QP1LwI2dza3b8aOHUU3XMSwS 0H7XK1QWXbv3S/xepo4tmBwyMQu4XF3KjsNGzQ1PND73GHIEX++Avw+ArbeCHqdHyNOx qDWlI0lw6bFAMuo/9I195wMKjDobJ8yRKLG03aDXNSl2lVa/atXetCzrYJrQNZc5dKxW +DzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ggxDy6a0BHMNpk3KP41fIgI4fklmaHTYHD0n/M2GELk=; b=Mbjn5AqLpNmt7c2wO/eXJ7N08FYD5NWInjNglWjJQicoe5P9Mw2zVqWJd1XSzEDB+z 5NRjGBAkk6BxOVAfFohOa+vHIz5h9Nhpab6KL9AhXtcGWkiUjMYT13Yn7eUR9YsoMnLu 2R/CTWZQRaJdD7zVDDYFodyp2lk0i0prc4+aiSBHZnHBb0c03jLpw31q/lQe6vedfMFP QaOodRfnzbfrACL5KCL/uzuOaXi0qg43La25ch0oEGO4pPZqhQFwicoKrbgSWgNL19aq 9LhAK+FuLKFA21U5ATKotZDRzg+CL+WOH8tgefxsP0lSSQWxe5aCO2Zzu7OaoWVvtO4V 990A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jcIoDhEo; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v11si19964899iol.46.2021.09.01.05.36.24; Wed, 01 Sep 2021 05:36:24 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jcIoDhEo; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245561AbhIAMhT (ORCPT + 11 others); Wed, 1 Sep 2021 08:37:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343585AbhIAMfJ (ORCPT ); Wed, 1 Sep 2021 08:35:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F1DC1610CB; Wed, 1 Sep 2021 12:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1630499594; bh=bshTLC1uJlE+pTmdql1NoWvc/HC9abF6H6tLLErjrck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jcIoDhEoE20kp0I++al88FsEkmXZHmpFSEWJ1B+7E7N5GwJOR+JswaKONwe7l8mRk dpRiUH8XbOjGCIS9JrSPtYPggwhJfyNNTCqc3pMuJ2zzLBNdR6Mazb6Ng2zeYCmx1Z 2c3yrWw8imrRdwHWkJgHmDS5XEO/DqRqHAaevzGo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown , Alexandre Belloni , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 011/103] net: mscc: Fix non-GPL export of regmap APIs Date: Wed, 1 Sep 2021 14:27:21 +0200 Message-Id: <20210901122300.898832466@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210901122300.503008474@linuxfoundation.org> References: <20210901122300.503008474@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown [ Upstream commit 48c812e0327744b4965296f65c23fe2405692afc ] The ocelot driver makes use of regmap, wrapping it with driver specific operations that are thin wrappers around the core regmap APIs. These are exported with EXPORT_SYMBOL, dropping the _GPL from the core regmap exports which is frowned upon. Add _GPL suffixes to at least the APIs that are doing register I/O. Signed-off-by: Mark Brown Acked-by: Alexandre Belloni Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mscc/ocelot_io.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.30.2 diff --git a/drivers/net/ethernet/mscc/ocelot_io.c b/drivers/net/ethernet/mscc/ocelot_io.c index ea4e83410fe4..7390fa3980ec 100644 --- a/drivers/net/ethernet/mscc/ocelot_io.c +++ b/drivers/net/ethernet/mscc/ocelot_io.c @@ -21,7 +21,7 @@ u32 __ocelot_read_ix(struct ocelot *ocelot, u32 reg, u32 offset) ocelot->map[target][reg & REG_MASK] + offset, &val); return val; } -EXPORT_SYMBOL(__ocelot_read_ix); +EXPORT_SYMBOL_GPL(__ocelot_read_ix); void __ocelot_write_ix(struct ocelot *ocelot, u32 val, u32 reg, u32 offset) { @@ -32,7 +32,7 @@ void __ocelot_write_ix(struct ocelot *ocelot, u32 val, u32 reg, u32 offset) regmap_write(ocelot->targets[target], ocelot->map[target][reg & REG_MASK] + offset, val); } -EXPORT_SYMBOL(__ocelot_write_ix); +EXPORT_SYMBOL_GPL(__ocelot_write_ix); void __ocelot_rmw_ix(struct ocelot *ocelot, u32 val, u32 mask, u32 reg, u32 offset) @@ -45,7 +45,7 @@ void __ocelot_rmw_ix(struct ocelot *ocelot, u32 val, u32 mask, u32 reg, ocelot->map[target][reg & REG_MASK] + offset, mask, val); } -EXPORT_SYMBOL(__ocelot_rmw_ix); +EXPORT_SYMBOL_GPL(__ocelot_rmw_ix); u32 ocelot_port_readl(struct ocelot_port *port, u32 reg) { @@ -58,7 +58,7 @@ u32 ocelot_port_readl(struct ocelot_port *port, u32 reg) regmap_read(port->target, ocelot->map[target][reg & REG_MASK], &val); return val; } -EXPORT_SYMBOL(ocelot_port_readl); +EXPORT_SYMBOL_GPL(ocelot_port_readl); void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg) { @@ -69,7 +69,7 @@ void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg) regmap_write(port->target, ocelot->map[target][reg & REG_MASK], val); } -EXPORT_SYMBOL(ocelot_port_writel); +EXPORT_SYMBOL_GPL(ocelot_port_writel); void ocelot_port_rmwl(struct ocelot_port *port, u32 val, u32 mask, u32 reg) { @@ -77,7 +77,7 @@ void ocelot_port_rmwl(struct ocelot_port *port, u32 val, u32 mask, u32 reg) ocelot_port_writel(port, (cur & (~mask)) | val, reg); } -EXPORT_SYMBOL(ocelot_port_rmwl); +EXPORT_SYMBOL_GPL(ocelot_port_rmwl); u32 __ocelot_target_read_ix(struct ocelot *ocelot, enum ocelot_target target, u32 reg, u32 offset) @@ -128,7 +128,7 @@ int ocelot_regfields_init(struct ocelot *ocelot, return 0; } -EXPORT_SYMBOL(ocelot_regfields_init); +EXPORT_SYMBOL_GPL(ocelot_regfields_init); static struct regmap_config ocelot_regmap_config = { .reg_bits = 32, @@ -148,4 +148,4 @@ struct regmap *ocelot_regmap_init(struct ocelot *ocelot, struct resource *res) return devm_regmap_init_mmio(ocelot->dev, regs, &ocelot_regmap_config); } -EXPORT_SYMBOL(ocelot_regmap_init); +EXPORT_SYMBOL_GPL(ocelot_regmap_init);