summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Scheller <d.scheller@gmx.net>2017-08-12 14:55:58 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-20 14:08:12 +0300
commit1bdafdf02711c18b54e4d981b96dc0abe9503668 (patch)
tree27db591b83f512ee0aee87a8d48d57c46b963046
parent8ac9fd4348677cb2ead6776b9f8042c952a3f67c (diff)
downloadlinux-1bdafdf02711c18b54e4d981b96dc0abe9503668.tar.xz
media: ddbridge: remove unreachable code
>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> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/pci/ddbridge/ddbridge-core.c27
1 files 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[] = {