all: Remove unnecessary locals_dict cast.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
micropython · Sep 19, 2022 · 9dce827 · 9dce827
1 parent b7d6ee9
commit 9dce827
Show file tree

Hide file tree

Showing 185 changed files with 226 additions and 226 deletions.
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
@@ -737,7 +737,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_i2c_make_new,
     print, mp_machine_soft_i2c_print,
     protocol, &mp_machine_soft_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SOFTI2C
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
@@ -179,7 +179,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     signal_make_new,
     call, signal_call,
     protocol, &signal_pin_p,
-    locals_dict, (void *)&signal_locals_dict
+    locals_dict, &signal_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
@@ -258,7 +258,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_spi_make_new,
     print, mp_machine_soft_spi_print,
     protocol, &mp_machine_soft_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SOFTSPI
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
@@ -981,7 +981,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_BLE,
     MP_TYPE_FLAG_NONE,
     bluetooth_ble_make_new,
-    locals_dict, (void *)&bluetooth_ble_locals_dict
+    locals_dict, &bluetooth_ble_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {

diff --git a/extmod/modbtree.c b/extmod/modbtree.c
@@ -330,7 +330,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     iternext, btree_iternext,
     binary_op, btree_binary_op,
     subscr, btree_subscr,
-    locals_dict, (void *)&btree_locals_dict
+    locals_dict, &btree_locals_dict
     );
 #endif
 

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
@@ -835,7 +835,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     framebuf_make_new,
     buffer, framebuf_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&framebuf_locals_dict
+    locals_dict, &framebuf_locals_dict
     );
 #endif
 

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
@@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_slip,
     MP_TYPE_FLAG_NONE,
     lwip_slip_make_new,
-    locals_dict, (mp_obj_dict_t *)&lwip_slip_locals_dict
+    locals_dict, &lwip_slip_locals_dict
     );
 
 #endif // MICROPY_PY_LWIP_SLIP
@@ -1602,7 +1602,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     lwip_socket_make_new,
     print, lwip_socket_print,
     protocol, &lwip_socket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&lwip_socket_locals_dict
+    locals_dict, &lwip_socket_locals_dict
     );
 
 /******************************************************************************/

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
@@ -149,7 +149,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_TaskQueue,
     MP_TYPE_FLAG_NONE,
     task_queue_make_new,
-    locals_dict, (mp_obj_dict_t *)&task_queue_locals_dict
+    locals_dict, &task_queue_locals_dict
     );
 
 /******************************************************************************/

diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
@@ -353,7 +353,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_aes,
     MP_TYPE_FLAG_NONE,
     ucryptolib_aes_make_new,
-    locals_dict, (void *)&ucryptolib_aes_locals_dict
+    locals_dict, &ucryptolib_aes_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {

diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
@@ -162,7 +162,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
     uhashlib_sha256_make_new,
-    locals_dict, (void *)&uhashlib_sha256_locals_dict
+    locals_dict, &uhashlib_sha256_locals_dict
     );
 #endif
 
@@ -256,7 +256,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
     uhashlib_sha1_make_new,
-    locals_dict, (void *)&uhashlib_sha1_locals_dict
+    locals_dict, &uhashlib_sha1_locals_dict
     );
 #endif
 
@@ -350,7 +350,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_md5,
     MP_TYPE_FLAG_NONE,
     uhashlib_md5_make_new,
-    locals_dict, (void *)&uhashlib_md5_locals_dict
+    locals_dict, &uhashlib_md5_locals_dict
     );
 #endif // MICROPY_PY_UHASHLIB_MD5
 

diff --git a/extmod/modure.c b/extmod/modure.c
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, match_print,
-    locals_dict, (void *)&match_locals_dict
+    locals_dict, &match_locals_dict
     );
 #endif
 
@@ -419,7 +419,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, re_print,
-    locals_dict, (void *)&re_locals_dict
+    locals_dict, &re_locals_dict
     );
 #endif
 

diff --git a/extmod/moduselect.c b/extmod/moduselect.c
@@ -343,7 +343,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     getiter, mp_identity_getiter,
     iternext, poll_iternext,
-    locals_dict, (void *)&poll_locals_dict
+    locals_dict, &poll_locals_dict
     );
 
 // poll()

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
@@ -534,7 +534,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&socket_locals_dict,
+    locals_dict, &socket_locals_dict,
     print, socket_print
     );
 

diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
@@ -324,7 +324,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &ussl_socket_stream_p,
-    locals_dict, (void *)&ussl_socket_locals_dict
+    locals_dict, &ussl_socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {

diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
@@ -402,7 +402,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &ussl_socket_stream_p,
-    locals_dict, (void *)&ussl_socket_locals_dict
+    locals_dict, &ussl_socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {

diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
@@ -215,7 +215,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     utimeq_make_new,
     unary_op, utimeq_unary_op,
-    locals_dict, (void *)&utimeq_locals_dict
+    locals_dict, &utimeq_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {

diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
@@ -296,7 +296,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     websocket_make_new,
     protocol, &websocket_stream_p,
-    locals_dict, (void *)&websocket_locals_dict
+    locals_dict, &websocket_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {

diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
@@ -146,7 +146,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     decompio_make_new,
     protocol, &decompio_stream_p,
-    locals_dict, (void *)&decompio_locals_dict
+    locals_dict, &decompio_locals_dict
     );
 #endif
 

diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
@@ -348,7 +348,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     webrepl_make_new,
     protocol, &webrepl_stream_p,
-    locals_dict, (mp_obj_dict_t *)&webrepl_locals_dict
+    locals_dict, &webrepl_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t webrepl_module_globals_table[] = {

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
@@ -502,7 +502,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     network_cyw43_make_new,
     print, network_cyw43_print,
-    locals_dict, (mp_obj_dict_t *)&network_cyw43_locals_dict
+    locals_dict, &network_cyw43_locals_dict
     );
 
 #endif // MICROPY_PY_NETWORK_CYW43
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
@@ -437,7 +437,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     fat_vfs_make_new,
     protocol, &fat_vfs_proto,
-    locals_dict, (mp_obj_dict_t *)&fat_vfs_locals_dict
+    locals_dict, &fat_vfs_locals_dict
     );
 
 #endif // MICROPY_VFS_FAT
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
@@ -185,7 +185,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    locals_dict, &vfs_fat_rawfile_locals_dict
     );
 
 STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
@@ -204,7 +204,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_textio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    locals_dict, &vfs_fat_rawfile_locals_dict
     );
 
 // Factory function for I/O stream classes

diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
@@ -514,7 +514,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_VFS_LFSx(make_new),
     protocol, &MP_VFS_LFSx(proto),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(locals_dict)
+    locals_dict, &MP_VFS_LFSx(locals_dict)
     );
 
 #undef VFS_LFSx_QSTR
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
@@ -229,7 +229,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(fileio_stream_p),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
 
 STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
@@ -248,5 +248,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(textio_stream_p),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
@@ -404,7 +404,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     vfs_posix_make_new,
     protocol, &vfs_posix_proto,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_locals_dict
+    locals_dict, &vfs_posix_locals_dict
     );
 
 #endif // MICROPY_VFS_POSIX
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
@@ -258,7 +258,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
 STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
@@ -277,7 +277,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_textio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
 const mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_vfs_posix_textio}, STDIN_FILENO};

diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
@@ -196,7 +196,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, mp_irq_call,
-    locals_dict, (mp_obj_t)&mp_irq_locals_dict
+    locals_dict, &mp_irq_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_irq_obj_list);
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
@@ -176,6 +176,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Server,
     MP_TYPE_FLAG_NONE,
     network_server_make_new,
-    locals_dict, (mp_obj_t)&network_server_locals_dict
+    locals_dict, &network_server_locals_dict
     );
 #endif
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/moduhashlib.c
@@ -182,15 +182,15 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
     hash_make_new,
-    locals_dict, (mp_obj_t)&hash_locals_dict
+    locals_dict, &hash_locals_dict
     );
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     sha256_type,
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
     hash_make_new,
-    locals_dict, (mp_obj_t)&hash_locals_dict
+    locals_dict, &hash_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {

diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
@@ -765,7 +765,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 /******************************************************************************/

diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
@@ -68,7 +68,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {

diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
@@ -1290,7 +1290,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     wlan_make_new,
-    locals_dict, (mp_obj_t)&wlan_locals_dict
+    locals_dict, &wlan_locals_dict
     );
 
 const mod_network_nic_type_t mod_network_nic_type_wlan = {

diff --git a/ports/cc3200/mods/pybadc.c b/ports/cc3200/mods/pybadc.c
@@ -239,7 +239,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     adc_make_new,
     print, adc_print,
-    locals_dict, (mp_obj_t)&adc_locals_dict
+    locals_dict, &adc_locals_dict
     );
 
 STATIC void adc_channel_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -308,5 +308,5 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     print, adc_channel_print,
     call, adc_channel_call,
-    locals_dict, (mp_obj_t)&adc_channel_locals_dict
+    locals_dict, &adc_channel_locals_dict
     );
diff --git a/ports/cc3200/mods/pybflash.c b/ports/cc3200/mods/pybflash.c
@@ -89,7 +89,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     pyb_flash_make_new,
-    locals_dict, (mp_obj_t)&pyb_flash_locals_dict
+    locals_dict, &pyb_flash_locals_dict
     );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {

diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
@@ -527,5 +527,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_i2c_make_new,
     print, pyb_i2c_print,
-    locals_dict, (mp_obj_t)&pyb_i2c_locals_dict
+    locals_dict, &pyb_i2c_locals_dict
     );