Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc006a22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.16-2' of git://git.infradead.org/linux-platform-drivers-x86 

Pull more x86 platform-drivers updates from Andy Shevchenko:
 "The DEFINE_SHOW_ATTRIBUTE() macro was defined privately in three
  locations and is useful for new and old users to avoid a lot of code
  duplication.

  Move the macro to seq_file.h.

  Along with above, clean up three drivers to use that macro.

  This, due to dependencies, was sent separately since affected changes
  weren't upstream originally yet. The rationale of doing this now is to
  allow use of new macro in v4.17 cycle in a conflictless manner"

* tag 'platform-drivers-x86-v4.16-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: samsung-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
  platform/x86: ideapad-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
  platform/x86: dell-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
  seq_file: Introduce DEFINE_SHOW_ATTRIBUTE() helper macro
parents 7590e37b 9a7c551b

drivers/mfd/ab8500-debugfs.c

+0 −14
Original line number Diff line number Diff line
@@ -1258,20 +1258,6 @@ static struct ab8500_prcmu_ranges ab8540_debug_ranges[AB8500_NUM_BANKS] = { 
	},

};



#define DEFINE_SHOW_ATTRIBUTE(__name)					      \

static int __name ## _open(struct inode *inode, struct file *file)	      \

{									      \

	return single_open(file, __name ## _show, inode->i_private);	      \

}									      \

									      \

static const struct file_operations __name ## _fops = {			      \

	.owner		= THIS_MODULE,					      \

	.open		= __name ## _open,				      \

	.read		= seq_read,					      \

	.llseek		= seq_lseek,					      \

	.release	= single_release,				      \

}									      \



static irqreturn_t ab8500_debug_handler(int irq, void *data)

{

	char buf[16];

drivers/platform/x86/dell-laptop.c

+1 −13
Original line number Diff line number Diff line
@@ -636,19 +636,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data) 


	return 0;

}



static int dell_debugfs_open(struct inode *inode, struct file *file)

{

	return single_open(file, dell_debugfs_show, inode->i_private);

}



static const struct file_operations dell_debugfs_fops = {

	.owner = THIS_MODULE,

	.open = dell_debugfs_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

DEFINE_SHOW_ATTRIBUTE(dell_debugfs);



static void dell_update_rfkill(struct work_struct *ignored)

{

drivers/platform/x86/ideapad-laptop.c

+2 −26
Original line number Diff line number Diff line
@@ -284,19 +284,7 @@ static int debugfs_status_show(struct seq_file *s, void *data) 


	return 0;

}



static int debugfs_status_open(struct inode *inode, struct file *file)

{

	return single_open(file, debugfs_status_show, inode->i_private);

}



static const struct file_operations debugfs_status_fops = {

	.owner = THIS_MODULE,

	.open = debugfs_status_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

DEFINE_SHOW_ATTRIBUTE(debugfs_status);



static int debugfs_cfg_show(struct seq_file *s, void *data)

{
@@ -337,19 +325,7 @@ static int debugfs_cfg_show(struct seq_file *s, void *data) 
	}

	return 0;

}



static int debugfs_cfg_open(struct inode *inode, struct file *file)

{

	return single_open(file, debugfs_cfg_show, inode->i_private);

}



static const struct file_operations debugfs_cfg_fops = {

	.owner = THIS_MODULE,

	.open = debugfs_cfg_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

DEFINE_SHOW_ATTRIBUTE(debugfs_cfg);



static int ideapad_debugfs_init(struct ideapad_private *priv)

{

drivers/platform/x86/pmc_atom.c

+0 −14
Original line number Diff line number Diff line
@@ -208,20 +208,6 @@ static const struct pmc_data cht_data = { 
	.clks = cht_clks,

};



#define DEFINE_SHOW_ATTRIBUTE(__name)					\

static int __name ## _open(struct inode *inode, struct file *file)	\

{									\

	return single_open(file, __name ## _show, inode->i_private);	\

}									\

									\

static const struct file_operations __name ## _fops = {			\

	.owner		= THIS_MODULE,					\

	.open		= __name ## _open,				\

	.read		= seq_read,					\

	.llseek		= seq_lseek,					\

	.release	= single_release,				\

}



static inline u32 pmc_reg_read(struct pmc_dev *pmc, int reg_offset)

{

	return readl(pmc->regmap + reg_offset);

drivers/platform/x86/samsung-laptop.c

+3 −15
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static int __init samsung_sysfs_init(struct samsung_laptop *samsung) 


}



static int show_call(struct seq_file *m, void *data)

static int samsung_laptop_call_show(struct seq_file *m, void *data)

{

	struct samsung_laptop *samsung = m->private;

	struct sabi_data *sdata = &samsung->debug.data;
@@ -1274,19 +1274,7 @@ static int show_call(struct seq_file *m, void *data) 
		   sdata->d0, sdata->d1, sdata->d2, sdata->d3);

	return 0;

}



static int samsung_debugfs_open(struct inode *inode, struct file *file)

{

	return single_open(file, show_call, inode->i_private);

}



static const struct file_operations samsung_laptop_call_io_ops = {

	.owner = THIS_MODULE,

	.open = samsung_debugfs_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

DEFINE_SHOW_ATTRIBUTE(samsung_laptop_call);



static void samsung_debugfs_exit(struct samsung_laptop *samsung)

{
@@ -1351,7 +1339,7 @@ static int samsung_debugfs_init(struct samsung_laptop *samsung) 


	dent = debugfs_create_file("call", S_IFREG | S_IRUGO,

				   samsung->debug.root, samsung,

				   &samsung_laptop_call_io_ops);

				   &samsung_laptop_call_fops);

	if (!dent)

		goto error_debugfs;