Revert "soc: qcom: Stub IPCRTR client driver"

[karo-tx-linux.git] / drivers / gpio / gpio-qcom-smsm.c

diff --git a/drivers/gpio/gpio-qcom-smsm.c b/drivers/gpio/gpio-qcom-smsm.c
index 31f7fe8069edc01825e0ff308c8d86325bb161b8..c3e510364d146c6ef9a536ad24d4612ec19c536e 100644 (file)
--- a/drivers/gpio/gpio-qcom-smsm.c
+++ b/drivers/gpio/gpio-qcom-smsm.c
@@ -70,7 +70,7 @@ int qcom_smsm_change_state(struct qcom_smsm *smsm, u32 clear_mask, u32 set_mask)
 
        print_hex_dump(KERN_DEBUG, "raw data: ", DUMP_PREFIX_OFFSET, 16, 1, smsm->shared_state, smsm->shared_state_size, true);
 
-       // qcom_smem_signal(smsm->smem, smsm->signal_offset, smsm->signal_bit);
+       // qcom_smem_signal(-1, smsm->smem, smsm->signal_offset, smsm->signal_bit);
 
        return 0;
 }
@@ -220,21 +220,20 @@ static int qcom_smsm_probe(struct platform_device *pdev)
                return -ENOMEM;
        smsm->dev = &pdev->dev;
 
-       ret = qcom_smem_alloc(SMEM_SMSM_SHARED_STATE, 8 * sizeof(uint32_t));
+       ret = qcom_smem_alloc(-1, SMEM_SMSM_SHARED_STATE, 8 * sizeof(uint32_t));
        if (ret < 0 && ret != -EEXIST) {
                dev_err(&pdev->dev, "unable to allocate shared state entry\n");
                return ret;
        }
 
-       ret = qcom_smem_get(SMEM_SMSM_SHARED_STATE,
-                           (void**)&smsm->shared_state,
+       smsm->shared_state = qcom_smem_get(-1, SMEM_SMSM_SHARED_STATE,
                            &smsm->shared_state_size);
-       if (ret < 0) {
+       if (IS_ERR(smsm->shared_state)) {
                dev_err(&pdev->dev, "Unable to acquire shared state entry\n");
-               return ret;
+               return PTR_ERR(smsm->shared_state);
        }
 
-       dev_err(smsm->dev, "SMEM_SMSM_SHARED_STATE: %d, %d\n", ret, smsm->shared_state_size);
+       dev_err(smsm->dev, "SMEM_SMSM_SHARED_STATE: %d, %zu\n", ret, smsm->shared_state_size);
        print_hex_dump(KERN_DEBUG, "raw data: ", DUMP_PREFIX_OFFSET, 16, 1, smsm->shared_state, smsm->shared_state_size, true);
 
        for_each_child_of_node(pdev->dev.of_node, node) {