Commit a12475f9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'thermal-int340x' 

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
parents fa1ef24a d0f6cfb2

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int evaluate_odvp(struct int3400_thermal_priv *priv); 
struct odvp_attr {

	int odvp;

	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,
@@ -311,7 +311,7 @@ static int int3400_thermal_get_uuids(struct int3400_thermal_priv *priv) 
	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)

{

	struct odvp_attr *odvp_attr;