From patchwork Wed Oct 19 10:10:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 9384245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79FD6608A7 for ; Wed, 19 Oct 2016 14:58:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AD9528826 for ; Wed, 19 Oct 2016 14:58:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F82728CAD; Wed, 19 Oct 2016 14:58:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C89E28B1A for ; Wed, 19 Oct 2016 14:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S943131AbcJSO6m (ORCPT ); Wed, 19 Oct 2016 10:58:42 -0400 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:46493 "EHLO s-opensource.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S943175AbcJSO6k (ORCPT ); Wed, 19 Oct 2016 10:58:40 -0400 Received: from localhost (localhost [127.0.0.1]) by s-opensource.com (Postfix) with ESMTP id 3E78AA1292; Wed, 19 Oct 2016 10:10:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osg.samsung.com Received: from s-opensource.com ([127.0.0.1]) by localhost (s-opensource.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BrnbsjcBoIk8; Wed, 19 Oct 2016 10:10:24 +0000 (UTC) Received: from vento.lan (177.43.27.192.dynamic.adsl.gvt.net.br [177.43.27.192]) by s-opensource.com (Postfix) with ESMTPSA id 5E38BA0E61; Wed, 19 Oct 2016 10:10:23 +0000 (UTC) Date: Wed, 19 Oct 2016 08:10:13 -0200 From: Mauro Carvalho Chehab To: Stefan Richter Cc: Linux Media Mailing List , Mauro Carvalho Chehab , Mauro Carvalho Chehab , linux1394-devel@lists.sourceforge.net Subject: Re: [PATCH v2 53/58] firewire: don't break long lines Message-ID: <20161019081013.641450f4@vento.lan> In-Reply-To: <20161019100113.077e60f1@kant> References: <20161019100113.077e60f1@kant> Organization: Samsung X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Em Wed, 19 Oct 2016 10:01:13 +0200 Stefan Richter escreveu: > On Oct 18 Mauro Carvalho Chehab wrote: > [...] > > The patch was generated via the script below, and manually > > adjusted if needed. > [...] > > Reviewed-by: Takashi Sakamoto > > Acked-by: Stefan Richter > > Signed-off-by: Mauro Carvalho Chehab > > --- > > drivers/media/firewire/firedtv-rc.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > [...] > > Patch v1 also had a hunk in drivers/media/firewire/firedtv-avc.c. > What happened to it? There was some mistake when I manipulated it manually, after re-run the script. Btw, I liked more the Takashi's dev_dbg() patch for firedtv-rc.c. So, I guess the better would be to apply his patch and the one enclosed here, with just the firedtv-avc.c change. Thanks, Mauro [PATCH] firewire: don't break long lines Due to the 80-cols restrictions, and latter due to checkpatch warnings, several strings were broken into multiple lines. This is not considered a good practice anymore, as it makes harder to grep for strings at the source code. As we're right now fixing other drivers due to KERN_CONT, we need to be able to identify what printk strings don't end with a "\n". It is a way easier to detect those if we don't break long lines. So, join those continuation lines. The patch was generated via the script below, and manually adjusted if needed. use Text::Tabs; while (<>) { if ($next ne "") { $c=$_; if ($c =~ /^\s+\"(.*)/) { $c2=$1; $next =~ s/\"\n$//; $n = expand($next); $funpos = index($n, '('); $pos = index($c2, '",'); if ($funpos && $pos > 0) { $s1 = substr $c2, 0, $pos + 2; $s2 = ' ' x ($funpos + 1) . substr $c2, $pos + 2; $s2 =~ s/^\s+//; $s2 = ' ' x ($funpos + 1) . $s2 if ($s2 ne ""); print unexpand("$next$s1\n"); print unexpand("$s2\n") if ($s2 ne ""); } else { print "$next$c2\n"; } $next=""; next; } else { print $next; } $next=""; } else { if (m/\"$/) { if (!m/\\n\"$/) { $next=$_; next; } } } print $_; } Reviewed-by: Takashi Sakamoto Acked-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/firewire/firedtv-avc.c b/drivers/media/firewire/firedtv-avc.c index 251a556112a9..5bde6c209cd7 100644 --- a/drivers/media/firewire/firedtv-avc.c +++ b/drivers/media/firewire/firedtv-avc.c @@ -1181,8 +1181,8 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) if (es_info_length > 0) { pmt_cmd_id = msg[read_pos++]; if (pmt_cmd_id != 1 && pmt_cmd_id != 4) - dev_err(fdtv->device, "invalid pmt_cmd_id %d " - "at stream level\n", pmt_cmd_id); + dev_err(fdtv->device, "invalid pmt_cmd_id %d at stream level\n", + pmt_cmd_id); if (es_info_length > sizeof(c->operand) - 4 - write_pos) {