hwmon: Use helper functions to set and get driver data

Use helper functions to set and get driver data. This is more elegant. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Andreas Herrmann <andreas.herrmann3@amd.com> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>

hwmon: Use helper functions to set and get driver data
Use helper functions to set and get driver data. This is more elegant. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Andreas Herrmann <andreas.herrmann3@amd.com> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Jean Delvare · Jean Delvare
1 parent bc1f419c76
Showing 6 changed files with 27 additions and 27 deletions Side-by-side Diff
drivers/hwmon/adcxx.c
drivers/hwmon/ibmaem.c
drivers/hwmon/k10temp.c
drivers/hwmon/k8temp.c
drivers/hwmon/lm70.c
drivers/hwmon/ultra45_env.c
@@ -62,7 +62,7 @@
 {
 	struct spi_device *spi = to_spi_device(dev);
 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
-	struct adcxx *adc = dev_get_drvdata(&spi->dev);
+	struct adcxx *adc = spi_get_drvdata(spi);
 	u8 tx_buf[2];
 	u8 rx_buf[2];
 	int status;
@@ -105,7 +105,7 @@
 		struct device_attribute *devattr, char *buf)
 {
 	struct spi_device *spi = to_spi_device(dev);
-	struct adcxx *adc = dev_get_drvdata(&spi->dev);
+	struct adcxx *adc = spi_get_drvdata(spi);
 	u32 reference;
  
 	if (mutex_lock_interruptible(&adc->lock))
@@ -122,7 +122,7 @@
 	struct device_attribute *devattr, const char *buf, size_t count)
 {
 	struct spi_device *spi = to_spi_device(dev);
-	struct adcxx *adc = dev_get_drvdata(&spi->dev);
+	struct adcxx *adc = spi_get_drvdata(spi);
 	unsigned long value;
  
 	if (strict_strtoul(buf, 10, &value))
@@ -142,7 +142,7 @@
 			      *devattr, char *buf)
 {
 	struct spi_device *spi = to_spi_device(dev);
-	struct adcxx *adc = dev_get_drvdata(&spi->dev);
+	struct adcxx *adc = spi_get_drvdata(spi);
  
 	return sprintf(buf, "adcxx%ds\n", adc->channels);
 }
@@ -182,7 +182,7 @@
  
 	mutex_lock(&adc->lock);
  
