[PATCH RESEND 10/14] [media] ddbridge: remove unreachable code

Daniel Scheller
2017-07-23T18:16:46Z

>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 5f8f77c74339..2479cb70743e 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -3235,25 +3235,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)
{
@@ -3393,10 +3374,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