From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 20 May 2015 06:49:34 +0000 (+0800)
Subject: Merge branch develop-3.10-next
X-Git-Tag: firefly_0821_release~4158
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=231897adf5ecd659b5e8eea5ff22da28ba539c15;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10-next
---

231897adf5ecd659b5e8eea5ff22da28ba539c15
diff --cc drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
index a0d4af49a498,961648c5bd05..1809b14c4862
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
@@@ -718,25 -675,25 +718,25 @@@ dhd_conf_get_wme(dhd_pub_t *dhd, edcf_a
  	memcpy((char*)acp, iovbuf, sizeof(edcf_acparam_t)*AC_COUNT);
  
  	acparam = &acp[AC_BK];
- 	CONFIG_TRACE(("%s: BK: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,
+ 	CONFIG_TRACE(("%s: BK: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,
  		acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,
  		acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,
 -		sizeof(acp)));
 +		(int)sizeof(acp)));
  	acparam = &acp[AC_BE];
- 	CONFIG_TRACE(("%s: BE: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,
+ 	CONFIG_TRACE(("%s: BE: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,
  		acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,
  		acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,
 -		sizeof(acp)));
 +		(int)sizeof(acp)));
  	acparam = &acp[AC_VI];
- 	CONFIG_TRACE(("%s: VI: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,
+ 	CONFIG_TRACE(("%s: VI: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,
  		acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,
  		acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,
 -		sizeof(acp)));
 +		(int)sizeof(acp)));
  	acparam = &acp[AC_VO];
- 	CONFIG_TRACE(("%s: VO: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,
+ 	CONFIG_TRACE(("%s: VO: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,
  		acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,
  		acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,
 -		sizeof(acp)));
 +		(int)sizeof(acp)));
  
  	return;
  }
@@@ -769,10 -726,10 +769,10 @@@ dhd_conf_update_wme(dhd_pub_t *dhd, edc
  	acp->ECW = ((ecwmax << EDCF_ECWMAX_SHIFT) & EDCF_ECWMAX_MASK) | (acp->ECW & EDCF_ECWMIN_MASK);
  	acp->ECW = ((acp->ECW & EDCF_ECWMAX_MASK) | (ecwmin & EDCF_ECWMIN_MASK));
  
- 	CONFIG_TRACE(("%s: mod aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,
+ 	CONFIG_TRACE(("%s: mod aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,
  		acp->ACI, acp->ACI&EDCF_AIFSN_MASK,
  		acp->ECW&EDCF_ECWMIN_MASK, (acp->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,
 -		sizeof(edcf_acparam_t)));
 +		(int)sizeof(edcf_acparam_t)));
  
  	/*
  	* Now use buf as an output buffer.
diff --cc drivers/pwm/pwm-rockchip.c
index a17d0472d11d,2b45870bb4c7..33b28e939493
mode 100644,100755..100755
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c