ipmi: kcs_bmc: make the code be more clean
PATCH 1/1 ipmi: kcs_bmc: make the code be more clean
Hi Corey,
I've changed some code style to meet with the whole Linux style. Please help to review.
BR,
Haiyue
---
1. Add the missed key word '__user' for read / write.
2. Remove the prefix 'file' of 'file_to_kcs_bmc', no need this duplicated word as its parameter has 'struct file *filp'.
3. Change the 'unsigned int' to '__poll_t' to meet the new 'poll' definition.
Signed-off-by Haiyue Wang <[email protected]>
--- drivers/char/ipmi/kcs_bmc.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/char/ipmi/kcs_bmc.c +13 -13
@@ -242,14 +242,14 @@ int kcs_bmc_handle_event(struct kcs_bmc *kcs_bmc) }EXPORT_SYMBOL (kcs_bmc_handle_event); -static inline struct kcs_bmc *file_to_kcs_bmc (struct file *filp) +static inline struct kcs_bmc *to_kcs_bmc (struct file *filp) { return container_of(filp->private_data, struct kcs_bmc, miscdev); }static int kcs_bmc_open (struct inode *inode,struct file *filp) { -struct kcs_bmc *kcs_bmc =file_to_kcs_bmc (filp); +struct kcs_bmc *kcs_bmc =to_kcs_bmc (filp);int ret =0 ;spin_lock_irq (&kcs_bmc->lock);
@@ -262,10 +262,10 @@ static int kcs_bmc_open(struct inode *inode, struct file *filp)return ret; } -static unsigned int kcs_bmc_poll (struct file *filp,poll_table *wait) +static __poll_t kcs_bmc_poll (struct file *filp,poll_table *wait) { -struct kcs_bmc *kcs_bmc =file_to_kcs_bmc (filp); -unsigned int mask =0 ; +struct kcs_bmc *kcs_bmc =to_kcs_bmc (filp); +__poll_t mask =0 ;poll_wait (filp, &kcs_bmc->queue, wait);
@@ -277,10 +277,10 @@ static unsigned int kcs_bmc_poll(struct file *filp, poll_table *wait)return mask; } -static ssize_t kcs_bmc_read (struct file *filp,char *buf, -size_t count,loff_t *offset) +static ssize_t kcs_bmc_read (struct file *filp,char __user *buf, +size_t count,loff_t *ppos) { -struct kcs_bmc *kcs_bmc =file_to_kcs_bmc (filp); +struct kcs_bmc *kcs_bmc =to_kcs_bmc (filp);bool data_avail;size_t data_len;ssize_t ret;
@@ -339,10 +339,10 @@ static ssize_t kcs_bmc_read(struct file *filp, char *buf,return ret; } -static ssize_t kcs_bmc_write (struct file *filp,const char *buf, -size_t count,loff_t *offset) +static ssize_t kcs_bmc_write (struct file *filp,const char __user *buf, +size_t count,loff_t *ppos) { -struct kcs_bmc *kcs_bmc =file_to_kcs_bmc (filp); +struct kcs_bmc *kcs_bmc =to_kcs_bmc (filp);ssize_t ret;/* a minimum response size '3' : netfn + cmd + ccode */
@@ -378,7 +378,7 @@ static ssize_t kcs_bmc_write(struct file *filp, const char *buf,static long kcs_bmc_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) { -struct kcs_bmc *kcs_bmc =file_to_kcs_bmc (filp); +struct kcs_bmc *kcs_bmc =to_kcs_bmc (filp);long ret =0 ;spin_lock_irq (&kcs_bmc->lock);
@@ -410,7 +410,7 @@ static long kcs_bmc_ioctl(struct file *filp, unsigned int cmd,static int kcs_bmc_release (struct inode *inode,struct file *filp) { -struct kcs_bmc *kcs_bmc =file_to_kcs_bmc (filp); +struct kcs_bmc *kcs_bmc =to_kcs_bmc (filp);spin_lock_irq (&kcs_bmc->lock); kcs_bmc->running =0 ;
Signature · 1 line
2.7.4