public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'thermal-int340x'

Browse source 
Merge a fix for the attr.show callback prototype in the int340x thermal
driver (Kees Cook).

* thermal-int340x:
  thermal: int340x: Fix attr.show callback prototype
This commit is contained in:
Rafael J. Wysocki 2022-04-28 16:51:24 +02:00
commit a12475f91b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/thermal/intel/int340x_thermal/int3400_thermal.c
View file

@ -68,7 +68,7 @@ static int evaluate_odvp(struct int3400_thermal_priv *priv);
struct odvp_attr { struct odvp_attr {
int odvp; int odvp;
struct int3400_thermal_priv *priv; struct int3400_thermal_priv *priv;
struct kobj_attribute attr; struct device_attribute attr;
}; };
static ssize_t data_vault_read(struct file *file, struct kobject *kobj, static ssize_t data_vault_read(struct file *file, struct kobject *kobj,
@ -311,7 +311,7 @@ end:
return result; return result;
} }
static ssize_t odvp_show(struct kobject *kobj, struct kobj_attribute *attr, static ssize_t odvp_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct odvp_attr *odvp_attr; struct odvp_attr *odvp_attr;