Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit dec572cbe67598080f7beb00279db1a5590cec35

Authored by Charles Clément
Committed by Greg Kroah-Hartman
1 parent e54d9eb951
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Staging: vt6655: remove ULONG_PTR typedef 

Signed-off-by: Charles Clément <caratorn@gmail.com>

Showing 2 changed files with 4 additions and 5 deletions Side-by-side Diff

drivers/staging/vt6655/bssdb.c
Diff comments   View file @ dec572c
... ... @@ -471,7 +471,7 @@
471 471 if (pRSNWPA != NULL) {
472 472 unsigned int uLen = pRSNWPA->len + 2;
473 473  
474   - if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
  474 + if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
475 475 pBSSList->wWPALen = uLen;
476 476 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
477 477 WPA_ParseRSN(pBSSList, pRSNWPA);
... ... @@ -482,7 +482,7 @@
482 482  
483 483 if (pRSN != NULL) {
484 484 unsigned int uLen = pRSN->len + 2;
485   - if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
  485 + if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
486 486 pBSSList->wRSNLen = uLen;
487 487 memcpy(pBSSList->byRSNIE, pRSN, uLen);
488 488 WPA2vParseRSN(pBSSList, pRSN);
... ... @@ -671,7 +671,7 @@
671 671  
672 672 if (pRSNWPA != NULL) {
673 673 unsigned int uLen = pRSNWPA->len + 2;
674   - if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
  674 + if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
675 675 pBSSList->wWPALen = uLen;
676 676 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
677 677 WPA_ParseRSN(pBSSList, pRSNWPA);
... ... @@ -682,7 +682,7 @@
682 682  
683 683 if (pRSN != NULL) {
684 684 unsigned int uLen = pRSN->len + 2;
685   - if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
  685 + if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
686 686 pBSSList->wRSNLen = uLen;
687 687 memcpy(pBSSList->byRSNIE, pRSN, uLen);
688 688 WPA2vParseRSN(pBSSList, pRSN);
drivers/staging/vt6655/ttype.h
Diff comments   View file @ dec572c
... ... @@ -86,7 +86,6 @@
86 86  
87 87 /****** Common pointer types ***********************************************/
88 88  
89   -typedef unsigned long ULONG_PTR; // 32-bit
90 89 typedef unsigned long DWORD_PTR; // 32-bit
91 90  
92 91 // boolean pointer