* Andy Shevchenko <andriy.shevche...@linux.intel.com> wrote:
> ...instead of open coding file operations followed by custom ->open()
> callbacks per each attribute.
>
> While here, replace permissions by explicit octal value.
>
> Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
> ---
> arch/x86/platform/atom/punit_atom_debug.c | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/arch/x86/platform/atom/punit_atom_debug.c
> b/arch/x86/platform/atom/punit_atom_debug.c
> index d49d3be81953..156b445bcf4d 100644
> --- a/arch/x86/platform/atom/punit_atom_debug.c
> +++ b/arch/x86/platform/atom/punit_atom_debug.c
> @@ -109,18 +109,7 @@ static int punit_dev_state_show(struct seq_file
> *seq_file, void *unused)
>
> return 0;
> }
> -
> -static int punit_dev_state_open(struct inode *inode, struct file *file)
> -{
> - return single_open(file, punit_dev_state_show, inode->i_private);
> -}
> -
> -static const struct file_operations punit_dev_state_ops = {
> - .open = punit_dev_state_open,
> - .read = seq_read,
> - .llseek = seq_lseek,
> - .release = single_release,
> -};
> +DEFINE_SHOW_ATTRIBUTE(punit_dev_state);
>
> static struct dentry *punit_dbg_file;
Hm, that octal value replacement does not seem to be part of this patch, only
the
next patch.
Also, the debugfs_create_file() call still uses the old &punit_dev_state_ops
callback array.
Did a patch hunk go missing?
I've added the fixes below to the patch.
Thanks,
Ingo
--- tip.orig/arch/x86/platform/atom/punit_atom_debug.c
+++ tip/arch/x86/platform/atom/punit_atom_debug.c
@@ -132,9 +121,9 @@ static int punit_dbgfs_register(struct p
if (!punit_dbg_file)
return -ENXIO;
- dev_state = debugfs_create_file("dev_power_state", S_IFREG | S_IRUGO,
+ dev_state = debugfs_create_file("dev_power_state", 0444,
punit_dbg_file, punit_device,
- &punit_dev_state_ops);
+ &punit_dev_state_fops);
if (!dev_state) {
pr_err("punit_dev_state register failed\n");
debugfs_remove(punit_dbg_file);
