From patchwork Mon Sep 27 12:20:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 514683 Delivered-To: patch@linaro.org Received: by 2002:a17:906:f46:0:0:0:0 with SMTP id h6csp3882958ejj; Mon, 27 Sep 2021 05:20:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypFljrq8b3iDhN7Hn4tuG71ugW2m3168+bLfG5h1MZCGhXo+7T/C+hPD28t3GGW/fPrB2g X-Received: by 2002:a17:906:4452:: with SMTP id i18mr25340333ejp.374.1632745230084; Mon, 27 Sep 2021 05:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632745230; cv=none; d=google.com; s=arc-20160816; b=ouypmdG1q3Ewh3NVHeLDXI2Gxk5idXeY/f8V9qEVii6h0FRcS5PsoLw3/M6D9zf80T ZbNkMPfLuqhVS1pDhjQr6xaDNymXdNixXjiFetVB7veUSHV26+JRSg9613HBbPSl3lgy uGzd7ZAmBfuthDevdl73BB4cjexD3fvXFrySQBy4ulOUYABfpnuPOwInW6lGUtbB9uOx voXZg1GBbgx+n+w9XzwErl7XdW4Be1pNxOL06gcfmfDJKH0uua+e3fY6srAJjauQo5b6 fBsXj+FmAUD7Q578AwoR9NZD88NLJeAvpzWk3kkeat0Xt39Lb47n2VNKgKCCr+XFg1x1 LJVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZuSJxsUrgNpH/ApD3xxi8+e0jCNCr6UK+fNfej2B+X8=; b=Tj1T/rNBliSS/cmUMWxVh30wtmHpXWxJwjGeJSx4YhdX+MUgG+5ZMOWKKY9dZnceyt 5frbzFtZXjpIu9zJ2YlXzrxnhxhvtNsYzn7l6JC/NUCtGKR7TgWqgXzkoiVZ6gEf3KrS cM8T/PDVipZcC2NQt7E5/bgyRLznzSKX6L1HPN6+MTkJvMlwremQGcKc7ZjU2EW6/y+g zNe3qSOiRdW3mJkQv1huKVnLnDSRJvShzWQIkqB1O8zvS1Ieh8fR77XvrcoMy6zFB4pK n815Vo+gW6Xi0pZqHWzYQxWtYwjo3r8E0+edeBDVWLG4b1/9pJpH9fzSeSWzdSfjOTXJ fZsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kvk395jT; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 7si17023040ejd.0.2021.09.27.05.20.29; Mon, 27 Sep 2021 05:20:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kvk395jT; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234265AbhI0MWG (ORCPT + 4 others); Mon, 27 Sep 2021 08:22:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:45018 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234073AbhI0MWF (ORCPT ); Mon, 27 Sep 2021 08:22:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 719DE61074; Mon, 27 Sep 2021 12:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632745228; bh=jhCTgeMjDAgbXS4PhsYSF1UKTXtXCFTpi/I5crQIPYQ=; h=From:To:Cc:Subject:Date:From; b=Kvk395jTUE93EswOaTpjw8khOLF9oZ4j5V5Hg11Q0KLOkDZZ3Bb0OTDWfO99SXd2C vAPojKCdaumtc3MwO0et5/x8HwLFuGVwR3BSNeknv7nw7NPaeI556r1ShAcZ6+ZZrS ZV3tlSOpK3xNAKsrMTFTJIYvictjp3ZDY65+Kl0yiENDOxYUoU2t2iWAaxeKql3pI4 vihCyWv+nEyBcIagH/lvuXJl4SNiuu/yh3rjM9ZxomVj+Modduj3gCtR+kiYmgi0mG lDASZGYXmtwu2t6EJpmXrvPncsrjWhaFtKRJj/qdGpsYViBQ+sPNTKZnHDGHcHtATk KXo151FMbP4Ag== From: Arnd Bergmann To: Olivier Lorin , Hans Verkuil , Mauro Carvalho Chehab , Nathan Chancellor , Nick Desaulniers Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] media: gspca/gl860-mi1320: avoid -Wstring-concatenation warning Date: Mon, 27 Sep 2021 14:20:18 +0200 Message-Id: <20210927122024.941874-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Arnd Bergmann Newer clang versions are suspicious of definitions that mix concatenated strings with comma-separated arrays of strings, this has found real bugs elsewhere, but this seems to be a false positive: drivers/media/usb/gspca/gl860/gl860-mi1320.c:62:37: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation] "\xd3\x02\xd4\x28\xd5\x01\xd0\x02" "\xd1\x18\xd2\xc1" ^ , drivers/media/usb/gspca/gl860/gl860-mi1320.c:62:2: note: place parentheses around the string literal to silence warning "\xd3\x02\xd4\x28\xd5\x01\xd0\x02" "\xd1\x18\xd2\xc1" Use the extra parentheses as suggested in the warning message. Signed-off-by: Arnd Bergmann --- drivers/media/usb/gspca/gl860/gl860-mi1320.c | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.29.2 diff --git a/drivers/media/usb/gspca/gl860/gl860-mi1320.c b/drivers/media/usb/gspca/gl860/gl860-mi1320.c index 0749fe13160f..1253eb145c99 100644 --- a/drivers/media/usb/gspca/gl860/gl860-mi1320.c +++ b/drivers/media/usb/gspca/gl860/gl860-mi1320.c @@ -49,44 +49,44 @@ static struct validx tbl_post_unset_alt[] = { {0x0061, 0x0000}, {0x0068, 0x000d}, }; -static u8 *tbl_1280[] = { +static u8 *tbl_1280[] = {( "\x0d\x80\xf1\x08\x03\x04\xf1\x00" "\x04\x05\xf1\x02\x05\x00\xf1\xf1" "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08" "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00" "\xa9\x04\xf1\x00\xa1\x05\xf1\x00" "\xa4\x04\xf1\x00\xae\x0a\xf1\x08" - , + ), ( "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47" "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c" "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01" - , + ), ( "\xd3\x02\xd4\x28\xd5\x01\xd0\x02" "\xd1\x18\xd2\xc1" -}; +)}; -static u8 *tbl_800[] = { +static u8 *tbl_800[] = { ( "\x0d\x80\xf1\x08\x03\x03\xf1\xc0" "\x04\x05\xf1\x02\x05\x00\xf1\xf1" "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08" "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00" "\xa9\x03\xf1\xc0\xa1\x03\xf1\x20" "\xa4\x02\xf1\x5a\xae\x0a\xf1\x08" - , + ), ( "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47" "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c" "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01" - , + ), ( "\xd3\x02\xd4\x18\xd5\x21\xd0\x02" "\xd1\x10\xd2\x59" -}; +)}; -static u8 *tbl_640[] = { +static u8 *tbl_640[] = {( "\x0d\x80\xf1\x08\x03\x04\xf1\x04" "\x04\x05\xf1\x02\x07\x01\xf1\x7c" "\x08\x00\xf1\x0e\x21\x80\xf1\x00" "\x0d\x00\xf1\x08\xf0\x00\xf1\x01" "\x34\x10\xf1\x10\x3a\x43\xf1\x00" "\xa6\x05\xf1\x02\xa9\x04\xf1\x04" "\xa7\x02\xf1\x81\xaa\x01\xf1\xe2" "\xae\x0c\xf1\x09" - , + ), ( "\xf0\x00\xf1\x02\x39\x03\xf1\xfc" "\x3b\x04\xf1\x04\x57\x01\xf1\xb6" "\x58\x02\xf1\x0d\x5c\x1f\xf1\x19" "\x5d\x24\xf1\x1e\x64\x5e\xf1\x1c" "\xd2\x00\xf1\x00\xcb\x00\xf1\x01" - , + ), ( "\xd3\x02\xd4\x10\xd5\x81\xd0\x02" "\xd1\x08\xd2\xe1" -}; +)}; static s32 tbl_sat[] = {0x25, 0x1d, 0x15, 0x0d, 0x05, 0x4d, 0x55, 0x5d, 0x2d}; static s32 tbl_bright[] = {0, 8, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70};