leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: sm750fb: replace custom MB(x) macro with appropriate SZ_xM

Browse Source 
Use SZ_xM defined in linux/sizes.h instead of custom MB(x) macro

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Rapoport 2015-09-22 12:01:17 +03:00 committed by Greg Kroah-Hartman
parent 67088d49a1
commit 4cf26d859a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/sm750fb/ddk750_chip.c
View File

@ -1,3 +1,5 @@
#include <linux/sizes.h>
#include "ddk750_help.h"
#include "ddk750_reg.h"
#include "ddk750_chip.h"
@ -226,7 +228,7 @@ unsigned int ddk750_getVMSize(void)
/* sm750le only use 64 mb memory*/
if (getChipType() == SM750LE)
return MB(64);
return SZ_64M;
/* for 750,always use power mode0*/
reg = PEEK32(MODE0_GATE);
@ -237,13 +239,13 @@ unsigned int ddk750_getVMSize(void)
reg = FIELD_GET(PEEK32(MISC_CTRL), MISC_CTRL, LOCALMEM_SIZE);
switch (reg) {
case MISC_CTRL_LOCALMEM_SIZE_8M:
data = MB(8); break; /* 8 Mega byte */
data = SZ_8M; break; /* 8 Mega byte */
case MISC_CTRL_LOCALMEM_SIZE_16M:
data = MB(16); break; /* 16 Mega byte */
data = SZ_16M; break; /* 16 Mega byte */
case MISC_CTRL_LOCALMEM_SIZE_32M:
data = MB(32); break; /* 32 Mega byte */
data = SZ_32M; break; /* 32 Mega byte */
case MISC_CTRL_LOCALMEM_SIZE_64M:
data = MB(64); break; /* 64 Mega byte */
data = SZ_64M; break; /* 64 Mega byte */
default:
data = 0;
break;

3
drivers/staging/sm750fb/sm750_hw.c
View File

@ -18,6 +18,7 @@
#endif
#include <linux/platform_device.h>
#include <linux/screen_info.h>
#include <linux/sizes.h>
#include "sm750.h"
#include "sm750_hw.h"
@ -34,7 +35,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev)
ret = 0;
share->vidreg_start = pci_resource_start(pdev, 1);
share->vidreg_size = MB(2);
share->vidreg_size = SZ_2M;
pr_info("mmio phyAddr = %lx\n", share->vidreg_start);