From patchwork Tue Dec 12 18:46:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 10108129 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 24B7A602B3 for ; Tue, 12 Dec 2017 18:47:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1938B28FE1 for ; Tue, 12 Dec 2017 18:47:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E2892952F; Tue, 12 Dec 2017 18:47:07 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 9F52728FE1 for ; Tue, 12 Dec 2017 18:47:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752141AbdLLSrE (ORCPT ); Tue, 12 Dec 2017 13:47:04 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35337 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751625AbdLLSrC (ORCPT ); Tue, 12 Dec 2017 13:47:02 -0500 Received: by mail-wr0-f196.google.com with SMTP id g53so22180189wra.2 for ; Tue, 12 Dec 2017 10:47:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TxQvYxFY0pxxjhQL0J0da3yhB7GeYNLKbQlfHeuoQqQ=; b=V60TvrTNkLK2BuqrWszreNx1N7UdPpgoY/sCPC1sgvtCGdudFArDOlnKiQ7JaeiUbs hM2dAh//moerUu5OPkB/BsyD4zJq4Ty5Yg/SyzlvkVN4wDTp9gfaElBJRktGO4KaMf8z dRKXGziruttHz6vxnUdZnwfM33wV1hE1WZJbBhW7f958V5SvCiyrHgQJaMhuFRKYUzkD R2qwWMklgB2pWCC3WpSILZYpOe1n5i+g/OMyFceNqkOTGOzcGOuIGuGRtMQqLu8Z9N1D uV5RXPU/7EjUzv0gUcigaGh1Jr5a96a57Lyn8I0WChpVy2ujWKl5hMck9t+LEaMb/Xik AuAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TxQvYxFY0pxxjhQL0J0da3yhB7GeYNLKbQlfHeuoQqQ=; b=C9DJMm7iDgNw1KQ75nG5pooBbySuaaCCL5aXsrw9sK8vS7+w0sL/5cVziwL1gGjzYp aTGZuqgrbBQ1G2+fTdsF+mTaYMnl98OQNwk6MTZHMniwkZJBXFtlqS2FLGaMKbTzrV/t SCXD4Syr1cwHT3YokiJMkGwWbASh9EJ4BlSDv4HqepRviWgEQDzYW2ZH1URmBckfEehy rjbrmbASQzCjCPBJVb8tExxhSrhApI4hBcbm2yhqaFs5kFQWoAcXF7Pv0GWOEEmizSdG ouw80nr08+fTYNfX0KgxYmXImVErm7SS4oVaDxIy3pjoH8SjVeoyD5ZUBoJniRiHaksI 2TIw== X-Gm-Message-State: AKGB3mJ9Cid0AUgLW46SDwAEt2r0afIEG3ZCcQaB0RQFRdAWiErFJckY ktJxUp2rHNktrEpr7M6nzB98Lg== X-Google-Smtp-Source: ACJfBos/zcD5lnPJMDIzvOBnKcFQY6qDhOtnV63lA9TsXOqegKnqwv6wyVqfIO72lwvSCDFrs+scpA== X-Received: by 10.223.196.6 with SMTP id v6mr4649108wrf.236.1513104420966; Tue, 12 Dec 2017 10:47:00 -0800 (PST) Received: from dvbdev.wuest.de (ip-84-118-193-200.unity-media.net. [84.118.193.200]) by smtp.gmail.com with ESMTPSA id f132sm140551wmf.17.2017.12.12.10.47.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 10:47:00 -0800 (PST) From: Daniel Scheller To: linux-media@vger.kernel.org, mchehab@kernel.org, mchehab@s-opensource.com Cc: jasmin@anw.at Subject: [PATCH 1/3] [media] staging/cxd2099: fix remaining checkpatch-strict issues Date: Tue, 12 Dec 2017 19:46:55 +0100 Message-Id: <20171212184657.19730-2-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171212184657.19730-1-d.scheller.oss@gmail.com> References: <20171212184657.19730-1-d.scheller.oss@gmail.com> 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 From: Daniel Scheller Fix up all remaining cosmetic issues as reported by checkpatch.pl. Signed-off-by: Daniel Scheller Signed-off-by: Jasmin Jessich --- drivers/staging/media/cxd2099/cxd2099.c | 19 +++++-------------- drivers/staging/media/cxd2099/cxd2099.h | 14 +++----------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/staging/media/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c index 3e30f4864e2b..21b1c6fcf9bf 100644 --- a/drivers/staging/media/cxd2099/cxd2099.c +++ b/drivers/staging/media/cxd2099/cxd2099.c @@ -3,23 +3,14 @@ * * Copyright (C) 2010-2013 Digital Devices GmbH * - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 only, as published by the Free Software Foundation. * - * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html */ #include @@ -59,7 +50,7 @@ struct cxd { int amem_read; int cammode; - struct mutex lock; + struct mutex lock; /* device access lock */ u8 rbuf[1028]; u8 wbuf[1028]; @@ -101,7 +92,7 @@ static int i2c_read_reg(struct i2c_adapter *adapter, u8 adr, .buf = val, .len = 1} }; if (i2c_transfer(adapter, msgs, 2) != 2) { - dev_err(&adapter->dev, "error in i2c_read_reg\n"); + dev_err(&adapter->dev, "error in %s()\n", __func__); return -1; } return 0; @@ -116,7 +107,7 @@ static int i2c_read(struct i2c_adapter *adapter, u8 adr, .buf = data, .len = n} }; if (i2c_transfer(adapter, msgs, 2) != 2) { - dev_err(&adapter->dev, "error in i2c_read\n"); + dev_err(&adapter->dev, "error in %s()\n", __func__); return -1; } return 0; @@ -134,7 +125,7 @@ static int read_block(struct cxd *ci, u8 adr, u8 *data, u16 n) while (n) { int len = n; - if (ci->cfg.max_i2c && (len > ci->cfg.max_i2c)) + if (ci->cfg.max_i2c && len > ci->cfg.max_i2c) len = ci->cfg.max_i2c; status = i2c_read(ci->i2c, ci->cfg.adr, 1, data, len); if (status) @@ -591,7 +582,7 @@ static int campoll(struct cxd *ci) } } if ((istat & 8) && - (ci->slot_stat == DVB_CA_EN50221_POLL_CAM_PRESENT)) { + ci->slot_stat == DVB_CA_EN50221_POLL_CAM_PRESENT) { ci->ready = 1; ci->slot_stat |= DVB_CA_EN50221_POLL_CAM_READY; } diff --git a/drivers/staging/media/cxd2099/cxd2099.h b/drivers/staging/media/cxd2099/cxd2099.h index f4b29b1d6eb8..aba803268e94 100644 --- a/drivers/staging/media/cxd2099/cxd2099.h +++ b/drivers/staging/media/cxd2099/cxd2099.h @@ -3,23 +3,14 @@ * * Copyright (C) 2010-2011 Digital Devices GmbH * - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 only, as published by the Free Software Foundation. * - * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html */ #ifndef _CXD2099_H_ @@ -42,8 +33,9 @@ struct dvb_ca_en50221 *cxd2099_attach(struct cxd2099_cfg *cfg, void *priv, struct i2c_adapter *i2c); #else -static inline struct dvb_ca_en50221 *cxd2099_attach(struct cxd2099_cfg *cfg, - void *priv, struct i2c_adapter *i2c) +static inline struct +dvb_ca_en50221 *cxd2099_attach(struct cxd2099_cfg *cfg, void *priv, + struct i2c_adapter *i2c) { dev_warn(&i2c->dev, "%s: driver disabled by Kconfig\n", __func__); return NULL;