Commit 177d591a authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.5/amd-sfh' into for-linus 

- amd-sfh driver code cleanups (Basavaraj Natikar)
parents e7de761b 19b60acc

drivers/hid/amd-sfh-hid/amd_sfh_client.c

+14 −33
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
	struct device *dev;

	u32 feature_report_size;

	u32 input_report_size;

	int rc, i, status;

	int rc, i;

	u8 cl_idx;



	req_list = &cl_data->req_list;
@@ -286,56 +286,37 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
		if (rc)

			goto cleanup;

		mp2_ops->start(privdata, info);

		status = amd_sfh_wait_for_response

		cl_data->sensor_sts[i] = amd_sfh_wait_for_response

						(privdata, cl_data->sensor_idx[i], SENSOR_ENABLED);

		if (status == SENSOR_ENABLED) {

	}



	for (i = 0; i < cl_data->num_hid_devices; i++) {

		cl_data->cur_hid_dev = i;

		if (cl_data->sensor_sts[i] == SENSOR_ENABLED) {

			cl_data->is_any_sensor_enabled = true;

			cl_data->sensor_sts[i] = SENSOR_ENABLED;

			rc = amdtp_hid_probe(cl_data->cur_hid_dev, cl_data);

			if (rc) {

				mp2_ops->stop(privdata, cl_data->sensor_idx[i]);

				status = amd_sfh_wait_for_response

					(privdata, cl_data->sensor_idx[i], SENSOR_DISABLED);

				if (status != SENSOR_ENABLED)

					cl_data->sensor_sts[i] = SENSOR_DISABLED;

				dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

					cl_data->sensor_idx[i],

					get_sensor_name(cl_data->sensor_idx[i]),

					cl_data->sensor_sts[i]);

			rc = amdtp_hid_probe(i, cl_data);

			if (rc)

				goto cleanup;

			}

		} else {

			cl_data->sensor_sts[i] = SENSOR_DISABLED;

			dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

				cl_data->sensor_idx[i],

				get_sensor_name(cl_data->sensor_idx[i]),

				cl_data->sensor_sts[i]);

		}

		dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

			cl_data->sensor_idx[i], get_sensor_name(cl_data->sensor_idx[i]),

			cl_data->sensor_sts[i]);

	}



	if (!cl_data->is_any_sensor_enabled ||

	   (mp2_ops->discovery_status && mp2_ops->discovery_status(privdata) == 0)) {

		amd_sfh_hid_client_deinit(privdata);

		for (i = 0; i < cl_data->num_hid_devices; i++) {

			devm_kfree(dev, cl_data->feature_report[i]);

			devm_kfree(dev, in_data->input_report[i]);

			devm_kfree(dev, cl_data->report_descr[i]);

		}

		dev_warn(dev, "Failed to discover, sensors not enabled is %d\n", cl_data->is_any_sensor_enabled);

		return -EOPNOTSUPP;

		rc = -EOPNOTSUPP;

		goto cleanup;

	}

	schedule_delayed_work(&cl_data->work_buffer, msecs_to_jiffies(AMD_SFH_IDLE_LOOP));

	return 0;



cleanup:

	amd_sfh_hid_client_deinit(privdata);

	for (i = 0; i < cl_data->num_hid_devices; i++) {

		if (in_data->sensor_virt_addr[i]) {

			dma_free_coherent(&privdata->pdev->dev, 8 * sizeof(int),

					  in_data->sensor_virt_addr[i],

					  cl_data->sensor_dma_addr[i]);

		}

		devm_kfree(dev, cl_data->feature_report[i]);

		devm_kfree(dev, in_data->input_report[i]);

		devm_kfree(dev, cl_data->report_descr[i]);

drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c

+6 −18
Original line number Diff line number Diff line
@@ -168,29 +168,17 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) 
		status = amd_sfh_wait_for_response

				(privdata, cl_data->sensor_idx[i], ENABLE_SENSOR);



		status = (status == 0) ? SENSOR_ENABLED : SENSOR_DISABLED;

		cl_data->sensor_sts[i] = (status == 0) ? SENSOR_ENABLED : SENSOR_DISABLED;

	}



		if (status == SENSOR_ENABLED) {

	for (i = 0; i < cl_data->num_hid_devices; i++) {

		cl_data->cur_hid_dev = i;

		if (cl_data->sensor_sts[i] == SENSOR_ENABLED) {

			cl_data->is_any_sensor_enabled = true;

			cl_data->sensor_sts[i] = SENSOR_ENABLED;

			rc = amdtp_hid_probe(i, cl_data);

			if (rc) {

				mp2_ops->stop(privdata, cl_data->sensor_idx[i]);

				status = amd_sfh_wait_for_response

					(privdata, cl_data->sensor_idx[i], DISABLE_SENSOR);

				if (status == 0)

					status = SENSOR_DISABLED;

				if (status != SENSOR_ENABLED)

					cl_data->sensor_sts[i] = SENSOR_DISABLED;

				dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

					cl_data->sensor_idx[i],

					get_sensor_name(cl_data->sensor_idx[i]),

					cl_data->sensor_sts[i]);

			if (rc)

				goto cleanup;

		}

		} else {

			cl_data->sensor_sts[i] = SENSOR_DISABLED;

		}

		dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

			cl_data->sensor_idx[i], get_sensor_name(cl_data->sensor_idx[i]),

			cl_data->sensor_sts[i]);