From patchwork Sat Aug 12 11:55:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 9897063 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 E5B25603B4 for ; Sat, 12 Aug 2017 11:56:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D775A28B11 for ; Sat, 12 Aug 2017 11:56:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC59028B86; Sat, 12 Aug 2017 11:56:47 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 5A9AE28B11 for ; Sat, 12 Aug 2017 11:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751819AbdHLL4p (ORCPT ); Sat, 12 Aug 2017 07:56:45 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32900 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751402AbdHLL4n (ORCPT ); Sat, 12 Aug 2017 07:56:43 -0400 Received: by mail-wm0-f67.google.com with SMTP id q189so9229478wmd.0 for ; Sat, 12 Aug 2017 04:56:43 -0700 (PDT) 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=BoLPjM3xtnJc5khTJhAeh4Zs1MoTTiUkH7fD1Xt711A=; b=UboUD7GCSdRjdmkpacHAMaMf95ay13Rc8UoqFD/n/HncApjtOKPSDPgwhKK9G1kPuv dyNMJmJhLJDTNDBK7fkd1FoQ/4OJBTu74CsYiqjFf/k359VPUESLZh1CCVvrGZf2VIXV gRa/gkzfPMfiDqAxqU1C6nXNuPB4JnnvSfCXSfLCsdMwIuPnvKgGddCMfBAyxNQH5R9L l/sfgKqmWlXHdnaDUVBHmCvI1yv8qZ5Qk61cvXdaZNryz0Dr22OvFI0FJUJ2JzWaqnpw R81bPQ7askD+lwAFsPGjpU5DN9eLK+ORYkHSmqQvSuY3AfiB3tDt4hGHqUVBwC5dRinN DkVQ== 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=BoLPjM3xtnJc5khTJhAeh4Zs1MoTTiUkH7fD1Xt711A=; b=UFkvVFUE6vq3fT5iV+D2KFf2jLJt8OYgrTQUDYR5AvD0PEKe3uZrUGOPe6hPkAzoNn V64TAZuRJZmgIV4DcF/NWpyZ4cG3UH8NqOgxOxd3fui2pctBA7nqll3y1eEQf/QcBMQw YZo0YATVzs1X8JR0Q7iGf8Xc6pBdap1rDN5DJ/W8uZUsDTR1EUbZ2fvIHRJEKCnffhyP jWi0vaLqoy6Elynwnn5pNnNgUahPPTkCm2wKbZjNWmQH2eHqUPaNZzBu31aWVnODKYX0 Mao/aqkTVNihPh59fFN5lqaeyxo1idm8mmrt3h6jeIJcS+eeunKBULPJ63bgXj2b2mZi 1s3g== X-Gm-Message-State: AHYfb5gEsucOloEA7vHGgOZuEzhMFu8LFTD/j9ahtCamk080YHkH28qn JgNNDs0qTcZdOod1 X-Received: by 10.28.66.147 with SMTP id k19mr953887wmi.31.1502539002404; Sat, 12 Aug 2017 04:56:42 -0700 (PDT) Received: from dvbdev.wuest.de (ip-84-118-193-88.unity-media.net. [84.118.193.88]) by smtp.gmail.com with ESMTPSA id d20sm2039546wrc.96.2017.08.12.04.56.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Aug 2017 04:56:42 -0700 (PDT) From: Daniel Scheller To: linux-media@vger.kernel.org, mchehab@kernel.org, mchehab@s-opensource.com Cc: r.scobie@clear.net.nz, jasmin@anw.at, d_spingler@freenet.de, Manfred.Knick@t-online.de, rjkm@metzlerbros.de Subject: [PATCH v4 07/11] [media] ddbridge: remove unreachable code Date: Sat, 12 Aug 2017 13:55:58 +0200 Message-Id: <20170812115602.18124-8-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170812115602.18124-1-d.scheller.oss@gmail.com> References: <20170812115602.18124-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 From smatch: drivers/media/pci/ddbridge/ddbridge-core.c:3490 snr_store() info: ignoring unreachable code. In fact, the function immediately returns zero, so remove it and update ddb_attrs_snr[] to not reference it anymore. Cc: Ralph Metzler Signed-off-by: Daniel Scheller Tested-by: Richard Scobie Tested-by: Jasmin Jessich Tested-by: Dietmar Spingler Tested-by: Manfred Knick --- drivers/media/pci/ddbridge/ddbridge-core.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index 5df942f4e388..747f3b317fb9 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -3092,25 +3092,6 @@ static ssize_t snr_show(struct device *device, return sprintf(buf, "%s\n", snr); } - -static ssize_t snr_store(struct device *device, struct device_attribute *attr, - const char *buf, size_t count) -{ - struct ddb *dev = dev_get_drvdata(device); - int num = attr->attr.name[3] - 0x30; - u8 snr[34] = { 0x01, 0x00 }; - - return 0; /* NOE: remove completely? */ - if (count > 31) - return -EINVAL; - if (dev->port[num].type >= DDB_TUNER_XO2) - return -EINVAL; - memcpy(snr + 2, buf, count); - i2c_write(&dev->i2c[num].adap, 0x57, snr, 34); - i2c_write(&dev->i2c[num].adap, 0x50, snr, 34); - return count; -} - static ssize_t bsnr_show(struct device *device, struct device_attribute *attr, char *buf) { @@ -3250,10 +3231,10 @@ static struct device_attribute ddb_attrs_fan[] = { }; static struct device_attribute ddb_attrs_snr[] = { - __ATTR(snr0, 0664, snr_show, snr_store), - __ATTR(snr1, 0664, snr_show, snr_store), - __ATTR(snr2, 0664, snr_show, snr_store), - __ATTR(snr3, 0664, snr_show, snr_store), + __ATTR_MRO(snr0, snr_show), + __ATTR_MRO(snr1, snr_show), + __ATTR_MRO(snr2, snr_show), + __ATTR_MRO(snr3, snr_show), }; static struct device_attribute ddb_attrs_ctemp[] = {