Drivers: hv: Change hv_free_hyperv_page() to take void * argument
Subsystems (3)
PATCH v2 1/1 Drivers: hv: Change hv_free_hyperv_page() to take void * argument
Currently hv_free_hyperv_page() takes an unsigned long argument, which is inconsistent with the void * return value from the corresponding hv_alloc_hyperv_page() function and variants. This creates unnecessary extra casting.
Change the hv_free_hyperv_page() argument type to void *. Also remove redundant casts from invocations of hv_alloc_hyperv_page() and variants.
---
V1 -> V2: Added Signed-off-by
drivers/hv/connection.c | 13 ++++++------- drivers/hv/hv_common.c | 10 +++++----- include/asm-generic/mshyperv.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-)
drivers/hv/connection.c +6 -7
@@ -209,8 +209,7 @@ int vmbus_connect(void)* Setup the vmbus event connection for channel interrupt * abstraction stuff */ - vmbus_connection.int_page = - (void *)hv_alloc_hyperv_zeroed_page (); + vmbus_connection.int_page =hv_alloc_hyperv_zeroed_page ();if (vmbus_connection.int_page ==NULL ) { ret = -ENOMEM ; goto cleanup;
@@ -225,8 +224,8 @@ int vmbus_connect(void)* Setup the monitor notification facility. The 1st page for * parent->child and the 2nd page for child->parent */ - vmbus_connection.monitor_pages[0 ] = (void *)hv_alloc_hyperv_page (); - vmbus_connection.monitor_pages[1 ] = (void *)hv_alloc_hyperv_page (); + vmbus_connection.monitor_pages[0 ] =hv_alloc_hyperv_page (); + vmbus_connection.monitor_pages[1 ] =hv_alloc_hyperv_page ();if ((vmbus_connection.monitor_pages[0 ] ==NULL ) || (vmbus_connection.monitor_pages[1 ] ==NULL )) { ret = -ENOMEM ;
@@ -333,15 +332,15 @@ void vmbus_disconnect(void)destroy_workqueue (vmbus_connection.work_queue);if (vmbus_connection.int_page) { -hv_free_hyperv_page ((unsigned long )vmbus_connection.int_page); +hv_free_hyperv_page (vmbus_connection.int_page); vmbus_connection.int_page =NULL ; }set_memory_encrypted ((unsigned long )vmbus_connection.monitor_pages[0 ],1 );set_memory_encrypted ((unsigned long )vmbus_connection.monitor_pages[1 ],1 ); -hv_free_hyperv_page ((unsigned long )vmbus_connection.monitor_pages[0 ]); -hv_free_hyperv_page ((unsigned long )vmbus_connection.monitor_pages[1 ]); +hv_free_hyperv_page (vmbus_connection.monitor_pages[0 ]); +hv_free_hyperv_page (vmbus_connection.monitor_pages[1 ]); vmbus_connection.monitor_pages[0 ] =NULL ; vmbus_connection.monitor_pages[1 ] =NULL ; }
drivers/hv/hv_common.c +5 -5
@@ -115,12 +115,12 @@ void *hv_alloc_hyperv_zeroed_page(void) }EXPORT_SYMBOL_GPL (hv_alloc_hyperv_zeroed_page); -void hv_free_hyperv_page (unsigned long addr) +void hv_free_hyperv_page (void *addr) {if (PAGE_SIZE ==HV_HYP_PAGE_SIZE ) -free_page (addr); +free_page ((unsigned long )addr);else -kfree ((void *)addr); +kfree (addr); }EXPORT_SYMBOL_GPL (hv_free_hyperv_page);
@@ -253,7 +253,7 @@ static void hv_kmsg_dump_unregister(void)atomic_notifier_chain_unregister (&panic_notifier_list, &hyperv_panic_report_block); -hv_free_hyperv_page ((unsigned long )hv_panic_page); +hv_free_hyperv_page (hv_panic_page); hv_panic_page =NULL ; }
@@ -270,7 +270,7 @@ static void hv_kmsg_dump_register(void) ret =kmsg_dump_register (&hv_kmsg_dumper);if (ret) {pr_err ("Hyper-V: kmsg dump register error 0x%x\n" , ret); -hv_free_hyperv_page ((unsigned long )hv_panic_page); +hv_free_hyperv_page (hv_panic_page); hv_panic_page =NULL ; } }
include/asm-generic/mshyperv.h +1 -1
@@ -190,7 +190,7 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)void *hv_alloc_hyperv_page (void );void *hv_alloc_hyperv_zeroed_page (void ); -void hv_free_hyperv_page (unsigned long addr); +void hv_free_hyperv_page (void *addr);/** * hv_cpu_number_to_vp_number() - Map CPU to VP.
Signature · 1 line
1.8.3.1
Quoted 8 lines
From: Kameron Carr <[email protected]>
Sent: Friday, June 23, 2023 3:10 PM
...
Currentlyhv_free_hyperv_page()takes an unsigned long argument, which is inconsistent with the void * return value from the correspondinghv_alloc_hyperv_page()function and variants. This creates unnecessary extra casting.
Quoted 7 lines
Change the
hv_free_hyperv_page()argument type to void *. Also remove redundant casts from invocations ofhv_alloc_hyperv_page()and variants.Signed-off-by Kameron Carr <[email protected]>---
V1 -> V2: Added Signed-off-by
Quoted 113 lines · Kameron Carr
Currently
hv_free_hyperv_page()takes an unsigned long argument, which is inconsistent with the void * return value from the correspondinghv_alloc_hyperv_page()function and variants. This creates unnecessary extra casting.Change the
hv_free_hyperv_page()argument type to void *. Also remove redundant casts from invocations ofhv_alloc_hyperv_page()and variants.Signed-off-by Kameron Carr <[email protected]>---
V1 -> V2: Added Signed-off-bydrivers/hv/connection.c | 13 ++++++------- drivers/hv/hv_common.c | 10 +++++----- include/asm-generic/mshyperv.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-)drivers/hv/connection.c +6
-7@@ -209,8 +209,7 @@ int vmbus_connect(void)* Setup the vmbus event connection for channel interrupt * abstraction stuff */ - vmbus_connection.int_page = - (void *)hv_alloc_hyperv_zeroed_page (); + vmbus_connection.int_page =hv_alloc_hyperv_zeroed_page ();if (vmbus_connection.int_page ==NULL ) { ret = -ENOMEM ; goto cleanup;@@ -225,8 +224,8 @@ int vmbus_connect(void)* Setup the monitor notification facility. The 1st page for * parent->child and the 2nd page for child->parent */ - vmbus_connection.monitor_pages[0 ] = (void *)hv_alloc_hyperv_page (); - vmbus_connection.monitor_pages[1 ] = (void *)hv_alloc_hyperv_page (); + vmbus_connection.monitor_pages[0 ] =hv_alloc_hyperv_page (); + vmbus_connection.monitor_pages[1 ] =hv_alloc_hyperv_page ();if ((vmbus_connection.monitor_pages[0 ] ==NULL ) || (vmbus_connection.monitor_pages[1 ] ==NULL )) { ret = -ENOMEM ;@@ -333,15 +332,15 @@ void vmbus_disconnect(void)destroy_workqueue (vmbus_connection.work_queue);if (vmbus_connection.int_page) { -hv_free_hyperv_page ((unsigned long )vmbus_connection.int_page); +hv_free_hyperv_page (vmbus_connection.int_page); vmbus_connection.int_page =NULL ; }set_memory_encrypted ((unsigned long )vmbus_connection.monitor_pages[0 ],1 );set_memory_encrypted ((unsigned long )vmbus_connection.monitor_pages[1 ],1 ); -hv_free_hyperv_page ((unsigned long )vmbus_connection.monitor_pages[0 ]); -hv_free_hyperv_page ((unsigned long )vmbus_connection.monitor_pages[1 ]); +hv_free_hyperv_page (vmbus_connection.monitor_pages[0 ]); +hv_free_hyperv_page (vmbus_connection.monitor_pages[1 ]); vmbus_connection.monitor_pages[0 ] =NULL ; vmbus_connection.monitor_pages[1 ] =NULL ; }drivers/hv/hv_common.c +5
-5@@ -115,12 +115,12 @@ void *hv_alloc_hyperv_zeroed_page(void) }EXPORT_SYMBOL_GPL (hv_alloc_hyperv_zeroed_page); -void hv_free_hyperv_page (unsigned long addr) +void hv_free_hyperv_page (void *addr) {if (PAGE_SIZE ==HV_HYP_PAGE_SIZE ) -free_page (addr); +free_page ((unsigned long )addr);else -kfree ((void *)addr); +kfree (addr); }EXPORT_SYMBOL_GPL (hv_free_hyperv_page);@@ -253,7 +253,7 @@ static void hv_kmsg_dump_unregister(void)atomic_notifier_chain_unregister (&panic_notifier_list, &hyperv_panic_report_block); -hv_free_hyperv_page ((unsigned long )hv_panic_page); +hv_free_hyperv_page (hv_panic_page); hv_panic_page =NULL ; }@@ -270,7 +270,7 @@ static void hv_kmsg_dump_register(void) ret =kmsg_dump_register (&hv_kmsg_dumper);if (ret) {pr_err ("Hyper-V: kmsg dump register error 0x%x\n" , ret); -hv_free_hyperv_page ((unsigned long )hv_panic_page); +hv_free_hyperv_page (hv_panic_page); hv_panic_page =NULL ; } }include/asm-generic/mshyperv.h +1
-1@@ -190,7 +190,7 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)void *hv_alloc_hyperv_page (void );void *hv_alloc_hyperv_zeroed_page (void ); -void hv_free_hyperv_page (unsigned long addr); +void hv_free_hyperv_page (void *addr);/** * hv_cpu_number_to_vp_number() - Map CPU to VP.
Quoted 10 lines · Kameron Carr
Currently
hv_free_hyperv_page()takes an unsigned long argument, which is inconsistent with the void * return value from the correspondinghv_alloc_hyperv_page()function and variants. This creates unnecessary extra casting.Change the
hv_free_hyperv_page()argument type to void *. Also remove redundant casts from invocations ofhv_alloc_hyperv_page()and variants.Signed-off-by Kameron Carr <[email protected]>
Applied to hyperv-fixes. Thanks!