From: Greg Kroah-Hartman Date: Thu, 2 Feb 2017 15:14:40 +0000 (+0100) Subject: more 3.18 warning fixes. X-Git-Tag: v4.9.8~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6880e4ea610c755ba8e90fa11255c8cac8a0f329;p=thirdparty%2Fkernel%2Fstable-queue.git more 3.18 warning fixes. --- diff --git a/queue-3.18/alsa-oxygen-fix-logical-not-parentheses-warning.patch b/queue-3.18/alsa-oxygen-fix-logical-not-parentheses-warning.patch new file mode 100644 index 00000000000..53021946d27 --- /dev/null +++ b/queue-3.18/alsa-oxygen-fix-logical-not-parentheses-warning.patch @@ -0,0 +1,31 @@ +From 8ec7cfce3762299ae289c384e281b2f4010ae231 Mon Sep 17 00:00:00 2001 +From: Tomer Barletz +Date: Sun, 2 Aug 2015 02:08:57 -0700 +Subject: ALSA: oxygen: Fix logical-not-parentheses warning + +From: Tomer Barletz + +commit 8ec7cfce3762299ae289c384e281b2f4010ae231 upstream. + +This fixes the following warning, that is seen with gcc 5.1: +warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]. + +Signed-off-by: Tomer Barletz +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/oxygen/oxygen_mixer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/oxygen/oxygen_mixer.c ++++ b/sound/pci/oxygen/oxygen_mixer.c +@@ -88,7 +88,7 @@ static int dac_mute_put(struct snd_kcont + int changed; + + mutex_lock(&chip->mutex); +- changed = !value->value.integer.value[0] != chip->dac_mute; ++ changed = (!value->value.integer.value[0]) != chip->dac_mute; + if (changed) { + chip->dac_mute = !value->value.integer.value[0]; + chip->model.update_dac_mute(chip); diff --git a/queue-3.18/ata-hpt366-fix-constant-cast-warning.patch b/queue-3.18/ata-hpt366-fix-constant-cast-warning.patch new file mode 100644 index 00000000000..4f37f71090b --- /dev/null +++ b/queue-3.18/ata-hpt366-fix-constant-cast-warning.patch @@ -0,0 +1,52 @@ +From 6ec0a86c645be3fce7ade42f165a6a417c3503b1 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Tue, 19 May 2015 16:34:05 +0200 +Subject: ata: hpt366: fix constant cast warning + +From: Arnd Bergmann + +commit 6ec0a86c645be3fce7ade42f165a6a417c3503b1 upstream. + +gcc-5.x warns about a preexisting problem in the hpt36x pata driver: + +drivers/ata/pata_hpt366.c: In function 'hpt36x_init_one': +drivers/ata/pata_hpt366.c:376:9: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers] + +Other ata drivers have the same problem, as ata_pci_bmdma_init_one +takes a non-const pointer, and they solve it by using a cast to +turn that pointer into a normal non-const pointer. + +I also tried to change the ata core code to make host->private_data +a const pointer, but that quickly got out of hand, as some other +drivers expect it to be writable, so I ended up using the same +hack as the others here. + +Signed-off-by: Arnd Bergmann +Acked-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/pata_hpt366.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/ata/pata_hpt366.c ++++ b/drivers/ata/pata_hpt366.c +@@ -352,7 +352,7 @@ static int hpt36x_init_one(struct pci_de + }; + const struct ata_port_info *ppi[] = { &info_hpt366, NULL }; + +- void *hpriv = NULL; ++ const void *hpriv = NULL; + u32 reg1; + int rc; + +@@ -383,7 +383,7 @@ static int hpt36x_init_one(struct pci_de + break; + } + /* Now kick off ATA set up */ +- return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, hpriv, 0); ++ return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, (void *)hpriv, 0); + } + + #ifdef CONFIG_PM_SLEEP diff --git a/queue-3.18/bluetooth-make-hci_test_bit-s-addr-const.patch b/queue-3.18/bluetooth-make-hci_test_bit-s-addr-const.patch new file mode 100644 index 00000000000..646ecb225d2 --- /dev/null +++ b/queue-3.18/bluetooth-make-hci_test_bit-s-addr-const.patch @@ -0,0 +1,48 @@ +From 9391976a4da0d2a30abdb8d2704cfc7bf4bf9aab Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Thu, 19 Feb 2015 15:20:43 +0100 +Subject: Bluetooth: make hci_test_bit's addr const +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jiri Slaby + +commit 9391976a4da0d2a30abdb8d2704cfc7bf4bf9aab upstream. + +gcc5 warns about passing a const array to hci_test_bit which takes a +non-const pointer: +net/bluetooth/hci_sock.c: In function ‘hci_sock_sendmsg’: +net/bluetooth/hci_sock.c:955:8: warning: passing argument 2 of ‘hci_test_bit’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-array-qualifiers] + &hci_sec_filter.ocf_mask[ogf])) && + ^ +net/bluetooth/hci_sock.c:49:19: note: expected ‘void *’ but argument is of type ‘const __u32 (*)[4] {aka const unsigned int (*)[4]}’ + static inline int hci_test_bit(int nr, void *addr) + ^ + +So make 'addr' 'const void *'. + +Signed-off-by: Jiri Slaby +Signed-off-by: Marcel Holtmann +Cc: Gustavo Padovan +Cc: Johan Hedberg +Signed-off-by: Greg Kroah-Hartman + +--- + net/bluetooth/hci_sock.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/net/bluetooth/hci_sock.c ++++ b/net/bluetooth/hci_sock.c +@@ -46,9 +46,9 @@ struct hci_pinfo { + unsigned short channel; + }; + +-static inline int hci_test_bit(int nr, void *addr) ++static inline int hci_test_bit(int nr, const void *addr) + { +- return *((__u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31)); ++ return *((const __u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31)); + } + + /* Security filter */ diff --git a/queue-3.18/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch b/queue-3.18/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch new file mode 100644 index 00000000000..68c79c1831b --- /dev/null +++ b/queue-3.18/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch @@ -0,0 +1,31 @@ +From 09a5c34e8d6b05663ec4c3d22b1fbd9fec89aaf9 Mon Sep 17 00:00:00 2001 +From: James C Boyd +Date: Wed, 27 May 2015 17:09:06 -0500 +Subject: HID: hid-input: Add parentheses to quell gcc warning + +From: James C Boyd + +commit 09a5c34e8d6b05663ec4c3d22b1fbd9fec89aaf9 upstream. + +GCC reports a -Wlogical-not-parentheses warning here; therefore +add parentheses to shut it up and to express our intent more. + +Signed-off-by: James C Boyd +Signed-off-by: Jiri Kosina +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hid/hid-input.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/hid/hid-input.c ++++ b/drivers/hid/hid-input.c +@@ -1122,7 +1122,7 @@ void hidinput_hid_event(struct hid_devic + return; + + /* report the usage code as scancode if the key status has changed */ +- if (usage->type == EV_KEY && !!test_bit(usage->code, input->key) != value) ++ if (usage->type == EV_KEY && (!!test_bit(usage->code, input->key)) != value) + input_event(input, EV_MSC, MSC_SCAN, usage->hid); + + input_event(input, usage->type, usage->code, value); diff --git a/queue-3.18/netfilter-fix-switch-statement-warnings-with-recent-gcc.patch b/queue-3.18/netfilter-fix-switch-statement-warnings-with-recent-gcc.patch new file mode 100644 index 00000000000..8552c77d96b --- /dev/null +++ b/queue-3.18/netfilter-fix-switch-statement-warnings-with-recent-gcc.patch @@ -0,0 +1,121 @@ +From c1f866767777d1c6abae0ec57effffcb72017c00 Mon Sep 17 00:00:00 2001 +From: David Miller +Date: Tue, 7 Apr 2015 23:05:42 -0400 +Subject: netfilter: Fix switch statement warnings with recent gcc. + +From: David Miller + +commit c1f866767777d1c6abae0ec57effffcb72017c00 upstream. + +More recent GCC warns about two kinds of switch statement uses: + +1) Switching on an enumeration, but not having an explicit case + statement for all members of the enumeration. To show the + compiler this is intentional, we simply add a default case + with nothing more than a break statement. + +2) Switching on a boolean value. I think this warning is dumb + but nevertheless you get it wholesale with -Wswitch. + +This patch cures all such warnings in netfilter. + +Signed-off-by: David S. Miller +Acked-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman + +--- + net/bridge/netfilter/nft_reject_bridge.c | 2 ++ + net/ipv4/netfilter/nft_reject_ipv4.c | 2 ++ + net/ipv6/netfilter/nft_reject_ipv6.c | 2 ++ + net/netfilter/nft_compat.c | 6 +++--- + net/netfilter/nft_ct.c | 8 ++++++++ + 5 files changed, 17 insertions(+), 3 deletions(-) + +--- a/net/bridge/netfilter/nft_reject_bridge.c ++++ b/net/bridge/netfilter/nft_reject_bridge.c +@@ -375,6 +375,8 @@ static int nft_reject_bridge_dump(struct + if (nla_put_u8(skb, NFTA_REJECT_ICMP_CODE, priv->icmp_code)) + goto nla_put_failure; + break; ++ default: ++ break; + } + + return 0; +--- a/net/ipv4/netfilter/nft_reject_ipv4.c ++++ b/net/ipv4/netfilter/nft_reject_ipv4.c +@@ -32,6 +32,8 @@ void nft_reject_ipv4_eval(const struct n + case NFT_REJECT_TCP_RST: + nf_send_reset(pkt->skb, pkt->ops->hooknum); + break; ++ default: ++ break; + } + + data[NFT_REG_VERDICT].verdict = NF_DROP; +--- a/net/ipv6/netfilter/nft_reject_ipv6.c ++++ b/net/ipv6/netfilter/nft_reject_ipv6.c +@@ -34,6 +34,8 @@ void nft_reject_ipv6_eval(const struct n + case NFT_REJECT_TCP_RST: + nf_send_reset6(net, pkt->skb, pkt->ops->hooknum); + break; ++ default: ++ break; + } + + data[NFT_REG_VERDICT].verdict = NF_DROP; +--- a/net/netfilter/nft_compat.c ++++ b/net/netfilter/nft_compat.c +@@ -277,11 +277,11 @@ static void nft_match_eval(const struct + return; + } + +- switch(ret) { +- case true: ++ switch (ret ? 1 : 0) { ++ case 1: + data[NFT_REG_VERDICT].verdict = NFT_CONTINUE; + break; +- case false: ++ case 0: + data[NFT_REG_VERDICT].verdict = NFT_BREAK; + break; + } +--- a/net/netfilter/nft_ct.c ++++ b/net/netfilter/nft_ct.c +@@ -56,6 +56,8 @@ static void nft_ct_get_eval(const struct + state = NF_CT_STATE_BIT(ctinfo); + dest->data[0] = state; + return; ++ default: ++ break; + } + + if (ct == NULL) +@@ -117,6 +119,8 @@ static void nft_ct_get_eval(const struct + return; + } + #endif ++ default: ++ break; + } + + tuple = &ct->tuplehash[priv->dir].tuple; +@@ -141,6 +145,8 @@ static void nft_ct_get_eval(const struct + case NFT_CT_PROTO_DST: + dest->data[0] = (__force __u16)tuple->dst.u.all; + return; ++ default: ++ break; + } + return; + err: +@@ -172,6 +178,8 @@ static void nft_ct_set_eval(const struct + } + break; + #endif ++ default: ++ break; + } + } + diff --git a/queue-3.18/series b/queue-3.18/series index 7d5860166b0..6af3651e820 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -4,3 +4,8 @@ atm-iphase-fix-misleading-indention.patch paride-fix-the-verbose-module-param.patch net-caif-fix-misleading-indentation.patch disable-frame-address-warning.patch +netfilter-fix-switch-statement-warnings-with-recent-gcc.patch +bluetooth-make-hci_test_bit-s-addr-const.patch +ata-hpt366-fix-constant-cast-warning.patch +hid-hid-input-add-parentheses-to-quell-gcc-warning.patch +alsa-oxygen-fix-logical-not-parentheses-warning.patch