From: Daniel Scheller <d.scheller.oss@gmail.com>
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 [thread overview]
Message-ID: <20170812115602.18124-8-d.scheller.oss@gmail.com> (raw)
In-Reply-To: <20170812115602.18124-1-d.scheller.oss@gmail.com>
From: Daniel Scheller <d.scheller@gmx.net>
>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 <rjkm@metzlerbros.de>
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Tested-by: Richard Scobie <r.scobie@clear.net.nz>
Tested-by: Jasmin Jessich <jasmin@anw.at>
Tested-by: Dietmar Spingler <d_spingler@freenet.de>
Tested-by: Manfred Knick <Manfred.Knick@t-online.de>
---
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[] = {
--
2.13.0
next prev parent reply other threads:[~2017-08-12 11:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-12 11:55 [PATCH v4 00/11] ddbridge: bump to ddbridge-0.9.29 Daniel Scheller
2017-08-12 11:55 ` [PATCH v4 01/11] [media] ddbridge: bump ddbridge code to version 0.9.29 Daniel Scheller
2017-08-12 11:55 ` [PATCH v4 02/11] [media] ddbridge: split I/O related functions off from ddbridge.h Daniel Scheller
2017-08-12 11:55 ` [PATCH v4 03/11] [media] ddbridge: split off hardware definitions and mappings Daniel Scheller
2017-08-12 11:55 ` [PATCH v4 04/11] [media] ddbridge: check pointers before dereferencing Daniel Scheller
2017-08-12 11:55 ` [PATCH v4 05/11] [media] ddbridge: only register frontends in fe2 if fe is not NULL Daniel Scheller
2017-08-12 11:55 ` [PATCH v4 06/11] [media] ddbridge: fix possible buffer overflow in ddb_ports_init() Daniel Scheller
2017-08-12 11:55 ` Daniel Scheller [this message]
2017-08-12 11:55 ` [PATCH v4 08/11] [media] ddbridge: fix impossible condition warning Daniel Scheller
2017-08-12 11:56 ` [PATCH v4 09/11] [media] ddbridge: fix dereference before check Daniel Scheller
2017-08-12 11:56 ` [PATCH v4 10/11] [media] ddbridge: Kconfig option to control the MSI modparam default Daniel Scheller
2017-08-12 11:56 ` [PATCH v4 11/11] [media] MAINTAINERS: add entry for ddbridge Daniel Scheller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170812115602.18124-8-d.scheller.oss@gmail.com \
--to=d.scheller.oss@gmail.com \
--cc=Manfred.Knick@t-online.de \
--cc=d_spingler@freenet.de \
--cc=jasmin@anw.at \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mchehab@s-opensource.com \
--cc=r.scobie@clear.net.nz \
--cc=rjkm@metzlerbros.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).