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=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 038E2C43387 for ; Mon, 7 Jan 2019 13:03:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD3F42089F for ; Mon, 7 Jan 2019 13:03:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866217; bh=qxKYB1J70dXlRlGBekvWnqzoZFrQ9ydNyQaMJreix3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1bXeZkS+cFaZrwkEOxTH25BgP9HWeUjUfR4CKZZW+MawlNo0hwtsmmCGHb+pXkm47 zh4T8WNXV+I/ZQrborQ/h4uGd5N5kadEvEgU35GV+JGzVdtnRdMIfbyXb4zpvFirNZ PBX/5CWPhboObN3UE8dAMCYY83TjgzNJ5ExWpvaY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731037AbfAGNDg (ORCPT ); Mon, 7 Jan 2019 08:03:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:51042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731034AbfAGNDf (ORCPT ); Mon, 7 Jan 2019 08:03:35 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A23922089F; Mon, 7 Jan 2019 13:03:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866215; bh=qxKYB1J70dXlRlGBekvWnqzoZFrQ9ydNyQaMJreix3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpLhPJijPItXVqgTKKtpPy5BzAJ06ROzqONFNv+Fn0bbfKpnj5sUGAxA/kPlYoDKn WgiiXgiPfD9OKgj/7KbXGn8+5eTnaStV8iD7GP5hYdgrTdcc6iLdDjVuQAdAm0Canh vou95LvdAE2Zm6U4K5r3VcjhIaLdDb6ku4RYBbOM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Sakamoto , Takashi Iwai Subject: [PATCH 4.14 047/101] ALSA: firewire-lib: use the same print format for without_header tracepoints Date: Mon, 7 Jan 2019 13:32:35 +0100 Message-Id: <20190107105335.472917571@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107105330.372621917@linuxfoundation.org> References: <20190107105330.372621917@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Sakamoto commit 5ef108c53e6efd695e32aad969638ccbc35b4be9 upstream. An initial commit to add tracepoints for packets without CIP headers uses different print formats for added tracepoints. However this is not convenient for users/developers to prepare debug tools. This commit uses the same format for the two tracepoints. Cc: # v4.12+ Fixes: b164d2fd6e49 ('ALSA: firewire_lib: add tracepoints for packets without CIP headers') Signed-off-by: Takashi Sakamoto Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/firewire/amdtp-stream-trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -131,7 +131,7 @@ TRACE_EVENT(in_packet_without_header, __entry->index = index; ), TP_printk( - "%02u %04u %04x %04x %02d %03u %3u %3u %02u %01u %02u", + "%02u %04u %04x %04x %02d %03u %02u %03u %02u %01u %02u", __entry->second, __entry->cycle, __entry->src,