From patchwork Sat Dec 6 21:34:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 5450551 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 42A4B9F47A for ; Sat, 6 Dec 2014 21:35:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FD9220142 for ; Sat, 6 Dec 2014 21:35:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27F6F20154 for ; Sat, 6 Dec 2014 21:35:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752575AbaLFVfc (ORCPT ); Sat, 6 Dec 2014 16:35:32 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:34434 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752563AbaLFVfQ (ORCPT ); Sat, 6 Dec 2014 16:35:16 -0500 Received: from dyn3-82-128-190-178.psoas.suomi.net ([82.128.190.178] helo=localhost.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1XxN0U-0000aF-Uj; Sat, 06 Dec 2014 23:35:14 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari Subject: [PATCH 22/22] si2157: change firmware variable name and type Date: Sat, 6 Dec 2014 23:34:56 +0200 Message-Id: <1417901696-5517-22-git-send-email-crope@iki.fi> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1417901696-5517-1-git-send-email-crope@iki.fi> References: <1417901696-5517-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.190.178 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename firmware variable from fw_file to fw_name and change its type from u8 to const char as request_firmware() input is. Signed-off-by: Antti Palosaari --- drivers/media/tuners/si2157.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index 27b488b..fcf139d 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c @@ -82,7 +82,7 @@ static int si2157_init(struct dvb_frontend *fe) int ret, len, remaining; struct si2157_cmd cmd; const struct firmware *fw; - u8 *fw_file; + const char *fw_name; unsigned int chip_id; dev_dbg(&client->dev, "\n"); @@ -123,12 +123,12 @@ static int si2157_init(struct dvb_frontend *fe) switch (chip_id) { case SI2158_A20: case SI2148_A20: - fw_file = SI2158_A20_FIRMWARE; + fw_name = SI2158_A20_FIRMWARE; break; case SI2157_A30: case SI2147_A30: case SI2146_A10: - fw_file = NULL; + fw_name = NULL; break; default: dev_err(&client->dev, "unknown chip version Si21%d-%c%c%c\n", @@ -141,27 +141,27 @@ static int si2157_init(struct dvb_frontend *fe) dev_info(&client->dev, "found a 'Silicon Labs Si21%d-%c%c%c'\n", cmd.args[2], cmd.args[1], cmd.args[3], cmd.args[4]); - if (fw_file == NULL) + if (fw_name == NULL) goto skip_fw_download; /* request the firmware, this will block and timeout */ - ret = request_firmware(&fw, fw_file, &client->dev); + ret = request_firmware(&fw, fw_name, &client->dev); if (ret) { dev_err(&client->dev, "firmware file '%s' not found\n", - fw_file); + fw_name); goto err; } /* firmware should be n chunks of 17 bytes */ if (fw->size % 17 != 0) { dev_err(&client->dev, "firmware file '%s' is invalid\n", - fw_file); + fw_name); ret = -EINVAL; goto err_release_firmware; } dev_info(&client->dev, "downloading firmware from file '%s'\n", - fw_file); + fw_name); for (remaining = fw->size; remaining > 0; remaining -= 17) { len = fw->data[fw->size - remaining];