Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

platform/x86: intel_scu_ipcutil: Convert to use new SCU IPC API

Convert the IPC util to use the new SCU IPC API where the SCU IPC
instance is passed to the functions.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Mika Westerberg and committed by
Lee Jones
663cc188 80ae679b

+39 -4
+39 -4
drivers/platform/x86/intel_scu_ipcutil.c
··· 22 22 23 23 static int major; 24 24 25 + struct intel_scu_ipc_dev *scu; 26 + static DEFINE_MUTEX(scu_lock); 27 + 25 28 /* IOCTL commands */ 26 29 #define INTE_SCU_IPC_REGISTER_READ 0 27 30 #define INTE_SCU_IPC_REGISTER_WRITE 1 ··· 55 52 56 53 switch (cmd) { 57 54 case INTE_SCU_IPC_REGISTER_READ: 58 - return intel_scu_ipc_readv(data->addr, data->data, count); 55 + return intel_scu_ipc_dev_readv(scu, data->addr, data->data, count); 59 56 case INTE_SCU_IPC_REGISTER_WRITE: 60 - return intel_scu_ipc_writev(data->addr, data->data, count); 57 + return intel_scu_ipc_dev_writev(scu, data->addr, data->data, count); 61 58 case INTE_SCU_IPC_REGISTER_UPDATE: 62 - return intel_scu_ipc_update_register(data->addr[0], 63 - data->data[0], data->mask); 59 + return intel_scu_ipc_dev_update(scu, data->addr[0], data->data[0], 60 + data->mask); 64 61 default: 65 62 return -ENOTTY; 66 63 } ··· 94 91 return 0; 95 92 } 96 93 94 + static int scu_ipc_open(struct inode *inode, struct file *file) 95 + { 96 + int ret = 0; 97 + 98 + /* Only single open at the time */ 99 + mutex_lock(&scu_lock); 100 + if (scu) { 101 + ret = -EBUSY; 102 + goto unlock; 103 + } 104 + 105 + scu = intel_scu_ipc_dev_get(); 106 + if (!scu) 107 + ret = -ENODEV; 108 + 109 + unlock: 110 + mutex_unlock(&scu_lock); 111 + return ret; 112 + } 113 + 114 + static int scu_ipc_release(struct inode *inode, struct file *file) 115 + { 116 + mutex_lock(&scu_lock); 117 + intel_scu_ipc_dev_put(scu); 118 + scu = NULL; 119 + mutex_unlock(&scu_lock); 120 + 121 + return 0; 122 + } 123 + 97 124 static const struct file_operations scu_ipc_fops = { 98 125 .unlocked_ioctl = scu_ipc_ioctl, 126 + .open = scu_ipc_open, 127 + .release = scu_ipc_release, 99 128 }; 100 129 101 130 static int __init ipc_module_init(void)