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

Commit 2e613e7f authored by Jean Delvare's avatar Jean Delvare
Browse files

therm_adt746x: Convert to a new-style i2c driver 



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

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

drivers/macintosh/therm_adt746x.c

+42 −42
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ MODULE_PARM_DESC(verbose,"Verbose log operations " 
		 "(default 0)");

		 "(default 0)");





struct thermostat {

struct thermostat {

	struct i2c_client	clt;

	struct i2c_client	*clt;

	u8			temps[3];

	u8			temps[3];

	u8			cached_temp[3];

	u8			cached_temp[3];

	u8			initial_limits[3];

	u8			initial_limits[3];
@@ -86,9 +86,6 @@ static struct of_device * of_dev; 
static struct thermostat* thermostat;

static struct thermostat* thermostat;

static struct task_struct *thread_therm = NULL;

static struct task_struct *thread_therm = NULL;





static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,

				 int busno);



static void write_both_fan_speed(struct thermostat *th, int speed);

static void write_both_fan_speed(struct thermostat *th, int speed);

static void write_fan_speed(struct thermostat *th, int speed, int fan);

static void write_fan_speed(struct thermostat *th, int speed, int fan);
@@ -100,7 +97,7 @@ write_reg(struct thermostat* th, int reg, u8 data) 
	

	

	tmp[0] = reg;

	tmp[0] = reg;

	tmp[1] = data;

	tmp[1] = data;

	rc = i2c_master_send(&th->clt, (const char *)tmp, 2);

	rc = i2c_master_send(th->clt, (const char *)tmp, 2);

	if (rc < 0)

	if (rc < 0)

		return rc;

		return rc;

	if (rc != 2)

	if (rc != 2)
@@ -115,12 +112,12 @@ read_reg(struct thermostat* th, int reg) 
	int rc;

	int rc;





	reg_addr = (u8)reg;

	reg_addr = (u8)reg;

	rc = i2c_master_send(&th->clt, &reg_addr, 1);

	rc = i2c_master_send(th->clt, &reg_addr, 1);

	if (rc < 0)

	if (rc < 0)

		return rc;

		return rc;

	if (rc != 1)

	if (rc != 1)

		return -ENODEV;

		return -ENODEV;

	rc = i2c_master_recv(&th->clt, (char *)&data, 1);

	rc = i2c_master_recv(th->clt, (char *)&data, 1);

	if (rc < 0)

	if (rc < 0)

		return rc;

		return rc;

	return data;

	return data;
@@ -130,26 +127,36 @@ static int 
attach_thermostat(struct i2c_adapter *adapter)

attach_thermostat(struct i2c_adapter *adapter)

{

{

	unsigned long bus_no;

	unsigned long bus_no;

	struct i2c_board_info info;

	struct i2c_client *client;





	if (strncmp(adapter->name, "uni-n", 5))

	if (strncmp(adapter->name, "uni-n", 5))

		return -ENODEV;

		return -ENODEV;

	bus_no = simple_strtoul(adapter->name + 6, NULL, 10);

	bus_no = simple_strtoul(adapter->name + 6, NULL, 10);

	if (bus_no != therm_bus)

	if (bus_no != therm_bus)

		return -ENODEV;

		return -ENODEV;

	return attach_one_thermostat(adapter, therm_address, bus_no);



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

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

	info.addr = therm_address;

	client = i2c_new_device(adapter, &info);

	if (!client)

		return -ENODEV;



	/*

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

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

	 */

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

	return 0;

}

}





static int

static int

detach_thermostat(struct i2c_adapter *adapter)

remove_thermostat(struct i2c_client *client)

{

{

	struct thermostat* th;

	struct thermostat *th = i2c_get_clientdata(client);

	int i;

	int i;

	

	

	if (thermostat == NULL)

		return 0;



	th = thermostat;



	if (thread_therm != NULL) {

	if (thread_therm != NULL) {

		kthread_stop(thread_therm);

		kthread_stop(thread_therm);

	}

	}
@@ -165,8 +172,6 @@ detach_thermostat(struct i2c_adapter *adapter) 




	write_both_fan_speed(th, -1);

	write_both_fan_speed(th, -1);





	i2c_detach_client(&th->clt);



	thermostat = NULL;

	thermostat = NULL;





	kfree(th);

	kfree(th);
@@ -174,14 +179,6 @@ detach_thermostat(struct i2c_adapter *adapter) 
	return 0;

	return 0;

}

}





static struct i2c_driver thermostat_driver = {  

	.driver = {

		.name	= "therm_adt746x",

	},

	.attach_adapter	= attach_thermostat,

	.detach_adapter	= detach_thermostat,

};



static int read_fan_speed(struct thermostat *th, u8 addr)

static int read_fan_speed(struct thermostat *th, u8 addr)

{

{

	u8 tmp[2];

	u8 tmp[2];
@@ -369,8 +366,8 @@ static void set_limit(struct thermostat *th, int i) 
		th->limits[i] = default_limits_local[i] + limit_adjust;

		th->limits[i] = default_limits_local[i] + limit_adjust;

}

}





static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,

static int probe_thermostat(struct i2c_client *client,

				 int busno)

			    const struct i2c_device_id *id)

{

{

	struct thermostat* th;

	struct thermostat* th;

	int rc;

	int rc;
@@ -383,16 +380,12 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr, 
	if (!th)

	if (!th)

		return -ENOMEM;

		return -ENOMEM;





	th->clt.addr = addr;

	i2c_set_clientdata(client, th);

	th->clt.adapter = adapter;

	th->clt = client;

	th->clt.driver = &thermostat_driver;

	strcpy(th->clt.name, "thermostat");





	rc = read_reg(th, 0);

	rc = read_reg(th, 0);

	if (rc < 0) {

	if (rc < 0) {

		printk(KERN_ERR "adt746x: Thermostat failed to read config "

		dev_err(&client->dev, "Thermostat failed to read config!\n");

				"from bus %d !\n",

				busno);

		kfree(th);

		kfree(th);

		return -ENODEV;

		return -ENODEV;

	}

	}
@@ -421,14 +414,6 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr, 




	thermostat = th;

	thermostat = th;





	if (i2c_attach_client(&th->clt)) {

		printk(KERN_INFO "adt746x: Thermostat failed to attach "

				 "client !\n");

		thermostat = NULL;

		kfree(th);

		return -ENODEV;

	}



	/* be sure to really write fan speed the first time */

	/* be sure to really write fan speed the first time */

	th->last_speed[0] = -2;

	th->last_speed[0] = -2;

	th->last_speed[1] = -2;

	th->last_speed[1] = -2;
@@ -454,6 +439,21 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr, 
	return 0;

	return 0;

}

}





static const struct i2c_device_id therm_adt746x_id[] = {

	{ "therm_adt746x", 0 },

	{ }

};



static struct i2c_driver thermostat_driver = {

	.driver = {

		.name	= "therm_adt746x",

	},

	.attach_adapter	= attach_thermostat,

	.probe = probe_thermostat,

	.remove = remove_thermostat,

	.id_table = therm_adt746x_id,

};



/* 

/* 

 * Now, unfortunately, sysfs doesn't give us a nice void * we could

 * Now, unfortunately, sysfs doesn't give us a nice void * we could

 * pass around to the attribute functions, so we don't really have

 * pass around to the attribute functions, so we don't really have