Commit 984fed56 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Guenter Roeck
Browse files

hwmon: (via686a) Reorder symbols to get rid of a few forward declarations 



Declarations for static symbols are useless repetition unless there are
cyclic dependencies.

Reorder the functions and variables to get rid of 4 forward declarations.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220924135738.234051-2-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 50e52c1f

drivers/hwmon/via686a.c

+94 −100
Original line number Diff line number Diff line
@@ -323,9 +323,6 @@ struct via686a_data { 


static struct pci_dev *s_bridge;	/* pointer to the (only) via686a */



static int via686a_probe(struct platform_device *pdev);

static int via686a_remove(struct platform_device *pdev);



static inline int via686a_read_value(struct via686a_data *data, u8 reg)

{

	return inb_p(data->addr + reg);
@@ -337,8 +334,76 @@ static inline void via686a_write_value(struct via686a_data *data, u8 reg, 
	outb_p(value, data->addr + reg);

}



static struct via686a_data *via686a_update_device(struct device *dev);

static void via686a_init_device(struct via686a_data *data);

static void via686a_update_fan_div(struct via686a_data *data)

{

	int reg = via686a_read_value(data, VIA686A_REG_FANDIV);

	data->fan_div[0] = (reg >> 4) & 0x03;

	data->fan_div[1] = reg >> 6;

}



static struct via686a_data *via686a_update_device(struct device *dev)

{

	struct via686a_data *data = dev_get_drvdata(dev);

	int i;



	mutex_lock(&data->update_lock);



	if (time_after(jiffies, data->last_updated + HZ + HZ / 2)

	    || !data->valid) {

		for (i = 0; i <= 4; i++) {

			data->in[i] =

			    via686a_read_value(data, VIA686A_REG_IN(i));

			data->in_min[i] = via686a_read_value(data,

							     VIA686A_REG_IN_MIN

							     (i));

			data->in_max[i] =

			    via686a_read_value(data, VIA686A_REG_IN_MAX(i));

		}

		for (i = 1; i <= 2; i++) {

			data->fan[i - 1] =

			    via686a_read_value(data, VIA686A_REG_FAN(i));

			data->fan_min[i - 1] = via686a_read_value(data,

						     VIA686A_REG_FAN_MIN(i));

		}

		for (i = 0; i <= 2; i++) {

			data->temp[i] = via686a_read_value(data,

						 VIA686A_REG_TEMP[i]) << 2;

			data->temp_over[i] =

			    via686a_read_value(data,

					       VIA686A_REG_TEMP_OVER[i]);

			data->temp_hyst[i] =

			    via686a_read_value(data,

					       VIA686A_REG_TEMP_HYST[i]);

		}

		/*

		 * add in lower 2 bits

		 * temp1 uses bits 7-6 of VIA686A_REG_TEMP_LOW1

		 * temp2 uses bits 5-4 of VIA686A_REG_TEMP_LOW23

		 * temp3 uses bits 7-6 of VIA686A_REG_TEMP_LOW23

		 */

		data->temp[0] |= (via686a_read_value(data,

						     VIA686A_REG_TEMP_LOW1)

				  & 0xc0) >> 6;

		data->temp[1] |=

		    (via686a_read_value(data, VIA686A_REG_TEMP_LOW23) &

		     0x30) >> 4;

		data->temp[2] |=

		    (via686a_read_value(data, VIA686A_REG_TEMP_LOW23) &

		     0xc0) >> 6;



		via686a_update_fan_div(data);

		data->alarms =

		    via686a_read_value(data,

				       VIA686A_REG_ALARM1) |

		    (via686a_read_value(data, VIA686A_REG_ALARM2) << 8);

		data->last_updated = jiffies;

		data->valid = true;

	}



	mutex_unlock(&data->update_lock);



	return data;

}



/* following are the sysfs callback functions */
@@ -656,13 +721,23 @@ static const struct attribute_group via686a_group = { 
	.attrs = via686a_attributes,

};



static struct platform_driver via686a_driver = {

	.driver = {

		.name	= DRIVER_NAME,

	},

	.probe		= via686a_probe,

	.remove		= via686a_remove,

};

static void via686a_init_device(struct via686a_data *data)

{

	u8 reg;



	/* Start monitoring */

	reg = via686a_read_value(data, VIA686A_REG_CONFIG);

	via686a_write_value(data, VIA686A_REG_CONFIG, (reg | 0x01) & 0x7F);



	/* Configure temp interrupt mode for continuous-interrupt operation */

	reg = via686a_read_value(data, VIA686A_REG_TEMP_MODE);

	via686a_write_value(data, VIA686A_REG_TEMP_MODE,

			    (reg & ~VIA686A_TEMP_MODE_MASK)

			    | VIA686A_TEMP_MODE_CONTINUOUS);



	/* Pre-read fan clock divisor values */

	via686a_update_fan_div(data);

}



/* This is called when the module is loaded */

static int via686a_probe(struct platform_device *pdev)
@@ -721,94 +796,13 @@ static int via686a_remove(struct platform_device *pdev) 
	return 0;

}



static void via686a_update_fan_div(struct via686a_data *data)

{

	int reg = via686a_read_value(data, VIA686A_REG_FANDIV);

	data->fan_div[0] = (reg >> 4) & 0x03;

	data->fan_div[1] = reg >> 6;

}



static void via686a_init_device(struct via686a_data *data)

{

	u8 reg;



	/* Start monitoring */

	reg = via686a_read_value(data, VIA686A_REG_CONFIG);

	via686a_write_value(data, VIA686A_REG_CONFIG, (reg | 0x01) & 0x7F);



	/* Configure temp interrupt mode for continuous-interrupt operation */

	reg = via686a_read_value(data, VIA686A_REG_TEMP_MODE);

	via686a_write_value(data, VIA686A_REG_TEMP_MODE,

			    (reg & ~VIA686A_TEMP_MODE_MASK)

			    | VIA686A_TEMP_MODE_CONTINUOUS);



	/* Pre-read fan clock divisor values */

	via686a_update_fan_div(data);

}



static struct via686a_data *via686a_update_device(struct device *dev)

{

	struct via686a_data *data = dev_get_drvdata(dev);

	int i;



	mutex_lock(&data->update_lock);



	if (time_after(jiffies, data->last_updated + HZ + HZ / 2)

	    || !data->valid) {

		for (i = 0; i <= 4; i++) {

			data->in[i] =

			    via686a_read_value(data, VIA686A_REG_IN(i));

			data->in_min[i] = via686a_read_value(data,

							     VIA686A_REG_IN_MIN

							     (i));

			data->in_max[i] =

			    via686a_read_value(data, VIA686A_REG_IN_MAX(i));

		}

		for (i = 1; i <= 2; i++) {

			data->fan[i - 1] =

			    via686a_read_value(data, VIA686A_REG_FAN(i));

			data->fan_min[i - 1] = via686a_read_value(data,

						     VIA686A_REG_FAN_MIN(i));

		}

		for (i = 0; i <= 2; i++) {

			data->temp[i] = via686a_read_value(data,

						 VIA686A_REG_TEMP[i]) << 2;

			data->temp_over[i] =

			    via686a_read_value(data,

					       VIA686A_REG_TEMP_OVER[i]);

			data->temp_hyst[i] =

			    via686a_read_value(data,

					       VIA686A_REG_TEMP_HYST[i]);

		}

		/*

		 * add in lower 2 bits

		 * temp1 uses bits 7-6 of VIA686A_REG_TEMP_LOW1

		 * temp2 uses bits 5-4 of VIA686A_REG_TEMP_LOW23

		 * temp3 uses bits 7-6 of VIA686A_REG_TEMP_LOW23

		 */

		data->temp[0] |= (via686a_read_value(data,

						     VIA686A_REG_TEMP_LOW1)

				  & 0xc0) >> 6;

		data->temp[1] |=

		    (via686a_read_value(data, VIA686A_REG_TEMP_LOW23) &

		     0x30) >> 4;

		data->temp[2] |=

		    (via686a_read_value(data, VIA686A_REG_TEMP_LOW23) &

		     0xc0) >> 6;



		via686a_update_fan_div(data);

		data->alarms =

		    via686a_read_value(data,

				       VIA686A_REG_ALARM1) |

		    (via686a_read_value(data, VIA686A_REG_ALARM2) << 8);

		data->last_updated = jiffies;

		data->valid = true;

	}



	mutex_unlock(&data->update_lock);



	return data;

}

static struct platform_driver via686a_driver = {

	.driver = {

		.name	= DRIVER_NAME,

	},

	.probe		= via686a_probe,

	.remove		= via686a_remove,

};



static const struct pci_device_id via686a_pci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },