From patchwork Thu Oct 29 21:22:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 7521191 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 225759F37F for ; Thu, 29 Oct 2015 21:23:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6789A2060A for ; Thu, 29 Oct 2015 21:23:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8749020617 for ; Thu, 29 Oct 2015 21:23:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964942AbbJ2VXp (ORCPT ); Thu, 29 Oct 2015 17:23:45 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:32979 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758096AbbJ2VXk (ORCPT ); Thu, 29 Oct 2015 17:23:40 -0400 Received: by wijp11 with SMTP id p11so298574526wij.0 for ; Thu, 29 Oct 2015 14:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-type:content-transfer-encoding; bh=dJBNFRpEXxy5lAZqvUR481WkyaSpn+zRIk0wRD87Ig0=; b=Ayl3/RB+OUuiZUa0qpavSxlVGROH3bQBCdNPkY6rIxeYnSYsZdy6Arx6Nqv9teyKfy +Y3vFJDkv4xlIvi2Me0cv8dpyC5nTVVCJoKatcKgdiSrl4XxXMsPOdIdB+JTl3Sz1D5f YYKw8k7Wm6eRroWJGZ6XdPbB1G+zXrUjsOE7yn4QGsK4YNujPzxDOt6RK5cYrixtuU2o XUc8OswYKchbgJfp5fhJXyZ4NiJfEOwJq2jlb7YBa+l8iG7c2sQJtmO5KlOLkubQq0Hl hnPxNKe9K/fr6QUd6H1QR1ZoTNvX8TYkF+nAW1ZQx5zNyPz0ShvbF/nIxIvIh2dBWiDg tFQQ== X-Received: by 10.194.186.238 with SMTP id fn14mr5116417wjc.128.1446153819560; Thu, 29 Oct 2015 14:23:39 -0700 (PDT) Received: from ?IPv6:2003:62:5f55:ba00:14ec:a654:7de1:4720? (p200300625F55BA0014ECA6547DE14720.dip0.t-ipconnect.de. [2003:62:5f55:ba00:14ec:a654:7de1:4720]) by smtp.googlemail.com with ESMTPSA id p2sm3715979wjb.21.2015.10.29.14.23.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 29 Oct 2015 14:23:39 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 5/9] media: rc: nuvoton-cir: make nvt_hw_detect void To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Message-ID: <56328DF8.1050007@gmail.com> Date: Thu, 29 Oct 2015 22:22:00 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 nvt_hw_detect always returns 0, therefore make it return void. Signed-off-by: Heiner Kallweit --- drivers/media/rc/nuvoton-cir.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c index c5c238b..df4b9cb 100644 --- a/drivers/media/rc/nuvoton-cir.c +++ b/drivers/media/rc/nuvoton-cir.c @@ -250,7 +250,7 @@ static inline const char *nvt_find_chip(struct nvt_dev *nvt, int id) /* detect hardware features */ -static int nvt_hw_detect(struct nvt_dev *nvt) +static void nvt_hw_detect(struct nvt_dev *nvt) { const char *chip_name; int chip_id; @@ -281,8 +281,6 @@ static int nvt_hw_detect(struct nvt_dev *nvt) chip_name, nvt->chip_major, nvt->chip_minor); nvt_efm_disable(nvt); - - return 0; } static void nvt_cir_ldev_init(struct nvt_dev *nvt) @@ -1024,9 +1022,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) init_waitqueue_head(&nvt->tx.queue); - ret = nvt_hw_detect(nvt); - if (ret) - goto exit_free_dev_rdev; + nvt_hw_detect(nvt); /* Initialize CIR & CIR Wake Logical Devices */ nvt_efm_enable(nvt);