tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: rtl8712: replace kmalloc(..., sizeof(T))

As suggested by Andy Shevchenko on driverdev-devel, replace
v = ... sizeof(struct type_of_v) -> sizeof(*v)

Based on a cocci patch along the lines of

@@
type T;
expression E;
identifier V;
@@

T *V;
...
- V = kmalloc(sizeof(T), E);
+ V = kmalloc(sizeof(*V), E);

@@
type T;
expression E;
identifier V;
@@

T *V;
...
- V = kzalloc(sizeof(T), E);
+ V = kzalloc(sizeof(*V), E);

Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Vitaly Osipov and committed by
Greg Kroah-Hartman bd9dc62c 3ae70746

+51 -57
+44 -50
drivers/staging/rtl8712/rtl871x_cmd.c
··· 227 227 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 228 228 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 229 229 230 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 230 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 231 231 if (ph2c == NULL) 232 232 return _FAIL; 233 - psurveyPara = kmalloc(sizeof(struct sitesurvey_parm), GFP_ATOMIC); 233 + psurveyPara = kmalloc(sizeof(*psurveyPara), GFP_ATOMIC); 234 234 if (psurveyPara == NULL) { 235 235 kfree((unsigned char *) ph2c); 236 236 return _FAIL; ··· 259 259 struct setdatarate_parm *pbsetdataratepara; 260 260 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 261 261 262 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 262 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 263 263 if (ph2c == NULL) 264 264 return _FAIL; 265 - pbsetdataratepara = kmalloc(sizeof(struct setdatarate_parm), 266 - GFP_ATOMIC); 265 + pbsetdataratepara = kmalloc(sizeof(*pbsetdataratepara), GFP_ATOMIC); 267 266 if (pbsetdataratepara == NULL) { 268 267 kfree((u8 *) ph2c); 269 268 return _FAIL; ··· 281 282 struct SetChannelPlan_param *psetchplanpara; 282 283 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 283 284 284 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 285 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 285 286 if (ph2c == NULL) 286 287 return _FAIL; 287 - psetchplanpara = kmalloc(sizeof(struct SetChannelPlan_param), 288 - GFP_ATOMIC); 288 + psetchplanpara = kmalloc(sizeof(*psetchplanpara), GFP_ATOMIC); 289 289 if (psetchplanpara == NULL) { 290 290 kfree((u8 *) ph2c); 291 291 return _FAIL; ··· 302 304 struct setbasicrate_parm *pssetbasicratepara; 303 305 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 304 306 305 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 307 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 306 308 if (ph2c == NULL) 307 309 return _FAIL; 308 - pssetbasicratepara = kmalloc(sizeof(struct setbasicrate_parm), 309 - GFP_ATOMIC); 310 + pssetbasicratepara = kmalloc(sizeof(*pssetbasicratepara), GFP_ATOMIC); 310 311 if (pssetbasicratepara == NULL) { 311 312 kfree((u8 *) ph2c); 312 313 return _FAIL; ··· 324 327 struct writePTM_parm *pwriteptmparm; 325 328 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 326 329 327 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 330 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 328 331 if (ph2c == NULL) 329 332 return _FAIL; 330 - pwriteptmparm = kmalloc(sizeof(struct writePTM_parm), GFP_ATOMIC); 333 + pwriteptmparm = kmalloc(sizeof(*pwriteptmparm), GFP_ATOMIC); 331 334 if (pwriteptmparm == NULL) { 332 335 kfree((u8 *) ph2c); 333 336 return _FAIL; ··· 344 347 struct writePTM_parm *pwriteptmparm; 345 348 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 346 349 347 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 350 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 348 351 if (ph2c == NULL) 349 352 return _FAIL; 350 - pwriteptmparm = kmalloc(sizeof(struct writePTM_parm), GFP_ATOMIC); 353 + pwriteptmparm = kmalloc(sizeof(*pwriteptmparm), GFP_ATOMIC); 351 354 if (pwriteptmparm == NULL) { 352 355 kfree((u8 *) ph2c); 353 356 return _FAIL; ··· 364 367 struct writePTM_parm *pwriteptmparm; 365 368 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 366 369 367 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 370 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 368 371 if (ph2c == NULL) 369 372 return _FAIL; 370 - pwriteptmparm = kmalloc(sizeof(struct writePTM_parm), GFP_ATOMIC); 373 + pwriteptmparm = kmalloc(sizeof(*pwriteptmparm), GFP_ATOMIC); 371 374 if (pwriteptmparm == NULL) { 372 375 kfree((u8 *) ph2c); 373 376 return _FAIL; ··· 384 387 struct writeRF_parm *pwriterfparm; 385 388 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 386 389 387 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 390 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 388 391 if (ph2c == NULL) 389 392 return _FAIL; 390 - pwriterfparm = kmalloc(sizeof(struct writeRF_parm), GFP_ATOMIC); 393 + pwriterfparm = kmalloc(sizeof(*pwriterfparm), GFP_ATOMIC); 391 394 if (pwriterfparm == NULL) { 392 395 kfree((u8 *) ph2c); 393 396 return _FAIL; ··· 405 408 struct readRF_parm *prdrfparm; 406 409 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 407 410 408 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 411 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 409 412 if (ph2c == NULL) 410 413 return _FAIL; 411 - prdrfparm = kmalloc(sizeof(struct readRF_parm), GFP_ATOMIC); 414 + prdrfparm = kmalloc(sizeof(*prdrfparm), GFP_ATOMIC); 412 415 if (prdrfparm == NULL) { 413 416 kfree((u8 *) ph2c); 414 417 return _FAIL; ··· 449 452 &padapter->registrypriv.dev_network; 450 453 451 454 padapter->ledpriv.LedControlHandler(padapter, LED_CTL_START_TO_LINK); 452 - pcmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 455 + pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); 453 456 if (pcmd == NULL) 454 457 return _FAIL; 455 458 _init_listhead(&pcmd->list); ··· 483 486 network.InfrastructureMode; 484 487 485 488 padapter->ledpriv.LedControlHandler(padapter, LED_CTL_START_TO_LINK); 486 - pcmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 489 + pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); 487 490 if (pcmd == NULL) 488 491 return _FAIL; 489 492 t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + ··· 621 624 struct disconnect_parm *pdisconnect; 622 625 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 623 626 624 - pdisconnect_cmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 627 + pdisconnect_cmd = kmalloc(sizeof(*pdisconnect_cmd), GFP_ATOMIC); 625 628 if (pdisconnect_cmd == NULL) 626 629 return _FAIL; 627 - pdisconnect = kmalloc(sizeof(struct disconnect_parm), GFP_ATOMIC); 630 + pdisconnect = kmalloc(sizeof(*pdisconnect), GFP_ATOMIC); 628 631 if (pdisconnect == NULL) { 629 632 kfree((u8 *)pdisconnect_cmd); 630 633 return _FAIL; ··· 643 646 644 647 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 645 648 646 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 649 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 647 650 if (ph2c == NULL) 648 651 return _FAIL; 649 - psetop = kmalloc(sizeof(struct setopmode_parm), GFP_ATOMIC); 652 + psetop = kmalloc(sizeof(*psetop), GFP_ATOMIC); 650 653 if (psetop == NULL) { 651 654 kfree((u8 *) ph2c); 652 655 return _FAIL; ··· 667 670 struct security_priv *psecuritypriv = &padapter->securitypriv; 668 671 struct sta_info *sta = (struct sta_info *)psta; 669 672 670 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 673 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 671 674 if (ph2c == NULL) 672 675 return _FAIL; 673 - psetstakey_para = kmalloc(sizeof(struct set_stakey_parm), GFP_ATOMIC); 676 + psetstakey_para = kmalloc(sizeof(*psetstakey_para), GFP_ATOMIC); 674 677 if (psetstakey_para == NULL) { 675 678 kfree((u8 *) ph2c); 676 679 return _FAIL; 677 680 } 678 - psetstakey_rsp = kmalloc(sizeof(struct set_stakey_rsp), GFP_ATOMIC); 681 + psetstakey_rsp = kmalloc(sizeof(*psetstakey_rsp), GFP_ATOMIC); 679 682 if (psetstakey_rsp == NULL) { 680 683 kfree((u8 *) ph2c); 681 684 kfree((u8 *) psetstakey_para); ··· 707 710 struct setrfintfs_parm *psetrfintfsparm; 708 711 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 709 712 710 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 713 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 711 714 if (ph2c == NULL) 712 715 return _FAIL; 713 - psetrfintfsparm = kmalloc(sizeof(struct setrfintfs_parm), GFP_ATOMIC); 716 + psetrfintfsparm = kmalloc(sizeof(*psetrfintfsparm), GFP_ATOMIC); 714 717 if (psetrfintfsparm == NULL) { 715 718 kfree((unsigned char *) ph2c); 716 719 return _FAIL; ··· 729 732 struct setratable_parm *psetrttblparm; 730 733 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 731 734 732 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 735 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 733 736 if (ph2c == NULL) 734 737 return _FAIL; 735 - psetrttblparm = kmalloc(sizeof(struct setratable_parm), GFP_ATOMIC); 738 + psetrttblparm = kmalloc(sizeof(*psetrttblparm), GFP_ATOMIC); 736 739 if (psetrttblparm == NULL) { 737 740 kfree((unsigned char *)ph2c); 738 741 return _FAIL; ··· 750 753 struct cmd_obj *ph2c; 751 754 struct readTSSI_parm *prdtssiparm; 752 755 753 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 756 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 754 757 if (ph2c == NULL) 755 758 return _FAIL; 756 - prdtssiparm = kmalloc(sizeof(struct readTSSI_parm), GFP_ATOMIC); 759 + prdtssiparm = kmalloc(sizeof(*prdtssiparm), GFP_ATOMIC); 757 760 if (prdtssiparm == NULL) { 758 761 kfree((unsigned char *) ph2c); 759 762 return _FAIL; ··· 776 779 struct cmd_obj *ph2c; 777 780 struct SetMacAddr_param *psetMacAddr_para; 778 781 779 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 782 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 780 783 if (ph2c == NULL) 781 784 return _FAIL; 782 - psetMacAddr_para = kmalloc(sizeof(struct SetMacAddr_param), 783 - GFP_ATOMIC); 785 + psetMacAddr_para = kmalloc(sizeof(*psetMacAddr_para), GFP_ATOMIC); 784 786 if (psetMacAddr_para == NULL) { 785 787 kfree((u8 *) ph2c); 786 788 return _FAIL; ··· 798 802 struct set_assocsta_parm *psetassocsta_para; 799 803 struct set_assocsta_rsp *psetassocsta_rsp = NULL; 800 804 801 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 805 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 802 806 if (ph2c == NULL) 803 807 return _FAIL; 804 - psetassocsta_para = kmalloc(sizeof(struct set_assocsta_parm), 805 - GFP_ATOMIC); 808 + psetassocsta_para = kmalloc(sizeof(*psetassocsta_para), GFP_ATOMIC); 806 809 if (psetassocsta_para == NULL) { 807 810 kfree((u8 *) ph2c); 808 811 return _FAIL; 809 812 } 810 - psetassocsta_rsp = kmalloc(sizeof(struct set_assocsta_rsp), 811 - GFP_ATOMIC); 813 + psetassocsta_rsp = kmalloc(sizeof(*psetassocsta_rsp), GFP_ATOMIC); 812 814 if (psetassocsta_rsp == NULL) { 813 815 kfree((u8 *)ph2c); 814 816 kfree((u8 *)psetassocsta_para); ··· 826 832 struct cmd_obj *ph2c; 827 833 struct addBaReq_parm *paddbareq_parm; 828 834 829 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 835 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 830 836 if (ph2c == NULL) 831 837 return _FAIL; 832 - paddbareq_parm = kmalloc(sizeof(struct addBaReq_parm), GFP_ATOMIC); 838 + paddbareq_parm = kmalloc(sizeof(*paddbareq_parm), GFP_ATOMIC); 833 839 if (paddbareq_parm == NULL) { 834 840 kfree((unsigned char *)ph2c); 835 841 return _FAIL; ··· 847 853 struct drvint_cmd_parm *pdrvintcmd_param; 848 854 struct cmd_priv *pcmdpriv = &padapter->cmdpriv; 849 855 850 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 856 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 851 857 if (ph2c == NULL) 852 858 return _FAIL; 853 - pdrvintcmd_param = kmalloc(sizeof(struct drvint_cmd_parm), GFP_ATOMIC); 859 + pdrvintcmd_param = kmalloc(sizeof(*pdrvintcmd_param), GFP_ATOMIC); 854 860 if (pdrvintcmd_param == NULL) { 855 861 kfree((unsigned char *)ph2c); 856 862 return _FAIL; ··· 1021 1027 struct DisconnectCtrlEx_param *param; 1022 1028 struct cmd_priv *pcmdpriv = &adapter->cmdpriv; 1023 1029 1024 - ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 1030 + ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); 1025 1031 if (ph2c == NULL) 1026 1032 return _FAIL; 1027 - param = kzalloc(sizeof(struct DisconnectCtrlEx_param), GFP_ATOMIC); 1033 + param = kzalloc(sizeof(*param), GFP_ATOMIC); 1028 1034 if (param == NULL) { 1029 1035 kfree((unsigned char *) ph2c); 1030 1036 return _FAIL;
+1 -1
drivers/staging/rtl8712/rtl871x_io.c
··· 112 112 struct io_queue *pio_queue; 113 113 struct io_req *pio_req; 114 114 115 - pio_queue = kmalloc(sizeof(struct io_queue), GFP_ATOMIC); 115 + pio_queue = kmalloc(sizeof(*pio_queue), GFP_ATOMIC); 116 116 if (pio_queue == NULL) 117 117 goto alloc_io_queue_fail; 118 118 _init_listhead(&pio_queue->free_ioreqs);
+4 -4
drivers/staging/rtl8712/rtl871x_mlme.c
··· 1212 1212 struct cmd_obj *pcmd; 1213 1213 struct setauth_parm *psetauthparm; 1214 1214 1215 - pcmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 1215 + pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); 1216 1216 if (pcmd == NULL) 1217 1217 return _FAIL; 1218 1218 1219 - psetauthparm = kzalloc(sizeof(struct setauth_parm), GFP_ATOMIC); 1219 + psetauthparm = kzalloc(sizeof(*psetauthparm), GFP_ATOMIC); 1220 1220 if (psetauthparm == NULL) { 1221 1221 kfree((unsigned char *)pcmd); 1222 1222 return _FAIL; ··· 1242 1242 u8 keylen; 1243 1243 sint ret = _SUCCESS; 1244 1244 1245 - pcmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 1245 + pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); 1246 1246 if (pcmd == NULL) 1247 1247 return _FAIL; 1248 - psetkeyparm = kzalloc(sizeof(struct setkey_parm), GFP_ATOMIC); 1248 + psetkeyparm = kzalloc(sizeof(*psetkeyparm), GFP_ATOMIC); 1249 1249 if (psetkeyparm == NULL) { 1250 1250 ret = _FAIL; 1251 1251 goto err_free_cmd;
+2 -2
drivers/staging/rtl8712/rtl871x_mp.c
··· 281 281 struct SetChannel_parm *pparm = NULL; 282 282 u16 code = GEN_CMD_CODE(_SetChannel); 283 283 284 - pcmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 284 + pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); 285 285 if (pcmd == NULL) 286 286 return; 287 - pparm = kmalloc(sizeof(struct SetChannel_parm), GFP_ATOMIC); 287 + pparm = kmalloc(sizeof(*pparm), GFP_ATOMIC); 288 288 if (pparm == NULL) { 289 289 kfree(pcmd); 290 290 return;