Merge "ASoC: msm-cpe-lsm: cleanup ioctl functions" into msm-4.9 (2ab2f3ee) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/msm/msm-cpe-lsm.c

+14 −37

Original line number	Diff line number	Diff line
		@@ -1176,13 +1176,6 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
		dev_dbg(rtd->dev,
		"%s: %s\n",
		__func__, "SNDRV_LSM_REG_SND_MODEL_V2");
		if (!arg) {
		dev_err(rtd->dev,
		"%s: Invalid argument to ioctl %s\n",
		__func__,
		"SNDRV_LSM_REG_SND_MODEL_V2");
		return -EINVAL;
		}

		memcpy(&snd_model, arg,
		sizeof(struct snd_lsm_sound_model_v2));
		@@ -1323,13 +1316,6 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
		dev_dbg(rtd->dev,
		"%s: %s\n",
		__func__, "SNDRV_LSM_EVENT_STATUS");
		if (!arg) {
		dev_err(rtd->dev,
		"%s: Invalid argument to ioctl %s\n",
		__func__,
		"SNDRV_LSM_EVENT_STATUS");
		return -EINVAL;
		}

		user = arg;

		@@ -1432,12 +1418,6 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream,
		break;

		case SNDRV_LSM_SET_PARAMS:
		if (!arg) {
		dev_err(rtd->dev,
		"%s: %s Invalid argument\n",
		__func__, "SNDRV_LSM_SET_PARAMS");
		return -EINVAL;
		}
		memcpy(&det_params, arg,
		sizeof(det_params));
		if (det_params.num_confidence_levels <= 0) {
		@@ -2289,12 +2269,6 @@ static int msm_cpe_lsm_ioctl(struct snd_pcm_substream *substream,
		}

		#ifdef CONFIG_COMPAT
		struct snd_lsm_event_status32 {
		u16 status;
		u16 payload_size;
		u8 payload[0];
		};

		struct snd_lsm_sound_model_v2_32 {
		compat_uptr_t data;
		compat_uptr_t confidence_level;
		@@ -2326,8 +2300,6 @@ struct snd_lsm_module_params_32 {
		};

		enum {
		SNDRV_LSM_EVENT_STATUS32 =
		_IOW('U', 0x02, struct snd_lsm_event_status32),
		SNDRV_LSM_REG_SND_MODEL_V2_32 =
		_IOW('U', 0x07, struct snd_lsm_sound_model_v2_32),
		SNDRV_LSM_SET_PARAMS32 =
		@@ -2421,7 +2393,7 @@ static int msm_cpe_lsm_ioctl_compat(struct snd_pcm_substream *substream,
		err);
		}
		break;
		case SNDRV_LSM_EVENT_STATUS32: {
		case SNDRV_LSM_EVENT_STATUS: {
		struct snd_lsm_event_status *event_status = NULL;
		struct snd_lsm_event_status u_event_status32;
		struct snd_lsm_event_status *udata_32 = NULL;
		@@ -2463,7 +2435,6 @@ static int msm_cpe_lsm_ioctl_compat(struct snd_pcm_substream *substream,
		} else {
		event_status->payload_size =
		u_event_status32.payload_size;
		cmd = SNDRV_LSM_EVENT_STATUS;
		err = msm_cpe_lsm_ioctl_shared(substream,
		cmd, event_status);
		if (err)
		@@ -2563,13 +2534,6 @@ static int msm_cpe_lsm_ioctl_compat(struct snd_pcm_substream *substream,
		return -EINVAL;
		}

		if (!arg) {
		dev_err(rtd->dev,
		"%s: %s: No Param data to set\n",
		__func__, "SET_MODULE_PARAMS_32");
		return -EINVAL;
		}

		if (copy_from_user(&p_data_32, arg,
		sizeof(p_data_32))) {
		dev_err(rtd->dev,
		@@ -2647,6 +2611,19 @@ static int msm_cpe_lsm_ioctl_compat(struct snd_pcm_substream *substream,
		kfree(params32);
		break;
		}
		case SNDRV_LSM_REG_SND_MODEL_V2:
		case SNDRV_LSM_SET_PARAMS:
		case SNDRV_LSM_SET_MODULE_PARAMS:
		/*
		* In ideal cases, the compat_ioctl should never be called
		* with the above unlocked ioctl commands. Print error
		* and return error if it does.
		*/
		dev_err(rtd->dev,
		"%s: Invalid cmd for compat_ioctl\n",
		__func__);
		err = -EINVAL;
		break;
		default:
		err = msm_cpe_lsm_ioctl_shared(substream, cmd, arg);
		break;