-	dev_set_drvdata(&spi->dev, adc);
+	spi_set_drvdata(spi, adc);
  
 	for (i = 0; i < 3 + adc->channels; i++) {
 		status = device_create_file(&spi->dev, &ad_input[i].dev_attr);
@@ -206,7 +206,7 @@
 	for (i--; i >= 0; i--)
 		device_remove_file(&spi->dev, &ad_input[i].dev_attr);
  
-	dev_set_drvdata(&spi->dev, NULL);
+	spi_set_drvdata(spi, NULL);
 	mutex_unlock(&adc->lock);
 	kfree(adc);
 	return status;
@@ -214,7 +214,7 @@
  
 static int __devexit adcxx_remove(struct spi_device *spi)
 {
-	struct adcxx *adc = dev_get_drvdata(&spi->dev);
+	struct adcxx *adc = spi_get_drvdata(spi);
 	int i;
  
 	mutex_lock(&adc->lock);
@@ -222,7 +222,7 @@
 	for (i = 0; i < 3 + adc->channels; i++)
 		device_remove_file(&spi->dev, &ad_input[i].dev_attr);
  
-	dev_set_drvdata(&spi->dev, NULL);
+	spi_set_drvdata(spi, NULL);
 	mutex_unlock(&adc->lock);
 	kfree(adc);
  
@@ -523,7 +523,7 @@
 	aem_remove_sensors(data);
 	hwmon_device_unregister(data->hwmon_dev);
 	ipmi_destroy_user(data->ipmi.user);
-	dev_set_drvdata(&data->pdev->dev, NULL);
+	platform_set_drvdata(data->pdev, NULL);
 	platform_device_unregister(data->pdev);
 	aem_idr_put(data->id);
 	kfree(data);
@@ -594,7 +594,7 @@
 	if (res)
 		goto ipmi_err;
  
-	dev_set_drvdata(&data->pdev->dev, data);
+	platform_set_drvdata(data->pdev, data);
  
 	/* Set up IPMI interface */
 	if (aem_init_ipmi_data(&data->ipmi, probe->interface,
@@ -630,7 +630,7 @@
 hwmon_reg_err:
 	ipmi_destroy_user(data->ipmi.user);
 ipmi_err:
-	dev_set_drvdata(&data->pdev->dev, NULL);
+	platform_set_drvdata(data->pdev, NULL);
 	platform_device_unregister(data->pdev);
 dev_err:
 	aem_idr_put(data->id);
@@ -727,7 +727,7 @@
 	if (res)
 		goto ipmi_err;
  
-	dev_set_drvdata(&data->pdev->dev, data);
+	platform_set_drvdata(data->pdev, data);
  
 	/* Set up IPMI interface */
 	if (aem_init_ipmi_data(&data->ipmi, probe->interface,
@@ -763,7 +763,7 @@
 hwmon_reg_err:
 	ipmi_destroy_user(data->ipmi.user);
 ipmi_err:
-	dev_set_drvdata(&data->pdev->dev, NULL);
+	platform_set_drvdata(data->pdev, NULL);
 	platform_device_unregister(data->pdev);
 dev_err:
 	aem_idr_put(data->id);
@@ -173,7 +173,7 @@
 		err = PTR_ERR(hwmon_dev);
 		goto exit_remove;
 	}
-	dev_set_drvdata(&pdev->dev, hwmon_dev);
+	pci_set_drvdata(pdev, hwmon_dev);
  
 	if (unreliable && force)
 		dev_warn(&pdev->dev,
@@ -194,7 +194,7 @@
  
 static void __devexit k10temp_remove(struct pci_dev *pdev)
 {
-	hwmon_device_unregister(dev_get_drvdata(&pdev->dev));
+	hwmon_device_unregister(pci_get_drvdata(pdev));
 	device_remove_file(&pdev->dev, &dev_attr_name);
 	device_remove_file(&pdev->dev, &dev_attr_temp1_input);
 	device_remove_file(&pdev->dev, &dev_attr_temp1_max);
@@ -202,7 +202,7 @@
 			   &sensor_dev_attr_temp1_crit.dev_attr);
 	device_remove_file(&pdev->dev,
 			   &sensor_dev_attr_temp1_crit_hyst.dev_attr);
-	dev_set_drvdata(&pdev->dev, NULL);
+	pci_set_drvdata(pdev, NULL);
 }
  
 static const struct pci_device_id k10temp_id_table[] = {
@@ -252,7 +252,7 @@
  
 	data->name = "k8temp";
 	mutex_init(&data->update_lock);
-	dev_set_drvdata(&pdev->dev, data);
+	pci_set_drvdata(pdev, data);
  
 	/* Register sysfs hooks */
 	err = device_create_file(&pdev->dev,
@@ -307,7 +307,7 @@
 			   &sensor_dev_attr_temp4_input.dev_attr);
 	device_remove_file(&pdev->dev, &dev_attr_name);
 exit_free:
-	dev_set_drvdata(&pdev->dev, NULL);
+	pci_set_drvdata(pdev, NULL);
 	kfree(data);
 exit:
 	return err;
@@ -315,7 +315,7 @@
  
 static void __devexit k8temp_remove(struct pci_dev *pdev)
 {
-	struct k8temp_data *data = dev_get_drvdata(&pdev->dev);
+	struct k8temp_data *data = pci_get_drvdata(pdev);
  
 	hwmon_device_unregister(data->hwmon_dev);
 	device_remove_file(&pdev->dev,
@@ -327,7 +327,7 @@
 	device_remove_file(&pdev->dev,
 			   &sensor_dev_attr_temp4_input.dev_attr);
 	device_remove_file(&pdev->dev, &dev_attr_name);
-	dev_set_drvdata(&pdev->dev, NULL);
+	pci_set_drvdata(pdev, NULL);
 	kfree(data);
 }
  
@@ -58,7 +58,7 @@
 	int status, val = 0;
 	u8 rxbuf[2];
 	s16 raw=0;
-	struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
+	struct lm70 *p_lm70 = spi_get_drvdata(spi);
  
 	if (mutex_lock_interruptible(&p_lm70->lock))
 		return -ERESTARTSYS;
@@ -163,7 +163,7 @@
 		status = PTR_ERR(p_lm70->hwmon_dev);
 		goto out_dev_reg_failed;
 	}
-	dev_set_drvdata(&spi->dev, p_lm70);
+	spi_set_drvdata(spi, p_lm70);
  
 	if ((status = device_create_file(&spi->dev, &dev_attr_temp1_input))
 	 || (status = device_create_file(&spi->dev, &dev_attr_name))) {
  
  
@@ -177,19 +177,19 @@
 	device_remove_file(&spi->dev, &dev_attr_temp1_input);
 	hwmon_device_unregister(p_lm70->hwmon_dev);
 out_dev_reg_failed:
-	dev_set_drvdata(&spi->dev, NULL);
+	spi_set_drvdata(spi, NULL);
 	kfree(p_lm70);
 	return status;
 }
  
 static int __devexit lm70_remove(struct spi_device *spi)
 {
-	struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
+	struct lm70 *p_lm70 = spi_get_drvdata(spi);
  
 	device_remove_file(&spi->dev, &dev_attr_temp1_input);
 	device_remove_file(&spi->dev, &dev_attr_name);
 	hwmon_device_unregister(p_lm70->hwmon_dev);
-	dev_set_drvdata(&spi->dev, NULL);
+	spi_set_drvdata(spi, NULL);
 	kfree(p_lm70);
  
 	return 0;
@@ -258,7 +258,7 @@
 		goto out_sysfs_remove_group;
 	}
  
-	dev_set_drvdata(&op->dev, p);
+	platform_set_drvdata(op, p);
 	err = 0;
  
 out:
@@ -277,7 +277,7 @@
  
 static int __devexit env_remove(struct platform_device *op)
 {
-	struct env *p = dev_get_drvdata(&op->dev);
+	struct env *p = platform_get_drvdata(op);
  
 	if (p) {
 		sysfs_remove_group(&op->dev.kobj, &env_group);
...	...	@@ -62,7 +62,7 @@
62	62	{
63	63	struct spi_device *spi = to_spi_device(dev);
64	64	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
65		- struct adcxx *adc = dev_get_drvdata(&spi->dev);
	65	+ struct adcxx *adc = spi_get_drvdata(spi);
66	66	u8 tx_buf[2];
67	67	u8 rx_buf[2];
68	68	int status;
...	...	@@ -105,7 +105,7 @@
105	105	struct device_attribute devattr, char buf)
106	106	{
107	107	struct spi_device *spi = to_spi_device(dev);
108		- struct adcxx *adc = dev_get_drvdata(&spi->dev);
	108	+ struct adcxx *adc = spi_get_drvdata(spi);
109	109	u32 reference;
110	110
111	111	if (mutex_lock_interruptible(&adc->lock))
...	...	@@ -122,7 +122,7 @@
122	122	struct device_attribute devattr, const char buf, size_t count)
123	123	{
124	124	struct spi_device *spi = to_spi_device(dev);
125		- struct adcxx *adc = dev_get_drvdata(&spi->dev);
	125	+ struct adcxx *adc = spi_get_drvdata(spi);
126	126	unsigned long value;
127	127
128	128	if (strict_strtoul(buf, 10, &value))
...	...	@@ -142,7 +142,7 @@
142	142	devattr, char buf)
143	143	{
144	144	struct spi_device *spi = to_spi_device(dev);
145		- struct adcxx *adc = dev_get_drvdata(&spi->dev);
	145	+ struct adcxx *adc = spi_get_drvdata(spi);
146	146
147	147	return sprintf(buf, "adcxx%ds\n", adc->channels);
148	148	}
...	...	@@ -182,7 +182,7 @@
182	182
183	183	mutex_lock(&adc->lock);
184	184
185		- dev_set_drvdata(&spi->dev, adc);
	185	+ spi_set_drvdata(spi, adc);
186	186
187	187	for (i = 0; i < 3 + adc->channels; i++) {
188	188	status = device_create_file(&spi->dev, &ad_input[i].dev_attr);
...	...	@@ -206,7 +206,7 @@
206	206	for (i--; i >= 0; i--)
207	207	device_remove_file(&spi->dev, &ad_input[i].dev_attr);
208	208
209		- dev_set_drvdata(&spi->dev, NULL);
	209	+ spi_set_drvdata(spi, NULL);
210	210	mutex_unlock(&adc->lock);
211	211	kfree(adc);
212	212	return status;
...	...	@@ -214,7 +214,7 @@
214	214
215	215	static int __devexit adcxx_remove(struct spi_device *spi)
216	216	{
217		- struct adcxx *adc = dev_get_drvdata(&spi->dev);
	217	+ struct adcxx *adc = spi_get_drvdata(spi);
218	218	int i;
219	219
220	220	mutex_lock(&adc->lock);
...	...	@@ -222,7 +222,7 @@
222	222	for (i = 0; i < 3 + adc->channels; i++)
223	223	device_remove_file(&spi->dev, &ad_input[i].dev_attr);
224	224
225		- dev_set_drvdata(&spi->dev, NULL);
	225	+ spi_set_drvdata(spi, NULL);
226	226	mutex_unlock(&adc->lock);
227	227	kfree(adc);
228	228
...	...	@@ -523,7 +523,7 @@
523	523	aem_remove_sensors(data);
524	524	hwmon_device_unregister(data->hwmon_dev);
525	525	ipmi_destroy_user(data->ipmi.user);
526		- dev_set_drvdata(&data->pdev->dev, NULL);
	526	+ platform_set_drvdata(data->pdev, NULL);
527	527	platform_device_unregister(data->pdev);
528	528	aem_idr_put(data->id);
529	529	kfree(data);
...	...	@@ -594,7 +594,7 @@
594	594	if (res)
595	595	goto ipmi_err;
596	596
597		- dev_set_drvdata(&data->pdev->dev, data);
	597	+ platform_set_drvdata(data->pdev, data);
598	598
599	599	/* Set up IPMI interface */
600	600	if (aem_init_ipmi_data(&data->ipmi, probe->interface,
...	...	@@ -630,7 +630,7 @@
630	630	hwmon_reg_err:
631	631	ipmi_destroy_user(data->ipmi.user);
632	632	ipmi_err:
633		- dev_set_drvdata(&data->pdev->dev, NULL);
	633	+ platform_set_drvdata(data->pdev, NULL);
634	634	platform_device_unregister(data->pdev);
635	635	dev_err:
636	636	aem_idr_put(data->id);
...	...	@@ -727,7 +727,7 @@
727	727	if (res)
728	728	goto ipmi_err;
729	729
730		- dev_set_drvdata(&data->pdev->dev, data);
	730	+ platform_set_drvdata(data->pdev, data);
731	731
732	732	/* Set up IPMI interface */
733	733	if (aem_init_ipmi_data(&data->ipmi, probe->interface,
...	...	@@ -763,7 +763,7 @@
763	763	hwmon_reg_err:
764	764	ipmi_destroy_user(data->ipmi.user);
765	765	ipmi_err:
766		- dev_set_drvdata(&data->pdev->dev, NULL);
	766	+ platform_set_drvdata(data->pdev, NULL);
767	767	platform_device_unregister(data->pdev);
768	768	dev_err:
769	769	aem_idr_put(data->id);
...	...	@@ -173,7 +173,7 @@
173	173	err = PTR_ERR(hwmon_dev);
174	174	goto exit_remove;
175	175	}
176		- dev_set_drvdata(&pdev->dev, hwmon_dev);
	176	+ pci_set_drvdata(pdev, hwmon_dev);
177	177
178	178	if (unreliable && force)
179	179	dev_warn(&pdev->dev,
...	...	@@ -194,7 +194,7 @@
194	194
195	195	static void __devexit k10temp_remove(struct pci_dev *pdev)
196	196	{
197		- hwmon_device_unregister(dev_get_drvdata(&pdev->dev));
	197	+ hwmon_device_unregister(pci_get_drvdata(pdev));
198	198	device_remove_file(&pdev->dev, &dev_attr_name);
199	199	device_remove_file(&pdev->dev, &dev_attr_temp1_input);
200	200	device_remove_file(&pdev->dev, &dev_attr_temp1_max);
...	...	@@ -202,7 +202,7 @@
202	202	&sensor_dev_attr_temp1_crit.dev_attr);
203	203	device_remove_file(&pdev->dev,
204	204	&sensor_dev_attr_temp1_crit_hyst.dev_attr);
205		- dev_set_drvdata(&pdev->dev, NULL);
	205	+ pci_set_drvdata(pdev, NULL);
206	206	}
207	207
208	208	static const struct pci_device_id k10temp_id_table[] = {
...	...	@@ -252,7 +252,7 @@
252	252
253	253	data->name = "k8temp";
254	254	mutex_init(&data->update_lock);
255		- dev_set_drvdata(&pdev->dev, data);
	255	+ pci_set_drvdata(pdev, data);
256	256
257	257	/* Register sysfs hooks */
258	258	err = device_create_file(&pdev->dev,
...	...	@@ -307,7 +307,7 @@
307	307	&sensor_dev_attr_temp4_input.dev_attr);
308	308	device_remove_file(&pdev->dev, &dev_attr_name);
309	309	exit_free:
310		- dev_set_drvdata(&pdev->dev, NULL);
	310	+ pci_set_drvdata(pdev, NULL);
311	311	kfree(data);
312	312	exit:
313	313	return err;
...	...	@@ -315,7 +315,7 @@
315	315
316	316	static void __devexit k8temp_remove(struct pci_dev *pdev)
317	317	{
318		- struct k8temp_data *data = dev_get_drvdata(&pdev->dev);
	318	+ struct k8temp_data *data = pci_get_drvdata(pdev);
319	319
320	320	hwmon_device_unregister(data->hwmon_dev);
321	321	device_remove_file(&pdev->dev,
...	...	@@ -327,7 +327,7 @@
327	327	device_remove_file(&pdev->dev,
328	328	&sensor_dev_attr_temp4_input.dev_attr);
329	329	device_remove_file(&pdev->dev, &dev_attr_name);
330		- dev_set_drvdata(&pdev->dev, NULL);
	330	+ pci_set_drvdata(pdev, NULL);
331	331	kfree(data);
332	332	}
333	333
...	...	@@ -58,7 +58,7 @@
58	58	int status, val = 0;
59	59	u8 rxbuf[2];
60	60	s16 raw=0;
61		- struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
	61	+ struct lm70 *p_lm70 = spi_get_drvdata(spi);
62	62
63	63	if (mutex_lock_interruptible(&p_lm70->lock))
64	64	return -ERESTARTSYS;
...	...	@@ -163,7 +163,7 @@
163	163	status = PTR_ERR(p_lm70->hwmon_dev);
164	164	goto out_dev_reg_failed;
165	165	}
166		- dev_set_drvdata(&spi->dev, p_lm70);
	166	+ spi_set_drvdata(spi, p_lm70);
167	167
168	168	if ((status = device_create_file(&spi->dev, &dev_attr_temp1_input))
169	169	\|\| (status = device_create_file(&spi->dev, &dev_attr_name))) {
170	170
171	171
...	...	@@ -177,19 +177,19 @@
177	177	device_remove_file(&spi->dev, &dev_attr_temp1_input);
178	178	hwmon_device_unregister(p_lm70->hwmon_dev);
179	179	out_dev_reg_failed:
180		- dev_set_drvdata(&spi->dev, NULL);
	180	+ spi_set_drvdata(spi, NULL);
181	181	kfree(p_lm70);
182	182	return status;
183	183	}
184	184
185	185	static int __devexit lm70_remove(struct spi_device *spi)
186	186	{
187		- struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
	187	+ struct lm70 *p_lm70 = spi_get_drvdata(spi);
188	188
189	189	device_remove_file(&spi->dev, &dev_attr_temp1_input);
190	190	device_remove_file(&spi->dev, &dev_attr_name);
191	191	hwmon_device_unregister(p_lm70->hwmon_dev);
192		- dev_set_drvdata(&spi->dev, NULL);
	192	+ spi_set_drvdata(spi, NULL);
193	193	kfree(p_lm70);
194	194
195	195	return 0;
...	...	@@ -258,7 +258,7 @@
258	258	goto out_sysfs_remove_group;
259	259	}
260	260
261		- dev_set_drvdata(&op->dev, p);
	261	+ platform_set_drvdata(op, p);
262	262	err = 0;
263	263
264	264	out:
...	...	@@ -277,7 +277,7 @@
277	277
278	278	static int __devexit env_remove(struct platform_device *op)
279	279	{
280		- struct env *p = dev_get_drvdata(&op->dev);
	280	+ struct env *p = platform_get_drvdata(op);
281	281
282	282	if (p) {
283	283	sysfs_remove_group(&op->dev.kobj, &env_group);