From nobody Sat Jun 27 16:16:19 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CF66325706 for ; Mon, 8 Jun 2026 15:16:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780931802; cv=none; b=mQ1Hl5HO1eeRs20qf1mh8PCkQztDJ8SivEOQje9IgerGZopyJNQI9FDD9w3s7O3fBFrP9SeBEKlUcLAB74yaIG0P3xU7FKsVfTGoSkGZcAlWPo2mEx2VAEmkEYk24Dekl97OnBlgbQzesTaimAIQzARSPoK733SkiVbBp/9zJYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780931802; c=relaxed/simple; bh=+Adic+T2znQgdxxRgMuzaFBipB4oYX5M3eDjZE8lqw0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rDQz5PomsT/YX0Cl2Ou+PWSq7E3JaGZeRh4X9Sv3coAmVJGBhA277bjRarSMYiAEUAYa5UTA5OyUVkS1HEMWI3m2E1h/7FK0pxSrhjGBJvuLd79tU58s0e67c0p5WtKYVj37xW6OQ1JhXmcNVSbqmJDDyxRQ8MAPFyN2QEII4tA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tumelty.co.uk; spf=none smtp.mailfrom=tumelty.co.uk; dkim=pass (2048-bit key) header.d=tumelty-co-uk.20251104.gappssmtp.com header.i=@tumelty-co-uk.20251104.gappssmtp.com header.b=IOLpcz2t; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tumelty.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=tumelty.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tumelty-co-uk.20251104.gappssmtp.com header.i=@tumelty-co-uk.20251104.gappssmtp.com header.b="IOLpcz2t" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-490be29c1c5so57684275e9.2 for ; Mon, 08 Jun 2026 08:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tumelty-co-uk.20251104.gappssmtp.com; s=20251104; t=1780931799; x=1781536599; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=eVHQVd8Cibi1FnHd10mOaHGzwUNox/elwnpPYgAowKg=; b=IOLpcz2tVIL24+bIrc2TfFrURulFH8YRSssokXKG7VPmEzya9P4POnuZBezN/1Cp9O VXSb/WAoA/Aok10CBld4jevsOdM7s4o8xy3JAlOm7/hW4zgyJ/nCyyxvEL6NlqlVEmJ7 xAnoniMBwRXdEVFis+n2WBLMjSBbcEgGWI76EHyPzu+QTI2Q8VaN3PQNM3/39PVqmtsU Is9LZbBeRkY18wjlu/I3egPc8CqkQc/EWTAlh4Dhczfu8ThjWm3Ke216Vk8wIoqtbJt8 pYDyZAZmkmn9vRmbDAOJy0x+V3KkfoG2UvuejqOvxTvP/GEGSPOZrk+Lzv/GcG9vFdbz abKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780931799; x=1781536599; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=eVHQVd8Cibi1FnHd10mOaHGzwUNox/elwnpPYgAowKg=; b=MXZrBxnueUCakQov8ZNATfBg5ttMHeldb/sykQlo/nFDJNyyegus23OSLXb4+tWwR9 6lbfggFR96vQrGuA1owk5lSoK+t7R/D+MBwKZVaWlsjVwTZg0x+H+IzftbWvikWDQC8k pYe7bhHNgUqHlfvxIkGUgRtrvdEWuwyLrR0p1CoIKZG19QHTjdHaNps9JXKPpK40m7tn 2zxgihFtn/CZ2nJqkwxD9A1cmRkXBK2+rQKMVyUQRKtSlGtFNb/Hl81c01kh0CMWMcvF cz7bnZT8gB6nzSHCZjWTprKLYAepfg6yWKbdVPO78x22m9ByR5m5Qbr+nclp73MgYOKm BAmw== X-Forwarded-Encrypted: i=1; AFNElJ/b7d8VlAu7VrhlqaTMB+9AMmI2YFJPubsZ87vgSPHvR1SLzEBGUxCvpwCB01WYZZfl0BAkCi9zZSJI0kg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0wOYur7bCdrS1FPxnjtnAVggUBC2TUkoNr2Eu4f/VGDtCsPBx dt5vx79X1xKtrmSFVhD12WasN3hs/BVKj5JzC2UZcrJ0Q9Dl9V3QEjNI25FZuQHQSkA= X-Gm-Gg: Acq92OFZ0FjUikjXgL4W7LHrueWdOhmy3dvaaYKgE2lVIZzDYyx/zkUJhS6eXQbvkGT 2LDWdz7/t8xGqhJmMrN1SnOTsD/IDTicZnBYZfPnqtaoA/c63tDq709AeuwHzVT8rEYgnrFHImx 5YES5tE5cOv7b8onnnnc3xppU98HVkgb54MYxuSsb+/y6i2z4zoqROG7L34kE+mF6oG0jEUnaNq bogEpcQuBUoNRRkJF3UAK3jFoey3nAWkmGMbBungNzWB91y2uJC9XSEk3DqZ3u4Bv71DpKdwExj E/b01l6i0NlW4KLXQARLWRI7XKQVIdfE9vUa20i7aqCquu2UmfZqWVI9iPMhepwdQxnPBc/gVKS hDjAU1oiHksgZQe2coHKrBlNwsc0hMpx6xdxW+CARXMLZF1zyykMIUsL3K4+e9lRHwfP7cUZOx8 00hFXbhYlDt7w3S44Ffwuv5AM= X-Received: by 2002:a05:600c:a302:b0:490:c2a3:1781 with SMTP id 5b1f17b1804b1-490c2a317c3mr208748495e9.34.1780931798525; Mon, 08 Jun 2026 08:16:38 -0700 (PDT) Received: from nixos ([83.217.168.175]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f35fd33sm58630734f8f.35.2026.06.08.08.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 08:16:38 -0700 (PDT) From: Rhys Tumelty To: Hans de Goede , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: Andy Shevchenko , Sakari Ailus , Dan Carpenter , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Rhys Tumelty Subject: [PATCH] staging: media: atomisp: fix variable shadowing warnings Date: Mon, 8 Jun 2026 16:16:17 +0100 Message-ID: <20260608151617.3393471-1-rhys@tumelty.co.uk> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix local variable shadowing warnings, flagged by a W=3D2 kernel build, due to -Werror=3Dshadow. In atomisp_css_stop(), an inner loop 'i' index shadows an outer unsigned int i. Rename the inner loop index to 'k' In ia_css_stream_create(), the block-local 'effective_res' struct shadows an outer local declaration. Rename the block scoped instance in the loop over pipes to 'pipe_effective_res' to clearly show context. Signed-off-by: Rhys Tumelty --- .../media/atomisp/pci/atomisp_compat_css20.c | 6 +++--- drivers/staging/media/atomisp/pci/sh_css.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/dri= vers/staging/media/atomisp/pci/atomisp_compat_css20.c index be5f37f4a6fd..da945fddb5ea 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c @@ -1775,10 +1775,10 @@ void atomisp_css_stop(struct atomisp_sub_device *as= d, bool in_reset) =20 if (!in_reset) { struct atomisp_stream_env *stream_env; - int i, j; + int k, j; =20 - for (i =3D 0; i < ATOMISP_INPUT_STREAM_NUM; i++) { - stream_env =3D &asd->stream_env[i]; + for (k =3D 0; k < ATOMISP_INPUT_STREAM_NUM; k++) { + stream_env =3D &asd->stream_env[k]; for (j =3D 0; j < IA_CSS_PIPE_ID_NUM; j++) { ia_css_pipe_config_defaults( &stream_env->pipe_configs[j]); diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/m= edia/atomisp/pci/sh_css.c index cd1be313c758..44c77179abb8 100644 --- a/drivers/staging/media/atomisp/pci/sh_css.c +++ b/drivers/staging/media/atomisp/pci/sh_css.c @@ -7971,22 +7971,22 @@ ia_css_stream_create(const struct ia_css_stream_con= fig *stream_config, } =20 for (i =3D 0; i < num_pipes; i++) { - struct ia_css_resolution effective_res; + struct ia_css_resolution pipe_effective_res; =20 curr_pipe =3D pipes[i]; /* set current stream */ curr_pipe->stream =3D curr_stream; /* take over effective info */ =20 - effective_res =3D curr_pipe->config.input_effective_res; - if (effective_res.height =3D=3D 0 || effective_res.width =3D=3D 0) { - effective_res =3D curr_pipe->stream->config.input_config.effective_res; + pipe_effective_res =3D curr_pipe->config.input_effective_res; + if (pipe_effective_res.height =3D=3D 0 || pipe_effective_res.width =3D= =3D 0) { + pipe_effective_res =3D curr_pipe->stream->config.input_config.effective= _res; =20 - curr_pipe->config.input_effective_res =3D effective_res; + curr_pipe->config.input_effective_res =3D pipe_effective_res; } IA_CSS_LOG("effective_res=3D%dx%d", - effective_res.width, - effective_res.height); + pipe_effective_res.width, + pipe_effective_res.height); } =20 err =3D ia_css_stream_isp_parameters_init(curr_stream); --=20 2.54.0