From patchwork Wed May 24 04:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 98288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2600958vqo; Tue, 23 May 2023 22:04:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ere4d5dTgsD2Cxo5bqm50fA4bbwWUv688UrU3+0RiYYgLLOOI8OFwZSqxUv03zglLvdN8 X-Received: by 2002:a05:6a00:1341:b0:64a:7723:fe04 with SMTP id k1-20020a056a00134100b0064a7723fe04mr1891815pfu.4.1684904687413; Tue, 23 May 2023 22:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684904687; cv=none; d=google.com; s=arc-20160816; b=ZU980kDBFuJ1Idd9imeDmHBmiQbkyFegmfCnPvKN/wGsAQq9MVFQ3Aj/ki617QVMC4 vnrpi9XOVTlriIQu+YyAL7ExUA75qDn6oHH9tCKpgkq8UhXxLd9oxwbvADYXZhMNkXK6 L374+280OcuIrtFbyYgNbll26vSwm7svcHWC0WIfJraz7MlYj4CKlVeSfeExClGlOLw2 caGfT3cqoEjBJ56+m3NKU+F8cSR31Aftq8IifBS9syyOXzdJm7pX9uHYzQISQNiU8jCJ e+aiXSqcqwBFIMeFyZPzyJCXwCn2XAjiYWoNWeSOVTKvZMpwQjYyZZ7ZZbIokROFYODw Hx9w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=x3TATxZ2qX9UI1aV8ki5wVDf4nzUOgqNz0TYOz12DOU=; b=0k/eyR6nGE1py0V0CMo/B85XFVtiOrydeKhgjcxSt2fJ9BB3s7T27Doc9nViuBOlaR CkNZEi1v1k9TcSs4f9pwkTE2kGjP1l4r5sPrikcm/Boss8SQN8lBspcgi4NOilXpRAvZ wDJcaaIxCIx43tu6GPTlp01Wehs9qESxb1yxOeTqMp4er917tBcttvR8zBuMaEwet2Wg GsyVJrPxNL/RS4wJwRZGdxbsshbgWD5RmFis+QlP2xoKclZ49KKreQfcVABRBCyMoJEf r1KwrZTEi2Ahfj3EA8Z7T+TR0SVi+CoETr8Qlwy6EXaoSgM5438VloDbqBKoAcSeSFIi 10cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zT5WGgGR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020aa7952f000000b00643b4daa91asi1527326pfp.369.2023.05.23.22.04.32; Tue, 23 May 2023 22:04:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zT5WGgGR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238999AbjEXExQ (ORCPT + 99 others); Wed, 24 May 2023 00:53:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231245AbjEXExO (ORCPT ); Wed, 24 May 2023 00:53:14 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69BF2184; Tue, 23 May 2023 21:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=x3TATxZ2qX9UI1aV8ki5wVDf4nzUOgqNz0TYOz12DOU=; b=zT5WGgGRyuiauI1Gqh/aDM7kw9 en7NVJcwdW+iclF0oXdu6aIQcvoPd3XQpBTqQX5h/Hzc0c9keUnI/kY+EaXgSvRpCPwDPNJgsZI2h FXm2xcQpQKY6+GxUxgiPyq60w4khmqBT+0IJiR9BPx5sS6fdM9Bhgje57XsYI9NcQenvuRqX7vq2B dWxYM241L/EVfLa60E0DyPkyUOUCYJrLZcyLRSWO3oNdUycFL/dFOHJviLvGSDrCoXqI9oR8iKobP /jn3jJ+w2Cg7wFNNujLQI7V/UgJwFIWSb2cui8d5zAqXMVKGMmG2V3SSoFaylPmxffnsGGT2dO6bW 7CAkfC7A==; Received: from [2601:1c2:980:9ec0::2764] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q1gUp-00CLwp-0V; Wed, 24 May 2023 04:53:12 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Jaswinder Singh , Boojin Kim , Krzysztof Kozlowski , Russell King , Vinod Koul , dmaengine@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH v2] dmaengine: pl330: rename _start to prevent build error Date: Tue, 23 May 2023 21:53:10 -0700 Message-Id: <20230524045310.27923-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766750617609113047?= X-GMAIL-MSGID: =?utf-8?q?1766750617609113047?= "_start" is used in several arches and proably should be reserved for ARCH usage. Using it in a driver for a private symbol can cause a build error when it conflicts with ARCH usage of the same symbol. Therefore rename pl330's "_start" to "pl330_start_thread" so that there is no conflict and no build error. drivers/dma/pl330.c:1053:13: error: '_start' redeclared as different kind of symbol 1053 | static bool _start(struct pl330_thread *thrd) | ^~~~~~ In file included from ../include/linux/interrupt.h:21, from ../drivers/dma/pl330.c:18: arch/riscv/include/asm/sections.h:11:13: note: previous declaration of '_start' with type 'char[]' 11 | extern char _start[]; | ^~~~~~ Fixes: b7d861d93945 ("DMA: PL330: Merge PL330 driver into drivers/dma/") Fixes: ae43b3289186 ("ARM: 8202/1: dmaengine: pl330: Add runtime Power Management support v12") Signed-off-by: Randy Dunlap Cc: Jaswinder Singh Cc: Boojin Kim Cc: Krzysztof Kozlowski Cc: Russell King Cc: Vinod Koul Cc: dmaengine@vger.kernel.org Cc: linux-riscv@lists.infradead.org --- v2: make new function name pl330-specific (Vinod) drop Jaswinder Singh @samsung.com from Cc: list drivers/dma/pl330.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -- a/drivers/dma/pl330.c b/drivers/dma/pl330.c --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -1050,7 +1050,7 @@ static bool _trigger(struct pl330_thread return true; } -static bool _start(struct pl330_thread *thrd) +static bool pl330_start_thread(struct pl330_thread *thrd) { switch (_state(thrd)) { case PL330_STATE_FAULT_COMPLETING: @@ -1702,7 +1702,7 @@ static int pl330_update(struct pl330_dma thrd->req_running = -1; /* Get going again ASAP */ - _start(thrd); + pl330_start_thread(thrd); /* For now, just make a list of callbacks to be done */ list_add_tail(&descdone->rqd, &pl330->req_done); @@ -2089,7 +2089,7 @@ static void pl330_tasklet(struct tasklet } else { /* Make sure the PL330 Channel thread is active */ spin_lock(&pch->thread->dmac->lock); - _start(pch->thread); + pl330_start_thread(pch->thread); spin_unlock(&pch->thread->dmac->lock); } @@ -2107,7 +2107,7 @@ static void pl330_tasklet(struct tasklet if (power_down) { pch->active = true; spin_lock(&pch->thread->dmac->lock); - _start(pch->thread); + pl330_start_thread(pch->thread); spin_unlock(&pch->thread->dmac->lock); power_down = false; }