Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp421555rwa; Sat, 20 Aug 2022 06:26:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR43hSi0+HqGDuI/X/bZDxP3TnzyUo6uvNcW5HTd6WOntPC46RjV9KuXvTMhPfXk52C0TAjz X-Received: by 2002:a17:907:87b0:b0:738:e618:99ca with SMTP id qv48-20020a17090787b000b00738e61899camr7728140ejc.357.1661002008606; Sat, 20 Aug 2022 06:26:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661002008; cv=none; d=google.com; s=arc-20160816; b=kXGz8TECp23rgKKhqbAMZRacLVRKs/V5dNJTbkqbahyoyvbA4Otf9/7Rs+6BYra1Br xCt8/MUcVDbWUcXO56r5Brnl4uqNZMeji6Y3xWzGeMCwVk1BSvkKjLFxq+IEGHpTAU8L Oh7+aTG3mQTGz3oNQ0O5ikUTMck6UFX7bqGVhH1MYlcWdxe/bCKzF+Iuy7OdQLlt/fmx QfdB7sywO256jceGXmANme8cukC+ynxxi7Tm94r3lcZtqvvJU8QCliejgqGn+NZnxNaD 5Leq+rmfv6V+5v7tuAFXp0eShmqJpAYeQf24Rt1z47NH7rE8SkMp2qtxePtch2NOLnJB RQRw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=llf63l7huGL2OAgC9jUBLJtAurttgzFYhuGzRepMUbk=; b=UF+oirDg5nSTpxLosqJDtdi2ZFoaI+hkMHTzCRMSPXfirMJNVUFAnJFpqWEEmF8aoI 4q9ZnaTAI6gPLidWsp3eim6dj9ROp3a0HGpgYU05XMLgKW7Y/ng8ryHSK00jdgOQGhZ1 Eyj4wpG1Lw8rfn6IvOFMZcSxh520B8TV6w11L6+28kiZ8B/VVhLEDt+rsWXrpwq9GZbh vXPEkIU7S5x0tluesRutIMMNsc+mhMuIcV+KOB2tTxIaqVxA7Y0JKeks0m0Q/u8qn3an W/XzfNr+zOe31kNPWBe0hC6tn82MSfTtg50iKnqmuNZYAYvPY/DyA+02ELKWXua1u8Hb BlkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=0qX7dTbI; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ot16-20020a170906ccd000b0073d6883a313si996292ejb.439.2022.08.20.06.26.21; Sat, 20 Aug 2022 06:26:48 -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=@microchip.com header.s=mchp header.b=0qX7dTbI; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346547AbiHTM6L (ORCPT + 99 others); Sat, 20 Aug 2022 08:58:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346501AbiHTM5o (ORCPT ); Sat, 20 Aug 2022 08:57:44 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1A657330B; Sat, 20 Aug 2022 05:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1661000264; x=1692536264; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dTTi1bl8hDEHuPm5ibXS4s2heL+9TD/juZdMY07cfKw=; b=0qX7dTbIyFp03v08m4Hl18LbczLZe9hZ9BihFIptzRds2L5TAAavulJx hwWGUIFhoDJbWHsKUtXvDBRLKpw3NP+twJPY4lEJub6cV8t8J7tX3U+bG OaFrUe/kLypu6qzmqzFQ1CrcJnYuXlyMAal0VqHuibyfp+Cm/qgg5if2n QUt+37FItzK5rlAaZpjaswi/rF1cK7iXH6Vh0RQDpdD53v8Lfe5xHYJHE GZSwbvknUWfMdbOWwXN/tlbXGsg4VOdU1joa+Xvq/tzr8Lk+vEK8DiPYh PGge0yIwY80MqhKRmWFHbaSq7bnGJVBy9dyZTjEyJS4GPPCSp38GwphE7 w==; X-IronPort-AV: E=Sophos;i="5.93,251,1654585200"; d="scan'208";a="177042710" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 20 Aug 2022 05:57:44 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Sat, 20 Aug 2022 05:57:42 -0700 Received: from ROB-ULT-M18064N.mchp-main.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Sat, 20 Aug 2022 05:57:39 -0700 From: Tudor Ambarus To: , , , CC: , , , , , , , , , Subject: [PATCH 06/33] dmaengine: at_hdmac: Return dma_cookie_status()'s ret code when txstate is NULL Date: Sat, 20 Aug 2022 15:56:50 +0300 Message-ID: <20220820125717.588722-7-tudor.ambarus@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220820125717.588722-1-tudor.ambarus@microchip.com> References: <20220820125717.588722-1-tudor.ambarus@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,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 txstate is an optional parameter used to get a struct with auxilary transfer status information. When not provided the call to device_tx_status() should return the status of the dma cookie. Return the status of dma cookie when the txstate optional parameter is not provided. Signed-off-by: Tudor Ambarus --- drivers/dma/at_hdmac.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 085a990f8d5d..91e53a590d5f 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c @@ -1947,14 +1947,8 @@ atc_tx_status(struct dma_chan *chan, int bytes = 0; ret = dma_cookie_status(chan, cookie, txstate); - if (ret == DMA_COMPLETE) + if (ret == DMA_COMPLETE || !txstate) return ret; - /* - * There's no point calculating the residue if there's - * no txstate to store the value. - */ - if (!txstate) - return DMA_ERROR; spin_lock_irqsave(&atchan->lock, flags); -- 2.25.1