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

Commit 1b9f37d4 authored by Jean Delvare's avatar Jean Delvare
Browse files

therm_pm72: Convert to a new-style i2c driver 



The legacy i2c binding model is going away soon, so convert the
macintosh therm_pm72 driver to the new model or it will break.

This is really a quick and dirty conversion, that should do the trick
for now, but no doubt that something cleaner can be done if anyone is
interested.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: default avatarPaul Mackerras <paulus@samba.org>
parent a231591f

drivers/macintosh/therm_pm72.c

+47 −48
Original line number Diff line number Diff line
@@ -286,22 +286,6 @@ struct fcu_fan_table fcu_fans[] = { 
	},

};



/*

 * i2c_driver structure to attach to the host i2c controller

 */



static int therm_pm72_attach(struct i2c_adapter *adapter);

static int therm_pm72_detach(struct i2c_adapter *adapter);



static struct i2c_driver therm_pm72_driver =

{

	.driver = {

		.name	= "therm_pm72",

	},

	.attach_adapter	= therm_pm72_attach,

	.detach_adapter	= therm_pm72_detach,

};



/*

 * Utility function to create an i2c_client structure and

 * attach it to one of u3 adapters
@@ -310,6 +294,7 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name) 
{

	struct i2c_client *clt;

	struct i2c_adapter *adap;

	struct i2c_board_info info;



	if (id & 0x200)

		adap = k2;
@@ -320,31 +305,21 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name) 
	if (adap == NULL)

		return NULL;



	clt = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);

	if (clt == NULL)

		return NULL;



	clt->addr = (id >> 1) & 0x7f;

	clt->adapter = adap;

	clt->driver = &therm_pm72_driver;

	strncpy(clt->name, name, I2C_NAME_SIZE-1);



	if (i2c_attach_client(clt)) {

	memset(&info, 0, sizeof(struct i2c_board_info));

	info.addr = (id >> 1) & 0x7f;

	strlcpy(info.type, "therm_pm72", I2C_NAME_SIZE);

	clt = i2c_new_device(adap, &info);

	if (!clt) {

		printk(KERN_ERR "therm_pm72: Failed to attach to i2c ID 0x%x\n", id);

		kfree(clt);

		return NULL;

	}

	return clt;

}



	/*

 * Utility function to get rid of the i2c_client structure

 * (will also detach from the adapter hopepfully)

	 * Let i2c-core delete that device on driver removal.

	 * This is safe because i2c-core holds the core_lock mutex for us.

	 */

static void detach_i2c_chip(struct i2c_client *clt)

{

	i2c_detach_client(clt);

	kfree(clt);

	list_add_tail(&clt->detected, &clt->driver->clients);

	return clt;

}



/*
@@ -1203,8 +1178,6 @@ static int init_cpu_state(struct cpu_pid_state *state, int index) 


	return 0;

 fail:

	if (state->monitor)

		detach_i2c_chip(state->monitor);

	state->monitor = NULL;

	

	return -ENODEV;
@@ -1232,7 +1205,6 @@ static void dispose_cpu_state(struct cpu_pid_state *state) 
		device_remove_file(&of_dev->dev, &dev_attr_cpu1_intake_fan_rpm);

	}



	detach_i2c_chip(state->monitor);

	state->monitor = NULL;

}
@@ -1407,7 +1379,6 @@ static void dispose_backside_state(struct backside_pid_state *state) 
	device_remove_file(&of_dev->dev, &dev_attr_backside_temperature);

	device_remove_file(&of_dev->dev, &dev_attr_backside_fan_pwm);



	detach_i2c_chip(state->monitor);

	state->monitor = NULL;

}
@@ -1532,7 +1503,6 @@ static void dispose_drives_state(struct drives_pid_state *state) 
	device_remove_file(&of_dev->dev, &dev_attr_drives_temperature);

	device_remove_file(&of_dev->dev, &dev_attr_drives_fan_rpm);



	detach_i2c_chip(state->monitor);

	state->monitor = NULL;

}
@@ -1654,7 +1624,6 @@ static void dispose_dimms_state(struct dimm_pid_state *state) 


	device_remove_file(&of_dev->dev, &dev_attr_dimms_temperature);



	detach_i2c_chip(state->monitor);

	state->monitor = NULL;

}
@@ -1779,7 +1748,6 @@ static void dispose_slots_state(struct slots_pid_state *state) 
	device_remove_file(&of_dev->dev, &dev_attr_slots_temperature);

	device_remove_file(&of_dev->dev, &dev_attr_slots_fan_pwm);



	detach_i2c_chip(state->monitor);

	state->monitor = NULL;

}
@@ -2008,8 +1976,6 @@ static int attach_fcu(void) 
 */

static void detach_fcu(void)

{

	if (fcu)

		detach_i2c_chip(fcu);

	fcu = NULL;

}
@@ -2060,12 +2026,21 @@ static int therm_pm72_attach(struct i2c_adapter *adapter) 
	return 0;

}



static int therm_pm72_probe(struct i2c_client *client,

			    const struct i2c_device_id *id)

{

	/* Always succeed, the real work was done in therm_pm72_attach() */

	return 0;

}



/*

 * Called on every adapter when the driver or the i2c controller

 * Called when any of the devices which participates into thermal management

 * is going away.

 */

static int therm_pm72_detach(struct i2c_adapter *adapter)

static int therm_pm72_remove(struct i2c_client *client)

{

	struct i2c_adapter *adapter = client->adapter;



	mutex_lock(&driver_lock);



	if (state != state_detached)
@@ -2096,6 +2071,30 @@ static int therm_pm72_detach(struct i2c_adapter *adapter) 
	return 0;

}



/*

 * i2c_driver structure to attach to the host i2c controller

 */



static const struct i2c_device_id therm_pm72_id[] = {

	/*

	 * Fake device name, thermal management is done by several

	 * chips but we don't need to differentiate between them at

	 * this point.

	 */

	{ "therm_pm72", 0 },

	{ }

};



static struct i2c_driver therm_pm72_driver = {

	.driver = {

		.name	= "therm_pm72",

	},

	.attach_adapter	= therm_pm72_attach,

	.probe		= therm_pm72_probe,

	.remove		= therm_pm72_remove,

	.id_table	= therm_pm72_id,

};



static int fan_check_loc_match(const char *loc, int fan)

{

	char	tmp[64];