Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cf26d85 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67088d49

drivers/staging/sm750fb/ddk750_chip.c

+7 −5
Original line number Diff line number Diff line 
#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;

drivers/staging/sm750fb/sm750_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -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);