From nobody Sun Feb 8 03:27:25 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 C3AD41C84DC for ; Tue, 3 Feb 2026 04:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770094067; cv=none; b=BV5os5ISIADYvIixzCDaqYx29LXInUJ1+3/A8tjo3ErNhDRU0Wt2nIuZ1CHY6SF5owuZkN5U7udVysw1zSD9FDQtgyNVhz6RjJkeWQ6sxEHLqW4QBQkclgLjiUn9e4QWt9Oc93m2mqSvfZFni6LmQxDJOBT4rvYseZ6UHHJ/f10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770094067; c=relaxed/simple; bh=hwNItnnw9ihKndNzU/DeMWvoMF3si335m+ak60VRNN4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=R6AwTzn5Un4Odv5/jxtDho/PhM3IjzSsXSDi67y9BVk9nUX6aajYWKtM0TvPCzpUebcOLi2P+sZzha1yIwl98zAq/BhgJWgiZHZk/GsLF4ZFSRLJGh2V4HIpy2ISNhVIdJ/itS/KC7q8wBEeCiNilc2D9rgwFaQjSXE4uECUlEM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kbzdqzFH; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kbzdqzFH" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2a743050256so33024285ad.3 for ; Mon, 02 Feb 2026 20:47:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770094065; x=1770698865; 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=doaACG/D+VS8vv3mxSVPzZpMTEXTnbMFWjr/fZXYyuQ=; b=kbzdqzFHb1QZSNFnmT5cGppEAvmz4zqpplo6cN9gCG49yXApZPqaqI9Y21Na1dxVvI 2ppFDzbVfNc/fmvFWMlcYZ//8Vci80QpaTH3c0ZGgCULkLWER39KaeHereZteilUxF54 6nvLB5dBQLmGWKAH7NBX1lk6Yx1fGWqfd6aULPMX8cFMA/WljWdVGl4c/g1zA4QoZLxz 7vmUzZ2CsBOXP4pj6oShXSdAbpy/gwlfTAcHoJqGA4wWfU/ILbs16EBUClobpFMI38v9 /G9zuRYDYZ7t8C6szl6dBPLxVQt4ZB54J8Lfsfjl3emwEBLZe4D8f9ckL7h2AetQhOwk mRkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770094065; x=1770698865; 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=doaACG/D+VS8vv3mxSVPzZpMTEXTnbMFWjr/fZXYyuQ=; b=UHgnPz0yZn2gKdkR8KBeajgIKap1TweQMfQjhTqliRU1sDoWkHcJNqNhl0fnu6tjdE AlWO3uCXmK8jsYgHSbYnBh+is5r94w6YFNqRYo+PS+mFqgZdmhjC+q46V95FEmhwGE5g jFw9eN2FslMe22CuYq4u5R4kIatkidYI6TPGarNvuiU+ZJL39VrSp32fcae2MOKq2pRz 37YtC14udTHYDf5K3QUJiOa8MHd8igu73D2xNmF5lSifqhe9AoxpAcp1GOWIiepzH1E1 0bk0b8v7YaWKVsx+jpfUulqKtMrBTEBoqUlMxuPcn1HaMfR7JmK2Y3tOmTQQgberhu+5 SO8Q== X-Forwarded-Encrypted: i=1; AJvYcCUPOhu+jZ6/zCXnEeHF18a5KrB6ulLgMnK3k7nxZFeWj0kTFLO66mKVFO222ltYVRYfWKyUb9TB4RcesR4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5LwGFmlv8xOvtNrKrI+aTG9B7R6+gYNSC8rPR1KvaWIwhwo2F jGlBfR/uMMnnqTcYxvYCBANuayFosIN/vOC4dDA5/ANlVUUWzKDj5pRe X-Gm-Gg: AZuq6aJFerho4guyQM/FD2Go2b5n2rPdmnLdUQvXJr23ydjNWBuhe+hYamll1Rr7cWY 6Jp9iAIxU+lLqAOXfD2ZDYmMSPPjKHkb2sjUsxmoD4t76JJsKq5lyg7sxrgDm7xz1FFucBz6o2o Cx+SzIORlH10EStMoWy2/q/GjwoeshNmoGoZS/auKA4tpbcxt02zUZVC/7fqqI200xyKMivt3Yu DW1vLLD+GYYpDrdl3ldhbP8u1GIGUHe5SpWHMJGww0+NSquY2Sz+agEZXN5U+5g+an9sUWs93+a Q0dq7eCMc+CpAiJlVLK9EvkfumrGbi0rwxwe+oywxNr5ZszohBYk1l86o0Ys/28YkQFkYaQkgqO UeUvon6jr1RWIifpLc/XWONNduuvWH2Qc/eb/UqxPh4Kz814ZyFw5nUGQ+iWiiOF8/9T2guoS0U Vgym1AorSwr7TmDk63K87Qh9JfYbdL5nhePw== X-Received: by 2002:a17:903:1984:b0:2a7:3db0:6e1d with SMTP id d9443c01a7336-2a8d96a6af9mr100225895ad.9.1770094065094; Mon, 02 Feb 2026 20:47:45 -0800 (PST) Received: from krishna.. ([103.220.210.247]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a8ec56da60sm85791515ad.38.2026.02.02.20.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Feb 2026 20:47:44 -0800 (PST) From: KrishnaAgarwal1308 To: Andy Shevchenko , Greg Kroah-Hartman Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, KrishnaAgarwal1308 Subject: [PATCH] Revert "staging: fbtft: remove goto from define_fbtft_write_reg macro and clarify empty modifier fbtft-bus.c" Date: Tue, 3 Feb 2026 10:17:27 +0530 Message-ID: <20260203044728.23774-1-krishnaworkemail1308@gmail.com> X-Mailer: git-send-email 2.43.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" Replace the goto-based error handling in the define_fbtft_write_reg macro w= ith an early return while ensuring va_end() is called on all exit paths. Also add a short comment explaining the empty modifier argument used for native byte-order writes, instead of introducing an identity macro. No functional change intended. This reverts commit 6eec69e273e124dca8549fc52b0958b2953085ee. As per mainta= iner's feedback. Signed-off-by: Krishna Agarwal --- drivers/staging/fbtft/fbtft-bus.c | 41 ++++++++++++++++--------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtf= t-bus.c index 0ab4f5c4f886..9b9df0edc158 100644 --- a/drivers/staging/fbtft/fbtft-bus.c +++ b/drivers/staging/fbtft/fbtft-bus.c @@ -10,7 +10,6 @@ * void (*write_reg)(struct fbtft_par *par, int len, ...); * *************************************************************************= ****/ -#define fbtft_identity(x) (x) =20 #define define_fbtft_write_reg(func, buffer_type, data_type, modifier) = \ void func(struct fbtft_par *par, int len, ...) = \ @@ -43,28 +42,30 @@ void func(struct fbtft_par *par, int len, ...) = \ *buf =3D modifier((data_type)va_arg(args, unsigned int)); \ ret =3D fbtft_write_buf_dc(par, par->buf, sizeof(data_type) + offset, \ 0); \ - if (ret >=3D 0) { \ - len--; \ - \ - if (par->startbyte) \ - *(u8 *)par->buf =3D par->startbyte | 0x2; \ - \ - if (len) { \ - i =3D len; \ - while (i--) \ - *buf++ =3D modifier((data_type)va_arg(args, \ - unsigned int)); \ - fbtft_write_buf_dc(par, par->buf, \ - len * (sizeof(data_type) + offset), 1); \ - } \ - } \ - va_end(args); \ + if (ret < 0) { \ + va_end(args); \ + return; \ + } \ + len--; \ + \ + if (par->startbyte) \ + *(u8 *)par->buf =3D par->startbyte | 0x2; \ + \ + if (len) { \ + i =3D len; \ + while (i--) \ + *buf++ =3D modifier((data_type)va_arg(args, \ + unsigned int)); \ + fbtft_write_buf_dc(par, par->buf, \ + len * (sizeof(data_type) + offset), 1); \ + } \ + va_end(args); \ } = \ EXPORT_SYMBOL(func); - -define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, u8, fbtft_identity) +/* No modifier --> No byte-conversion is needed, data in native byte order= */ +define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, u8, ) define_fbtft_write_reg(fbtft_write_reg16_bus8, __be16, u16, cpu_to_be16) -define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, u16, fbtft_identity) +define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, u16, ) =20 void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) { --=20 2.43.0