summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorKumar Sanghvi <kumar.sanghvi@stericsson.com>2011-03-26 13:53:09 +0530
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:01 +0200
commitab94be018d63542d1e98fbb5217b9155c2c2872e (patch)
treed47430ad833f4143f6378d086a70de50f2658440 /arch/arm
parentbc7c33949542d8700e62161343e6c8e8d9218265 (diff)
u8500: shrm: Misc updates and optimisation
This patch does following: 1. Protects reset of char queues to prevent a potential kernel crash if MSR is run in rapid succession continuously without allowing the user-space to settle. 2. Removes un-needed memcpy from tx/rx path in shrm net interface. 3. Eliminates use of ph_recv_buf in rx path. 3. Fixes compiler warning in net interface. 4. Updates the protection of writes to shrm fifo. ST-Ericsson ID: ER326117 Change-Id: I6aac23e20a20efc1f9b8a620db455f53e067f9bd Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19226 Reviewed-by: Hemant-vilas RAMDASI <hemant.ramdasi@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/include/mach/shrm_net.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/shrm_net.h b/arch/arm/mach-ux500/include/mach/shrm_net.h
index 4e675a98f3d..a97b276ee15 100644
--- a/arch/arm/mach-ux500/include/mach/shrm_net.h
+++ b/arch/arm/mach-ux500/include/mach/shrm_net.h
@@ -33,7 +33,7 @@ struct shrm_net_iface_priv {
};
int shrm_register_netdev(struct shrm_dev *shrm_dev_data);
-int shrm_net_receive(struct net_device *dev, unsigned char *data);
+int shrm_net_receive(struct net_device *dev);
int shrm_suspend_netdev(struct net_device *dev);
int shrm_resume_netdev(struct net_device *dev);
int shrm_stop_netdev(struct net_device *dev);