media: rc-main: clean-up two warnings
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 23 May 2019 09:27:30 +0000 (05:27 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 23 May 2019 17:39:21 +0000 (13:39 -0400)
While correct, the code is too complex for smatch to undersdand
that protocol will always be initialized:

drivers/media/rc/rc-main.c:1531 store_wakeup_protocols() error: uninitialized symbol 'protocol'.
drivers/media/rc/rc-main.c:1541 store_wakeup_protocols() error: uninitialized symbol 'protocol'.

So, change it a little bit in order to avoid such warning.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Acked-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/rc/rc-main.c

index be5fd12..13da4c5 100644 (file)
@@ -1502,7 +1502,7 @@ static ssize_t store_wakeup_protocols(struct device *device,
                                      const char *buf, size_t len)
 {
        struct rc_dev *dev = to_rc_dev(device);
-       enum rc_proto protocol;
+       enum rc_proto protocol = RC_PROTO_UNKNOWN;
        ssize_t rc;
        u64 allowed;
        int i;
@@ -1511,9 +1511,7 @@ static ssize_t store_wakeup_protocols(struct device *device,
 
        allowed = dev->allowed_wakeup_protocols;
 
-       if (sysfs_streq(buf, "none")) {
-               protocol = RC_PROTO_UNKNOWN;
-       } else {
+       if (!sysfs_streq(buf, "none")) {
                for (i = 0; i < ARRAY_SIZE(protocols); i++) {
                        if ((allowed & (1ULL << i)) &&
                            sysfs_streq(buf, protocols[i].name)) {