From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f44.google.com (mail-dl1-f44.google.com [74.125.82.44]) (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 D4CEE2FF147 for ; Sun, 8 Feb 2026 18:43:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770576231; cv=none; b=Qrdye41xHSnfHWIRHyI+TpZf8jxnWi0mUaf/3wM+QLVcTuQE9OpwG9GuZprEHnl60tJumFOICbgGhsOaRPcVf9M+Ve6txlqG24vR/ThoKh4oiVZ+NOwkOP6L6bmXJxC0oRfg0xDOv1EL4KzuJ/j+3i32BlLhL1Mkg/nfMDkQUO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770576231; c=relaxed/simple; bh=ztlA0KZ1Gd072nNLXAWAiF2b3jjDuS3qJqKHNuPm3wM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CKFlqpQP0xCA57zeFpDOP6hjOGAzmcFUTt2zUUR3trgu9/5061V5TB6JRTpwF9+LeooKCwOpfV07ReKb0B11lbeR1DyM1zrSGqZIlX9p8JZm1WdkeDWuMHPxcx4xcEVTde1WMUJnI3H3/yeL/t/DtM/Wswpz7blsubMO+c7Ae60= 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=MhmQ7YqH; arc=none smtp.client-ip=74.125.82.44 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="MhmQ7YqH" Received: by mail-dl1-f44.google.com with SMTP id a92af1059eb24-1233b953bebso463518c88.1 for ; Sun, 08 Feb 2026 10:43:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770576230; x=1771181030; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ID1rfm++j/UqADYRjwMhyhPNrd9J6q0fUTI3o2f/FN4=; b=MhmQ7YqHzg4Fy9Yb7i0Rs2JC/mjsshQKZCELpw+LnOkNxY6EKkj64KlPvk4crrTICO br4iZfyUuCeaztSC3bJZI/LHkxZ68Pt/R6Zs/m5FGMonxPd7AkH8RmrVsUsp+mGynesB 0LXpfRdmEw836A7hV2T7Mo+ZZDhRz1CMB/GFNuGy7HWdQ0Dp6j480A2T7jFfPnJ05m8+ OVZnxLPBO5IQJDt5UYf9mZdZ31Fs+JqCmJyXRzhAyHpJ33Pudw5jYt2oXSbCn9G/eB/7 +fz0ACCpGWalaMsAI5ucoG8C+EZQegGftnrnGkTMWvoDUMThx0inABCiYaUWlXwR1nUo 01OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770576230; x=1771181030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ID1rfm++j/UqADYRjwMhyhPNrd9J6q0fUTI3o2f/FN4=; b=waP9t0c7pzrRcBcH0via4OtnVEZ3e96OcSitlyESJMs6esaG0wfsbwvWP4rMogCKfG w890FRcs8eBGhYzbkkXLdMI5GGrxRfPhZqbaPfxybMqAwqDTxH2AAid9WRTn0+0ibVT5 jqvn0IhAUbSuC4xCgJUpuY63XAQAYcQbmXCMUJiwCAreVpaIjfsIcSCxUi5iVfTtXecQ SasmRWpxxKXF7djnxMjl8IVS3cGsoxRpumjFqCyzG0BwPFQm9WPK0eQIyhfR+Bbz9e5E rZMOrCHklLZm3GKn5pK9T1vXWAISZDKRKkXUI/ortCVSEwQHMdIWjocYZ7yE5prCrMNl yhWw== X-Forwarded-Encrypted: i=1; AJvYcCVxSTATn95ITaOaFxO4L3CkPZV1P+327Ekd0lhBWCPas2I8IvFTGTH/ReHQ7fPQX05OacPbZ91XRsysbx4=@vger.kernel.org X-Gm-Message-State: AOJu0YzTh8vdLL0cFZ3QBldcqmfkmlZNfgXJ5klB63qgsQ9RXq3Qx/SL ORUQ3yYh75sj+yTmN2dMl5Mby6S/GBhsvxehe346IvqIateJsE6ORG0EjjsPPYUMMQCz X-Gm-Gg: AZuq6aJw0lCCFPbJKzdYeOyiAw2IYde9kDykO3geO7IZsoa8z4tzouLudWWczhk35RQ 652LisKBMf0Q1aKcu5WaV3DL+mxNPv12f/lazs1FV6aEQiuQWr6rjx2wzuDcJCpkTpEfbd2kR75 rW4Byk6a2fEClEdguTuIaVI/uE19M7zfG4HNJm3S+FPA5axgEn2mx0Axj50+SFgpJzrlmw5Zwhk zrSt4sDCIoZW7ScabsDxxls7K50MFlBL31EZjn67Pv+KqZGKF1xNllMnVzqog3Z+nYsAv6MF/8u eOuqcMlOqMDD0eUmzVecTqdUBWccXyYql10lTfCu+UzSxGFkKluaXWfeHzA/xtFmRS4PwYSacZ9 Dw6PX/uO5EKRmzAlOEruLgX1KYnNQNu4c40EU/GalMNZzHIli5u/t2hmm1skLLAlmaDtV+7MYot Q+381YcVqAexsnaIGIa6PKQtE= X-Received: by 2002:a05:7022:2527:b0:119:e56b:c74d with SMTP id a92af1059eb24-12704003783mr5713338c88.18.1770576229850; Sun, 08 Feb 2026 10:43:49 -0800 (PST) Received: from arch ([2601:647:6980:8130::7378]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1270d8e25f1sm5268865c88.9.2026.02.08.10.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Feb 2026 10:43:49 -0800 (PST) From: Shreyas Ravi To: sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, gregkh@linuxfoundation.org Cc: linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Shreyas Ravi Subject: [PATCH v4 2/2] staging: sm750fb: remove Hungarian notation prefixes Date: Sun, 8 Feb 2026 10:43:44 -0800 Message-ID: <20260208184344.657617-2-shreyasravi320@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260208184344.657617-1-shreyasravi320@gmail.com> References: <2026020842-litigator-flatworm-65d0@gregkh> <20260208184344.657617-1-shreyasravi320@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Remove Hungarian notation prefixes from variable names to comply with kernel coding style. No functional changes. Signed-off-by: Shreyas Ravi --- Changes in v4: - Fix merge conflicts (forgot to do in v3) Changes in v3: - Added changelog (was missing in v2) Changes in v2: - Split original patch into two patches per Greg's feedback - This patch addresses Hungarian prefix removal --- drivers/staging/sm750fb/sm750.c | 22 ++++++------ drivers/staging/sm750fb/sm750.h | 6 ++-- drivers/staging/sm750fb/sm750_accel.c | 48 +++++++++++++-------------- drivers/staging/sm750fb/sm750_accel.h | 2 +- drivers/staging/sm750fb/sm750_hw.c | 20 +++++------ 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 1ed7ff57c142..afcfc9e6c207 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -624,27 +624,27 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output->paths = sm750_pnc; crtc->channel = sm750_primary; crtc->o_screen = 0; - crtc->v_screen = sm750_dev->p_v_mem; + crtc->v_screen = sm750_dev->v_mem; pr_info("use simul primary mode\n"); break; case sm750_simul_sec: output->paths = sm750_pnc; crtc->channel = sm750_secondary; crtc->o_screen = 0; - crtc->v_screen = sm750_dev->p_v_mem; + crtc->v_screen = sm750_dev->v_mem; break; case sm750_dual_normal: if (par->index == 0) { output->paths = sm750_panel; crtc->channel = sm750_primary; crtc->o_screen = 0; - crtc->v_screen = sm750_dev->p_v_mem; + crtc->v_screen = sm750_dev->v_mem; } else { output->paths = sm750_crt; crtc->channel = sm750_secondary; /* not consider of padding stuffs for o_screen,need fix */ crtc->o_screen = sm750_dev->vidmem_size >> 1; - crtc->v_screen = sm750_dev->p_v_mem + crtc->o_screen; + crtc->v_screen = sm750_dev->v_mem + crtc->o_screen; } break; case sm750_dual_swap: @@ -652,7 +652,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output->paths = sm750_panel; crtc->channel = sm750_secondary; crtc->o_screen = 0; - crtc->v_screen = sm750_dev->p_v_mem; + crtc->v_screen = sm750_dev->v_mem; } else { output->paths = sm750_crt; crtc->channel = sm750_primary; @@ -660,7 +660,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par) * need fix */ crtc->o_screen = sm750_dev->vidmem_size >> 1; - crtc->v_screen = sm750_dev->p_v_mem + crtc->o_screen; + crtc->v_screen = sm750_dev->v_mem + crtc->o_screen; } break; default: @@ -764,14 +764,14 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) * must be set after crtc member initialized */ crtc->cursor.offset = crtc->o_screen + crtc->vidmem_size - 1024; - crtc->cursor.mmio = sm750_dev->p_v_reg + + crtc->cursor.mmio = sm750_dev->v_reg + 0x800f0 + (int)crtc->channel * 0x140; pr_info("crtc->cursor.mmio = %p\n", crtc->cursor.mmio); crtc->cursor.max_h = 64; crtc->cursor.max_w = 64; crtc->cursor.size = crtc->cursor.max_h * crtc->cursor.max_w * 2 / 8; - crtc->cursor.vstart = sm750_dev->p_v_mem + crtc->cursor.offset; + crtc->cursor.vstart = sm750_dev->v_mem + crtc->cursor.offset; memset_io(crtc->cursor.vstart, 0, crtc->cursor.size); if (!g_hwcursor) @@ -1090,7 +1090,7 @@ static int lynxfb_pci_probe(struct pci_dev *pdev, sm750_dev->mtrr.vram = arch_phys_wc_add(sm750_dev->vidmem_start, sm750_dev->vidmem_size); - memset_io(sm750_dev->p_v_mem, 0, sm750_dev->vidmem_size); + memset_io(sm750_dev->v_mem, 0, sm750_dev->vidmem_size); pci_set_drvdata(pdev, sm750_dev); @@ -1121,8 +1121,8 @@ static void lynxfb_pci_remove(struct pci_dev *pdev) sm750fb_framebuffer_release(sm750_dev); arch_phys_wc_del(sm750_dev->mtrr.vram); - iounmap(sm750_dev->p_v_reg); - iounmap(sm750_dev->p_v_mem); + iounmap(sm750_dev->v_reg); + iounmap(sm750_dev->v_mem); kfree(g_settings); } diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index 14e0e7d75f7e..077dde6d6113 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -72,7 +72,7 @@ struct lynx_accel { u32 width, u32 height, u32 rop2); - int (*de_imageblit)(struct lynx_accel *accel, const char *p_srcbuf, + int (*de_imageblit)(struct lynx_accel *accel, const char *srcbuf, u32 src_delta, u32 start_bit, u32 d_base, u32 d_pitch, u32 byte_per_pixel, u32 dx, u32 dy, u32 width, u32 height, u32 f_color, u32 b_color, u32 rop2); @@ -97,8 +97,8 @@ struct sm750_dev { unsigned long vidreg_start; __u32 vidmem_size; __u32 vidreg_size; - void __iomem *p_v_reg; - unsigned char __iomem *p_v_mem; + void __iomem *v_reg; + unsigned char __iomem *v_mem; /* locks*/ spinlock_t slock; diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c index b95b15128759..a1daeaff3c28 100644 --- a/drivers/staging/sm750fb/sm750_accel.c +++ b/drivers/staging/sm750fb/sm750_accel.c @@ -134,22 +134,22 @@ int sm750_hw_fillrect(struct lynx_accel *accel, * @accel: Acceleration device data * @source_base: Address of source: offset in frame buffer * @source_pitch: Pitch value of source surface in BYTE - * @sx: Starting x coordinate of source surface - * @sy: Starting y coordinate of source surface + * @source_x: Starting x coordinate of source surface + * @source_y: Starting y coordinate of source surface * @dest_base: Address of destination: offset in frame buffer * @dest_pitch: Pitch value of destination surface in BYTE * @bytes_per_pixel: Color depth of destination surface - * @dx: Starting x coordinate of destination surface - * @dy: Starting y coordinate of destination surface + * @dest_x: Starting x coordinate of destination surface + * @dest_y: Starting y coordinate of destination surface * @width: width of rectangle in pixel value * @height: height of rectangle in pixel value * @rop2: ROP value */ int sm750_hw_copyarea(struct lynx_accel *accel, unsigned int source_base, unsigned int source_pitch, - unsigned int sx, unsigned int sy, + unsigned int source_x, unsigned int source_y, unsigned int dest_base, unsigned int dest_pitch, - unsigned int bytes_per_pixel, unsigned int dx, unsigned int dy, + unsigned int bytes_per_pixel, unsigned int dest_x, unsigned int dest_y, unsigned int width, unsigned int height, unsigned int rop2) { @@ -162,7 +162,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel, /* If source and destination are the same surface, need to check for overlay cases */ if (source_base == dest_base && source_pitch == dest_pitch) { /* Determine direction of operation */ - if (sy < dy) { + if (source_y < dest_y) { /* +----------+ * |S | * | +----------+ @@ -174,7 +174,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel, */ direction = BOTTOM_TO_TOP; - } else if (sy > dy) { + } else if (source_y > dest_y) { /* +----------+ * |D | * | +----------+ @@ -187,9 +187,9 @@ int sm750_hw_copyarea(struct lynx_accel *accel, direction = TOP_TO_BOTTOM; } else { - /* sy == dy */ + /* source_y == dest_y */ - if (sx <= dx) { + if (source_x <= dest_x) { /* +------+---+------+ * |S | | D| * | | | | @@ -200,7 +200,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel, direction = RIGHT_TO_LEFT; } else { - /* sx > dx */ + /* source_x > dest_x */ /* +------+---+------+ * |D | | S| @@ -216,10 +216,10 @@ int sm750_hw_copyarea(struct lynx_accel *accel, } if ((direction == BOTTOM_TO_TOP) || (direction == RIGHT_TO_LEFT)) { - sx += width - 1; - sy += height - 1; - dx += width - 1; - dy += height - 1; + source_x += width - 1; + source_y += height - 1; + dest_x += width - 1; + dest_y += height - 1; } /* @@ -267,11 +267,11 @@ int sm750_hw_copyarea(struct lynx_accel *accel, return -1; write_dpr(accel, DE_SOURCE, - ((sx << DE_SOURCE_X_K1_SHIFT) & DE_SOURCE_X_K1_MASK) | - (sy & DE_SOURCE_Y_K2_MASK)); /* dpr0 */ + ((source_x << DE_SOURCE_X_K1_SHIFT) & DE_SOURCE_X_K1_MASK) | + (source_y & DE_SOURCE_Y_K2_MASK)); /* dpr0 */ write_dpr(accel, DE_DESTINATION, - ((dx << DE_DESTINATION_X_SHIFT) & DE_DESTINATION_X_MASK) | - (dy & DE_DESTINATION_Y_MASK)); /* dpr04 */ + ((dest_x << DE_DESTINATION_X_SHIFT) & DE_DESTINATION_X_MASK) | + (dest_y & DE_DESTINATION_Y_MASK)); /* dpr04 */ write_dpr(accel, DE_DIMENSION, ((width << DE_DIMENSION_X_SHIFT) & DE_DIMENSION_X_MASK) | (height & DE_DIMENSION_Y_ET_MASK)); /* dpr08 */ @@ -307,8 +307,8 @@ static unsigned int de_get_transparency(struct lynx_accel *accel) * @dest_base: Address of destination: offset in frame buffer * @dest_pitch: Pitch value of destination surface in BYTE * @byte_per_pixel: Color depth of destination surface - * @dx: Starting x coordinate of destination surface - * @dy: Starting y coordinate of destination surface + * @dest_x: Starting x coordinate of destination surface + * @dest_y: Starting y coordinate of destination surface * @width: width of rectangle in pixel value * @height: height of rectangle in pixel value * @fg_color: Foreground color (corresponding to a 1 in the monochrome data @@ -317,7 +317,7 @@ static unsigned int de_get_transparency(struct lynx_accel *accel) */ int sm750_hw_imageblit(struct lynx_accel *accel, const char *src_buf, u32 src_delta, u32 start_bit, u32 dest_base, u32 dest_pitch, - u32 byte_per_pixel, u32 dx, u32 dy, u32 width, + u32 byte_per_pixel, u32 dest_x, u32 dest_y, u32 width, u32 height, u32 fg_color, u32 bg_color, u32 rop2) { unsigned int bytes_per_scan; @@ -377,8 +377,8 @@ int sm750_hw_imageblit(struct lynx_accel *accel, const char *src_buf, DE_SOURCE_X_K1_MONO_MASK); /* dpr00 */ write_dpr(accel, DE_DESTINATION, - ((dx << DE_DESTINATION_X_SHIFT) & DE_DESTINATION_X_MASK) | - (dy & DE_DESTINATION_Y_MASK)); /* dpr04 */ + ((dest_x << DE_DESTINATION_X_SHIFT) & DE_DESTINATION_X_MASK) | + (dest_y & DE_DESTINATION_Y_MASK)); /* dpr04 */ write_dpr(accel, DE_DIMENSION, ((width << DE_DIMENSION_X_SHIFT) & DE_DIMENSION_X_MASK) | diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index 59e679961e96..00a6a022e17e 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h @@ -235,7 +235,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel, * @bg_color: Background color (corresponding to a 0 in the monochrome data * @rop2: ROP value */ -int sm750_hw_imageblit(struct lynx_accel *accel, const char *p_srcbuf, +int sm750_hw_imageblit(struct lynx_accel *accel, const char *srcbuf, u32 src_delta, u32 start_bit, u32 dest_base, u32 dest_pitch, u32 byte_per_pixel, u32 dx, u32 dy, u32 width, u32 height, u32 fg_color, u32 bg_color, u32 rop2); diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index 4e2ca7263254..b8bc55ba3c54 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c @@ -49,19 +49,19 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) } /* now map mmio and vidmem */ - sm750_dev->p_v_reg = + sm750_dev->v_reg = ioremap(sm750_dev->vidreg_start, sm750_dev->vidreg_size); - if (!sm750_dev->p_v_reg) { + if (!sm750_dev->v_reg) { pr_err("mmio failed\n"); ret = -EFAULT; goto exit; } - pr_info("mmio virtual addr = %p\n", sm750_dev->p_v_reg); + pr_info("mmio virtual addr = %p\n", sm750_dev->v_reg); - sm750_dev->accel.dpr_base = sm750_dev->p_v_reg + DE_BASE_ADDR_TYPE1; - sm750_dev->accel.dp_port_base = sm750_dev->p_v_reg + DE_PORT_ADDR_TYPE1; + sm750_dev->accel.dpr_base = sm750_dev->v_reg + DE_BASE_ADDR_TYPE1; + sm750_dev->accel.dp_port_base = sm750_dev->v_reg + DE_PORT_ADDR_TYPE1; - mmio750 = sm750_dev->p_v_reg; + mmio750 = sm750_dev->v_reg; sm750_set_chip_type(sm750_dev->devid, sm750_dev->revid); sm750_dev->vidmem_start = pci_resource_start(pdev, 0); @@ -76,15 +76,15 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) sm750_dev->vidmem_start, sm750_dev->vidmem_size); /* reserve the vidmem space of smi adaptor */ - sm750_dev->p_v_mem = + sm750_dev->v_mem = ioremap_wc(sm750_dev->vidmem_start, sm750_dev->vidmem_size); - if (!sm750_dev->p_v_mem) { - iounmap(sm750_dev->p_v_reg); + if (!sm750_dev->v_mem) { + iounmap(sm750_dev->v_reg); pr_err("Map video memory failed\n"); ret = -EFAULT; goto exit; } - pr_info("video memory vaddr = %p\n", sm750_dev->p_v_mem); + pr_info("video memory vaddr = %p\n", sm750_dev->v_mem); exit: return ret; } -- 2.53.0