soc: qcom: smd: Make callback pass channel reference

[karo-tx-linux.git] / drivers / soc / qcom / smd-rpm.c

diff --git a/drivers/soc/qcom/smd-rpm.c b/drivers/soc/qcom/smd-rpm.c
index 731fa066f712ebdd9a66135c773e6e7ce619c75d..6609d7e0edb045c3f26e159ee8938037de397dd2 100644 (file)
--- a/drivers/soc/qcom/smd-rpm.c
+++ b/drivers/soc/qcom/smd-rpm.c
@@ -33,6 +33,7 @@
  */
 struct qcom_smd_rpm {
        struct qcom_smd_channel *rpm_channel;
+       struct device *dev;
 
        struct completion ack;
        struct mutex lock;
@@ -149,14 +150,14 @@ out:
 }
 EXPORT_SYMBOL(qcom_rpm_smd_write);
 
-static int qcom_smd_rpm_callback(struct qcom_smd_device *qsdev,
+static int qcom_smd_rpm_callback(struct qcom_smd_channel *channel,
                                 const void *data,
                                 size_t count)
 {
        const struct qcom_rpm_header *hdr = data;
        size_t hdr_length = le32_to_cpu(hdr->length);
        const struct qcom_rpm_message *msg;
-       struct qcom_smd_rpm *rpm = dev_get_drvdata(&qsdev->dev);
+       struct qcom_smd_rpm *rpm = qcom_smd_get_drvdata(channel);
        const u8 *buf = data + sizeof(struct qcom_rpm_header);
        const u8 *end = buf + hdr_length;
        char msgbuf[32];
@@ -165,7 +166,7 @@ static int qcom_smd_rpm_callback(struct qcom_smd_device *qsdev,
 
        if (le32_to_cpu(hdr->service_type) != RPM_SERVICE_TYPE_REQUEST ||
            hdr_length < sizeof(struct qcom_rpm_message)) {
-               dev_err(&qsdev->dev, "invalid request\n");
+               dev_err(rpm->dev, "invalid request\n");
                return 0;
        }
 
@@ -206,7 +207,9 @@ static int qcom_smd_rpm_probe(struct qcom_smd_device *sdev)
        mutex_init(&rpm->lock);
        init_completion(&rpm->ack);
 
+       rpm->dev = &sdev->dev;
        rpm->rpm_channel = sdev->channel;
+       qcom_smd_set_drvdata(sdev->channel, rpm);
 
        dev_set_drvdata(&sdev->dev, rpm);