diff options
Diffstat (limited to 'drivers/hwmon/lm78.c')
| -rw-r--r-- | drivers/hwmon/lm78.c | 533 | 
1 files changed, 315 insertions, 218 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 72ff2c4e757..9efadfc851b 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c @@ -1,46 +1,46 @@  /* -    lm78.c - Part of lm_sensors, Linux kernel modules for hardware -             monitoring -    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>  -    Copyright (c) 2007        Jean Delvare <khali@linux-fr.org> - -    This program is free software; you can redistribute it and/or modify -    it under the terms of the GNU General Public License as published by -    the Free Software Foundation; either version 2 of the License, or -    (at your option) any later version. - -    This program is distributed in the hope that it will be useful, -    but WITHOUT ANY WARRANTY; without even the implied warranty of -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -    GNU General Public License for more details. - -    You should have received a copy of the GNU General Public License -    along with this program; if not, write to the Free Software -    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + * lm78.c - Part of lm_sensors, Linux kernel modules for hardware + *	    monitoring + * Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl> + * Copyright (c) 2007, 2011  Jean Delvare <jdelvare@suse.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt  #include <linux/module.h>  #include <linux/init.h>  #include <linux/slab.h>  #include <linux/jiffies.h>  #include <linux/i2c.h> -#include <linux/platform_device.h> -#include <linux/ioport.h>  #include <linux/hwmon.h>  #include <linux/hwmon-vid.h>  #include <linux/hwmon-sysfs.h>  #include <linux/err.h>  #include <linux/mutex.h> -#include <linux/io.h> -/* ISA device, if found */ -static struct platform_device *pdev; +#ifdef CONFIG_ISA +#include <linux/platform_device.h> +#include <linux/ioport.h> +#include <linux/io.h> +#endif  /* Addresses to scan */  static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,  						0x2e, 0x2f, I2C_CLIENT_END }; -static unsigned short isa_address = 0x290; -  enum chips { lm78, lm79 };  /* Many LM78 constants specified below */ @@ -74,14 +74,18 @@ enum chips { lm78, lm79 };  #define LM78_REG_I2C_ADDR 0x48 -/* Conversions. Rounding and limit checking is only done on the TO_REG  -   variants. */ +/* + * Conversions. Rounding and limit checking is only done on the TO_REG + * variants. + */ -/* IN: mV, (0V to 4.08V) -   REG: 16mV/bit */ +/* + * IN: mV (0V to 4.08V) + * REG: 16mV/bit + */  static inline u8 IN_TO_REG(unsigned long val)  { -	unsigned long nval = SENSORS_LIMIT(val, 0, 4080); +	unsigned long nval = clamp_val(val, 0, 4080);  	return (nval + 8) / 16;  }  #define IN_FROM_REG(val) ((val) *  16) @@ -90,20 +94,24 @@ static inline u8 FAN_TO_REG(long rpm, int div)  {  	if (rpm <= 0)  		return 255; -	return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254); +	if (rpm > 1350000) +		return 1; +	return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 254);  }  static inline int FAN_FROM_REG(u8 val, int div)  { -	return val==0 ? -1 : val==255 ? 0 : 1350000/(val*div); +	return val == 0 ? -1 : val == 255 ? 0 : 1350000 / (val * div);  } -/* TEMP: mC (-128C to +127C) -   REG: 1C/bit, two's complement */ +/* + * TEMP: mC (-128C to +127C) + * REG: 1C/bit, two's complement + */  static inline s8 TEMP_TO_REG(int val)  { -	int nval = SENSORS_LIMIT(val, -128000, 127000) ; -	return nval<0 ? (nval-500)/1000 : (nval+500)/1000; +	int nval = clamp_val(val, -128000, 127000) ; +	return nval < 0 ? (nval - 500) / 1000 : (nval + 500) / 1000;  }  static inline int TEMP_FROM_REG(s8 val) @@ -141,50 +149,12 @@ struct lm78_data {  }; -static int lm78_i2c_detect(struct i2c_client *client, -			   struct i2c_board_info *info); -static int lm78_i2c_probe(struct i2c_client *client, -			  const struct i2c_device_id *id); -static int lm78_i2c_remove(struct i2c_client *client); - -static int __devinit lm78_isa_probe(struct platform_device *pdev); -static int __devexit lm78_isa_remove(struct platform_device *pdev); -  static int lm78_read_value(struct lm78_data *data, u8 reg);  static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value);  static struct lm78_data *lm78_update_device(struct device *dev);  static void lm78_init_device(struct lm78_data *data); -static const struct i2c_device_id lm78_i2c_id[] = { -	{ "lm78", lm78 }, -	{ "lm79", lm79 }, -	{ } -}; -MODULE_DEVICE_TABLE(i2c, lm78_i2c_id); - -static struct i2c_driver lm78_driver = { -	.class		= I2C_CLASS_HWMON, -	.driver = { -		.name	= "lm78", -	}, -	.probe		= lm78_i2c_probe, -	.remove		= lm78_i2c_remove, -	.id_table	= lm78_i2c_id, -	.detect		= lm78_i2c_detect, -	.address_list	= normal_i2c, -}; - -static struct platform_driver lm78_isa_driver = { -	.driver = { -		.owner	= THIS_MODULE, -		.name	= "lm78", -	}, -	.probe		= lm78_isa_probe, -	.remove		= __devexit_p(lm78_isa_remove), -}; - -  /* 7 Voltages */  static ssize_t show_in(struct device *dev, struct device_attribute *da,  		       char *buf) @@ -215,8 +185,13 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *da,  {  	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);  	struct lm78_data *data = dev_get_drvdata(dev); -	unsigned long val = simple_strtoul(buf, NULL, 10);  	int nr = attr->index; +	unsigned long val; +	int err; + +	err = kstrtoul(buf, 10, &val); +	if (err) +		return err;  	mutex_lock(&data->update_lock);  	data->in_min[nr] = IN_TO_REG(val); @@ -230,8 +205,13 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da,  {  	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);  	struct lm78_data *data = dev_get_drvdata(dev); -	unsigned long val = simple_strtoul(buf, NULL, 10);  	int nr = attr->index; +	unsigned long val; +	int err; + +	err = kstrtoul(buf, 10, &val); +	if (err) +		return err;  	mutex_lock(&data->update_lock);  	data->in_max[nr] = IN_TO_REG(val); @@ -239,7 +219,7 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da,  	mutex_unlock(&data->update_lock);  	return count;  } -	 +  #define show_in_offset(offset)					\  static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\  		show_in, NULL, offset);				\ @@ -275,7 +255,12 @@ static ssize_t set_temp_over(struct device *dev, struct device_attribute *da,  			     const char *buf, size_t count)  {  	struct lm78_data *data = dev_get_drvdata(dev); -	long val = simple_strtol(buf, NULL, 10); +	long val; +	int err; + +	err = kstrtol(buf, 10, &val); +	if (err) +		return err;  	mutex_lock(&data->update_lock);  	data->temp_over = TEMP_TO_REG(val); @@ -295,7 +280,12 @@ static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *da,  			     const char *buf, size_t count)  {  	struct lm78_data *data = dev_get_drvdata(dev); -	long val = simple_strtol(buf, NULL, 10); +	long val; +	int err; + +	err = kstrtol(buf, 10, &val); +	if (err) +		return err;  	mutex_lock(&data->update_lock);  	data->temp_hyst = TEMP_TO_REG(val); @@ -318,7 +308,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *da,  	struct lm78_data *data = lm78_update_device(dev);  	int nr = attr->index;  	return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr], -		DIV_FROM_REG(data->fan_div[nr])) ); +		DIV_FROM_REG(data->fan_div[nr])));  }  static ssize_t show_fan_min(struct device *dev, struct device_attribute *da, @@ -327,8 +317,8 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,  	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);  	struct lm78_data *data = lm78_update_device(dev);  	int nr = attr->index; -	return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan_min[nr], -		DIV_FROM_REG(data->fan_div[nr])) ); +	return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[nr], +		DIV_FROM_REG(data->fan_div[nr])));  }  static ssize_t set_fan_min(struct device *dev, struct device_attribute *da, @@ -337,7 +327,12 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,  	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);  	struct lm78_data *data = dev_get_drvdata(dev);  	int nr = attr->index; -	unsigned long val = simple_strtoul(buf, NULL, 10); +	unsigned long val; +	int err; + +	err = kstrtoul(buf, 10, &val); +	if (err) +		return err;  	mutex_lock(&data->update_lock);  	data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr])); @@ -354,32 +349,48 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,  	return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[attr->index]));  } -/* Note: we save and restore the fan minimum here, because its value is -   determined in part by the fan divisor.  This follows the principle of -   least surprise; the user doesn't expect the fan minimum to change just -   because the divisor changed. */ +/* + * Note: we save and restore the fan minimum here, because its value is + * determined in part by the fan divisor.  This follows the principle of + * least surprise; the user doesn't expect the fan minimum to change just + * because the divisor changed. + */  static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,  			   const char *buf, size_t count)  {  	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);  	struct lm78_data *data = dev_get_drvdata(dev);  	int nr = attr->index; -	unsigned long val = simple_strtoul(buf, NULL, 10);  	unsigned long min;  	u8 reg; +	unsigned long val; +	int err; + +	err = kstrtoul(buf, 10, &val); +	if (err) +		return err;  	mutex_lock(&data->update_lock);  	min = FAN_FROM_REG(data->fan_min[nr],  			   DIV_FROM_REG(data->fan_div[nr]));  	switch (val) { -	case 1: data->fan_div[nr] = 0; break; -	case 2: data->fan_div[nr] = 1; break; -	case 4: data->fan_div[nr] = 2; break; -	case 8: data->fan_div[nr] = 3; break; +	case 1: +		data->fan_div[nr] = 0; +		break; +	case 2: +		data->fan_div[nr] = 1; +		break; +	case 4: +		data->fan_div[nr] = 2; +		break; +	case 8: +		data->fan_div[nr] = 3; +		break;  	default: -		dev_err(dev, "fan_div value %ld not " -			"supported. Choose one of 1, 2, 4 or 8!\n", val); +		dev_err(dev, +			"fan_div value %ld not supported. Choose one of 1, 2, 4 or 8!\n", +			val);  		mutex_unlock(&data->update_lock);  		return -EINVAL;  	} @@ -512,8 +523,20 @@ static const struct attribute_group lm78_group = {  	.attrs = lm78_attributes,  }; -/* I2C devices get this name attribute automatically, but for ISA devices -   we must create it by ourselves. */ +/* + * ISA related code + */ +#ifdef CONFIG_ISA + +/* ISA device, if found */ +static struct platform_device *pdev; + +static unsigned short isa_address = 0x290; + +/* + * I2C devices get this name attribute automatically, but for ISA devices + * we must create it by ourselves. + */  static ssize_t show_name(struct device *dev, struct device_attribute  			 *devattr, char *buf)  { @@ -523,6 +546,11 @@ static ssize_t show_name(struct device *dev, struct device_attribute  }  static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); +static struct lm78_data *lm78_data_if_isa(void) +{ +	return pdev ? platform_get_drvdata(pdev) : NULL; +} +  /* Returns 1 if the I2C chip appears to be an alias of the ISA chip */  static int lm78_alias_detect(struct i2c_client *client, u8 chipid)  { @@ -538,8 +566,10 @@ static int lm78_alias_detect(struct i2c_client *client, u8 chipid)  	if ((lm78_read_value(isa, LM78_REG_CHIPID) & 0xfe) != (chipid & 0xfe))  		return 0;	/* Chip type doesn't match */ -	/* We compare all the limit registers, the config register and the -	 * interrupt mask registers */ +	/* +	 * We compare all the limit registers, the config register and the +	 * interrupt mask registers +	 */  	for (i = 0x2b; i <= 0x3d; i++) {  		if (lm78_read_value(isa, i) !=  		    i2c_smbus_read_byte_data(client, i)) @@ -556,12 +586,24 @@ static int lm78_alias_detect(struct i2c_client *client, u8 chipid)  	return 1;  } +#else /* !CONFIG_ISA */ + +static int lm78_alias_detect(struct i2c_client *client, u8 chipid) +{ +	return 0; +} + +static struct lm78_data *lm78_data_if_isa(void) +{ +	return NULL; +} +#endif /* CONFIG_ISA */  static int lm78_i2c_detect(struct i2c_client *client,  			   struct i2c_board_info *info)  {  	int i; -	struct lm78_data *isa = pdev ? platform_get_drvdata(pdev) : NULL; +	struct lm78_data *isa = lm78_data_if_isa();  	const char *client_name;  	struct i2c_adapter *adapter = client->adapter;  	int address = client->addr; @@ -569,9 +611,11 @@ static int lm78_i2c_detect(struct i2c_client *client,  	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))  		return -ENODEV; -	/* We block updates of the ISA device to minimize the risk of -	   concurrent access to the same LM78 chip through different -	   interfaces. */ +	/* +	 * We block updates of the ISA device to minimize the risk of +	 * concurrent access to the same LM78 chip through different +	 * interfaces. +	 */  	if (isa)  		mutex_lock(&isa->update_lock); @@ -595,8 +639,9 @@ static int lm78_i2c_detect(struct i2c_client *client,  		goto err_nodev;  	if (lm78_alias_detect(client, i)) { -		dev_dbg(&adapter->dev, "Device at 0x%02x appears to " -			"be the same as ISA device\n", address); +		dev_dbg(&adapter->dev, +			"Device at 0x%02x appears to be the same as ISA device\n", +			address);  		goto err_nodev;  	} @@ -619,7 +664,7 @@ static int lm78_i2c_probe(struct i2c_client *client,  	struct lm78_data *data;  	int err; -	data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL); +	data = devm_kzalloc(&client->dev, sizeof(struct lm78_data), GFP_KERNEL);  	if (!data)  		return -ENOMEM; @@ -633,20 +678,18 @@ static int lm78_i2c_probe(struct i2c_client *client,  	/* Register sysfs hooks */  	err = sysfs_create_group(&client->dev.kobj, &lm78_group);  	if (err) -		goto ERROR3; +		return err;  	data->hwmon_dev = hwmon_device_register(&client->dev);  	if (IS_ERR(data->hwmon_dev)) {  		err = PTR_ERR(data->hwmon_dev); -		goto ERROR4; +		goto error;  	}  	return 0; -ERROR4: +error:  	sysfs_remove_group(&client->dev.kobj, &lm78_group); -ERROR3: -	kfree(data);  	return err;  } @@ -656,91 +699,41 @@ static int lm78_i2c_remove(struct i2c_client *client)  	hwmon_device_unregister(data->hwmon_dev);  	sysfs_remove_group(&client->dev.kobj, &lm78_group); -	kfree(data);  	return 0;  } -static int __devinit lm78_isa_probe(struct platform_device *pdev) -{ -	int err; -	struct lm78_data *data; -	struct resource *res; - -	/* Reserve the ISA region */ -	res = platform_get_resource(pdev, IORESOURCE_IO, 0); -	if (!request_region(res->start + LM78_ADDR_REG_OFFSET, 2, "lm78")) { -		err = -EBUSY; -		goto exit; -	} - -	if (!(data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL))) { -		err = -ENOMEM; -		goto exit_release_region; -	} -	mutex_init(&data->lock); -	data->isa_addr = res->start; -	platform_set_drvdata(pdev, data); - -	if (lm78_read_value(data, LM78_REG_CHIPID) & 0x80) { -		data->type = lm79; -		data->name = "lm79"; -	} else { -		data->type = lm78; -		data->name = "lm78"; -	} - -	/* Initialize the LM78 chip */ -	lm78_init_device(data); - -	/* Register sysfs hooks */ -	if ((err = sysfs_create_group(&pdev->dev.kobj, &lm78_group)) -	 || (err = device_create_file(&pdev->dev, &dev_attr_name))) -		goto exit_remove_files; - -	data->hwmon_dev = hwmon_device_register(&pdev->dev); -	if (IS_ERR(data->hwmon_dev)) { -		err = PTR_ERR(data->hwmon_dev); -		goto exit_remove_files; -	} - -	return 0; - - exit_remove_files: -	sysfs_remove_group(&pdev->dev.kobj, &lm78_group); -	device_remove_file(&pdev->dev, &dev_attr_name); -	kfree(data); - exit_release_region: -	release_region(res->start + LM78_ADDR_REG_OFFSET, 2); - exit: -	return err; -} - -static int __devexit lm78_isa_remove(struct platform_device *pdev) -{ -	struct lm78_data *data = platform_get_drvdata(pdev); -	struct resource *res; - -	hwmon_device_unregister(data->hwmon_dev); -	sysfs_remove_group(&pdev->dev.kobj, &lm78_group); -	device_remove_file(&pdev->dev, &dev_attr_name); -	kfree(data); - -	res = platform_get_resource(pdev, IORESOURCE_IO, 0); -	release_region(res->start + LM78_ADDR_REG_OFFSET, 2); +static const struct i2c_device_id lm78_i2c_id[] = { +	{ "lm78", lm78 }, +	{ "lm79", lm79 }, +	{ } +}; +MODULE_DEVICE_TABLE(i2c, lm78_i2c_id); -	return 0; -} +static struct i2c_driver lm78_driver = { +	.class		= I2C_CLASS_HWMON, +	.driver = { +		.name	= "lm78", +	}, +	.probe		= lm78_i2c_probe, +	.remove		= lm78_i2c_remove, +	.id_table	= lm78_i2c_id, +	.detect		= lm78_i2c_detect, +	.address_list	= normal_i2c, +}; -/* The SMBus locks itself, but ISA access must be locked explicitly!  -   We don't want to lock the whole ISA bus, so we lock each client -   separately. -   We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks, -   would slow down the LM78 access and should not be necessary.  */ +/* + * The SMBus locks itself, but ISA access must be locked explicitly! + * We don't want to lock the whole ISA bus, so we lock each client + * separately. + * We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks, + * would slow down the LM78 access and should not be necessary. + */  static int lm78_read_value(struct lm78_data *data, u8 reg)  {  	struct i2c_client *client = data->client; +#ifdef CONFIG_ISA  	if (!client) { /* ISA device */  		int res;  		mutex_lock(&data->lock); @@ -749,20 +742,15 @@ static int lm78_read_value(struct lm78_data *data, u8 reg)  		mutex_unlock(&data->lock);  		return res;  	} else +#endif  		return i2c_smbus_read_byte_data(client, reg);  } -/* The SMBus locks itself, but ISA access muse be locked explicitly!  -   We don't want to lock the whole ISA bus, so we lock each client -   separately. -   We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks, -   would slow down the LM78 access and should not be necessary.  -   There are some ugly typecasts here, but the good new is - they should -   nowhere else be necessary! */  static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value)  {  	struct i2c_client *client = data->client; +#ifdef CONFIG_ISA  	if (!client) { /* ISA device */  		mutex_lock(&data->lock);  		outb_p(reg, data->isa_addr + LM78_ADDR_REG_OFFSET); @@ -770,6 +758,7 @@ static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value)  		mutex_unlock(&data->lock);  		return 0;  	} else +#endif  		return i2c_smbus_write_byte_data(client, reg, value);  } @@ -847,25 +836,103 @@ static struct lm78_data *lm78_update_device(struct device *dev)  	return data;  } +#ifdef CONFIG_ISA +static int lm78_isa_probe(struct platform_device *pdev) +{ +	int err; +	struct lm78_data *data; +	struct resource *res; + +	/* Reserve the ISA region */ +	res = platform_get_resource(pdev, IORESOURCE_IO, 0); +	if (!devm_request_region(&pdev->dev, res->start + LM78_ADDR_REG_OFFSET, +				 2, "lm78")) +		return -EBUSY; + +	data = devm_kzalloc(&pdev->dev, sizeof(struct lm78_data), GFP_KERNEL); +	if (!data) +		return -ENOMEM; + +	mutex_init(&data->lock); +	data->isa_addr = res->start; +	platform_set_drvdata(pdev, data); + +	if (lm78_read_value(data, LM78_REG_CHIPID) & 0x80) { +		data->type = lm79; +		data->name = "lm79"; +	} else { +		data->type = lm78; +		data->name = "lm78"; +	} + +	/* Initialize the LM78 chip */ +	lm78_init_device(data); + +	/* Register sysfs hooks */ +	err = sysfs_create_group(&pdev->dev.kobj, &lm78_group); +	if (err) +		goto exit_remove_files; +	err = device_create_file(&pdev->dev, &dev_attr_name); +	if (err) +		goto exit_remove_files; + +	data->hwmon_dev = hwmon_device_register(&pdev->dev); +	if (IS_ERR(data->hwmon_dev)) { +		err = PTR_ERR(data->hwmon_dev); +		goto exit_remove_files; +	} + +	return 0; + + exit_remove_files: +	sysfs_remove_group(&pdev->dev.kobj, &lm78_group); +	device_remove_file(&pdev->dev, &dev_attr_name); +	return err; +} + +static int lm78_isa_remove(struct platform_device *pdev) +{ +	struct lm78_data *data = platform_get_drvdata(pdev); + +	hwmon_device_unregister(data->hwmon_dev); +	sysfs_remove_group(&pdev->dev.kobj, &lm78_group); +	device_remove_file(&pdev->dev, &dev_attr_name); + +	return 0; +} + +static struct platform_driver lm78_isa_driver = { +	.driver = { +		.owner	= THIS_MODULE, +		.name	= "lm78", +	}, +	.probe		= lm78_isa_probe, +	.remove		= lm78_isa_remove, +}; +  /* return 1 if a supported chip is found, 0 otherwise */  static int __init lm78_isa_found(unsigned short address)  {  	int val, save, found = 0;  	int port; -	/* Some boards declare base+0 to base+7 as a PNP device, some base+4 +	/* +	 * Some boards declare base+0 to base+7 as a PNP device, some base+4  	 * to base+7 and some base+5 to base+6. So we better request each port -	 * individually for the probing phase. */ +	 * individually for the probing phase. +	 */  	for (port = address; port < address + LM78_EXTENT; port++) {  		if (!request_region(port, 1, "lm78")) { -			pr_debug("lm78: Failed to request port 0x%x\n", port); +			pr_debug("Failed to request port 0x%x\n", port);  			goto release;  		}  	}  #define REALLY_SLOW_IO -	/* We need the timeouts for at least some LM78-like -	   chips. But only if we read 'undefined' registers. */ +	/* +	 * We need the timeouts for at least some LM78-like +	 * chips. But only if we read 'undefined' registers. +	 */  	val = inb_p(address + 1);  	if (inb_p(address + 2) != val  	 || inb_p(address + 3) != val @@ -873,8 +940,10 @@ static int __init lm78_isa_found(unsigned short address)  		goto release;  #undef REALLY_SLOW_IO -	/* We should be able to change the 7 LSB of the address port. The -	   MSB (busy flag) should be clear initially, set after the write. */ +	/* +	 * We should be able to change the 7 LSB of the address port. The +	 * MSB (busy flag) should be clear initially, set after the write. +	 */  	save = inb_p(address + LM78_ADDR_REG_OFFSET);  	if (save & 0x80)  		goto release; @@ -920,7 +989,7 @@ static int __init lm78_isa_found(unsigned short address)  		found = 1;  	if (found) -		pr_info("lm78: Found an %s chip at %#x\n", +		pr_info("Found an %s chip at %#x\n",  			val & 0x80 ? "LM79" : "LM78", (int)address);   release: @@ -942,21 +1011,19 @@ static int __init lm78_isa_device_add(unsigned short address)  	pdev = platform_device_alloc("lm78", address);  	if (!pdev) {  		err = -ENOMEM; -		printk(KERN_ERR "lm78: Device allocation failed\n"); +		pr_err("Device allocation failed\n");  		goto exit;  	}  	err = platform_device_add_resources(pdev, &res, 1);  	if (err) { -		printk(KERN_ERR "lm78: Device resource addition failed " -		       "(%d)\n", err); +		pr_err("Device resource addition failed (%d)\n", err);  		goto exit_device_put;  	}  	err = platform_device_add(pdev);  	if (err) { -		printk(KERN_ERR "lm78: Device addition failed (%d)\n", -		       err); +		pr_err("Device addition failed (%d)\n", err);  		goto exit_device_put;  	} @@ -969,12 +1036,10 @@ static int __init lm78_isa_device_add(unsigned short address)  	return err;  } -static int __init sm_lm78_init(void) +static int __init lm78_isa_register(void)  {  	int res; -	/* We register the ISA device first, so that we can skip the -	 * registration of an I2C interface to the same device. */  	if (lm78_isa_found(isa_address)) {  		res = platform_driver_register(&lm78_isa_driver);  		if (res) @@ -986,32 +1051,64 @@ static int __init sm_lm78_init(void)  			goto exit_unreg_isa_driver;  	} -	res = i2c_add_driver(&lm78_driver); -	if (res) -		goto exit_unreg_isa_device; -  	return 0; - exit_unreg_isa_device: -	platform_device_unregister(pdev);   exit_unreg_isa_driver:  	platform_driver_unregister(&lm78_isa_driver);   exit:  	return res;  } -static void __exit sm_lm78_exit(void) +static void lm78_isa_unregister(void)  {  	if (pdev) {  		platform_device_unregister(pdev);  		platform_driver_unregister(&lm78_isa_driver);  	} -	i2c_del_driver(&lm78_driver);  } +#else /* !CONFIG_ISA */ + +static int __init lm78_isa_register(void) +{ +	return 0; +} + +static void lm78_isa_unregister(void) +{ +} +#endif /* CONFIG_ISA */ + +static int __init sm_lm78_init(void) +{ +	int res; + +	/* +	 * We register the ISA device first, so that we can skip the +	 * registration of an I2C interface to the same device. +	 */ +	res = lm78_isa_register(); +	if (res) +		goto exit; + +	res = i2c_add_driver(&lm78_driver); +	if (res) +		goto exit_unreg_isa_device; + +	return 0; + exit_unreg_isa_device: +	lm78_isa_unregister(); + exit: +	return res; +} +static void __exit sm_lm78_exit(void) +{ +	lm78_isa_unregister(); +	i2c_del_driver(&lm78_driver); +} -MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); +MODULE_AUTHOR("Frodo Looijaard, Jean Delvare <jdelvare@suse.de>");  MODULE_DESCRIPTION("LM78/LM79 driver");  MODULE_LICENSE("GPL");  | 
