Merge "soc: qcom: smd: Make the data parameter to smd_write_segment() const" (64e9583c) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/smd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2121,7 +2121,8 @@ int smd_write_start(smd_channel_t *ch, int len)
		}
		EXPORT_SYMBOL(smd_write_start);

		int smd_write_segment(smd_channel_t ch, void data, int len, int user_buf)
		int smd_write_segment(smd_channel_t ch, const void data, int len,
		int user_buf)
		{
		int bytes_written;

+3 −2

Original line number	Diff line number	Diff line
		@@ -180,7 +180,8 @@ int smd_write_start(smd_channel_t *ch, int len);
		* -EINVAL - invalid length
		* -ENOEXEC - transaction not started
		*/
		int smd_write_segment(smd_channel_t ch, void data, int len, int user_buf);
		int smd_write_segment(smd_channel_t ch, const void data, int len,
		int user_buf);

		/* Completes a packet transaction. Do not call from interrupt context.
		*
		@@ -352,7 +353,7 @@ static inline int smd_write_start(smd_channel_t *ch, int len)
		}

		static inline int
		smd_write_segment(smd_channel_t ch, void data, int len, int user_buf)
		smd_write_segment(smd_channel_t ch, const void data, int len, int user_buf)
		{
		return -ENODEV;
		}