Skip to contentSkip to conversation

drm/vmwgfx: remove unused mksstat_init_record function

PATCH In review Tom Rix 3 participants 3 messages Mar 24, 2023 – Apr 11, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 drm/vmwgfx: remove unused mksstat_init_record function

clang with W=1 reports drivers/gpu/drm/vmwgfx/vmwgfx_msg.c:716:21: error: unused function
'mksstat_init_record' [-Werror,-Wunused-function]
static inline char *mksstat_init_record(mksstat_kern_stats_t stat_idx,

                    ^

This function is not used so remove it.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 26 --------------------------
 1 file changed, 26 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +0 -26
index e76976a95a1e..ca1a3fe44fa5 100644
@@ -702,32 +702,6 @@ static inline void hypervisor_ppn_remove(PPN64 pfn)
 /* Header to the text description of mksGuestStat instance descriptor */
 #define MKSSTAT_KERNEL_DESCRIPTION "vmwgfx"
 
-/**
- * mksstat_init_record: Initializes an MKSGuestStatCounter-based record
- * for the respective mksGuestStat index.
- *
- * @stat_idx: Index of the MKSGuestStatCounter-based mksGuestStat record.
- * @pstat: Pointer to array of MKSGuestStatCounterTime.
- * @pinfo: Pointer to array of MKSGuestStatInfoEntry.
- * @pstrs: Pointer to current end of the name/description sequence.
- * Return: Pointer to the new end of the names/description sequence.
- */
-
-static inline char *mksstat_init_record(mksstat_kern_stats_t stat_idx,
-	MKSGuestStatCounterTime *pstat, MKSGuestStatInfoEntry *pinfo, char *pstrs)
-{
-	char *const pstrd = pstrs + strlen(mksstat_kern_name_desc[stat_idx][0]) + 1;
-	strcpy(pstrs, mksstat_kern_name_desc[stat_idx][0]);
-	strcpy(pstrd, mksstat_kern_name_desc[stat_idx][1]);
-
-	pinfo[stat_idx].name.s = pstrs;
-	pinfo[stat_idx].description.s = pstrd;
-	pinfo[stat_idx].flags = MKS_GUEST_STAT_FLAG_NONE;
-	pinfo[stat_idx].stat.counter = (MKSGuestStatCounter *)&pstat[stat_idx];
-
-	return pstrd + strlen(mksstat_kern_name_desc[stat_idx][1]) + 1;
-}
-
 /**
  * mksstat_init_record_time: Initializes an MKSGuestStatCounterTime-based record
  * for the respective mksGuestStat index.
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 32 lines · Tom Rix

clang with W=1 reports drivers/gpu/drm/vmwgfx/vmwgfx_msg.c:716:21: error: unused function
'mksstat_init_record' [-Werror,-Wunused-function]
static inline char *mksstat_init_record(mksstat_kern_stats_t stat_idx,

                    ^

This function is not used so remove it.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 26 --------------------------
 1 file changed, 26 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +0 -11
index e76976a95a1e..ca1a3fe44fa5 100644
@@ -702,32 +702,6 @@ static inline void hypervisor_ppn_remove(PPN64 pfn)
 /* Header to the text description of mksGuestStat instance descriptor */
 #define MKSSTAT_KERNEL_DESCRIPTION "vmwgfx"
 
-/**
- * mksstat_init_record: Initializes an MKSGuestStatCounter-based record
- * for the respective mksGuestStat index.
- *
- * @stat_idx: Index of the MKSGuestStatCounter-based mksGuestStat record.
- * @pstat: Pointer to array of MKSGuestStatCounterTime.
- * @pinfo: Pointer to array of MKSGuestStatInfoEntry.
- * @pstrs: Pointer to current end of the name/description sequence.
- * Return: Pointer to the new end of the names/description sequence.
- */
-

drivers/gpu/drm/vmwgfx/vmwgfx_msg.c static inline void hypervisor_ppn_remove(PPN64 pfn) · line 725

Quoted 10 lines
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +0 -10
-static inline char *mksstat_init_record(mksstat_kern_stats_t stat_idx,
-       MKSGuestStatCounterTime *pstat, MKSGuestStatInfoEntry *pinfo, char *pstrs)
-{
-       char *const pstrd = pstrs + strlen(mksstat_kern_name_desc[stat_idx][0]) + 1;
-       strcpy(pstrs, mksstat_kern_name_desc[stat_idx][0]);
-       strcpy(pstrd, mksstat_kern_name_desc[stat_idx][1]);
-
-       pinfo[stat_idx].name.s = pstrs;
-       pinfo[stat_idx].description.s = pstrd;
-       pinfo[stat_idx].flags = MKS_GUEST_STAT_FLAG_NONE;

This was the last user of MKS_GUEST_STAT_FLAG_NONE, is there anything else to clean up there? Otherwise LGTM.

Quoted 11 lines
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +0 -6
-       pinfo[stat_idx].stat.counter = (MKSGuestStatCounter *)&pstat[stat_idx];
-
-       return pstrd + strlen(mksstat_kern_name_desc[stat_idx][1]) + 1;
-}
-
 /**
  * mksstat_init_record_time: Initializes an MKSGuestStatCounterTime-based record
  * for the respective mksGuestStat index.
--

2.27.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
In reply to Tom Rix
Quoted 8 lines · Tom Rix

clang with W=1 reports drivers/gpu/drm/vmwgfx/vmwgfx_msg.c:716:21: error: unused function 'mksstat_init_record' [-Werror,-Wunused-function]
static inline char *mksstat_init_record(mksstat_kern_stats_t stat_idx, ^
This function is not used so remove it.

Thanks, Martin Krastev already sent the same patch to the dri-devel two weeks before. It's in the drm-misc-next branch in the drm-misc tree and should migrate to kernel for 6.4.

z