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

Commit de854e54 authored by Julia Lawall's avatar Julia Lawall Committed by Michael Ellerman
Browse files

powerpc/macintosh: constify wf_sensor_ops structures 



The wf_sensor_ops structures are only stored in the ops field of a
wf_sensor structure, which is declared as const.  Thus the
wf_sensor_ops structures themselves can be const.

Done with the help of Coccinelle.

// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct wf_sensor_ops i@p = { ... };

@ok1@
identifier r.i;
struct wf_sensor s;
position p;
@@
s.ops = &i@p

@ok2@
identifier r.i;
struct wf_sat_sensor s;
position p;
@@
s.sens.ops = &i@p

@bad@
position p != {r.p,ok1.p,ok2.p};
identifier r.i;
struct wf_sensor_ops e;
@@
e@i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
 struct wf_sensor_ops i = { ... };
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 8a7aef2c

drivers/macintosh/windfarm_lm75_sensor.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void wf_lm75_release(struct wf_sensor *sr) 
	kfree(lm);

}



static struct wf_sensor_ops wf_lm75_ops = {

static const struct wf_sensor_ops wf_lm75_ops = {

	.get_value	= wf_lm75_get,

	.release	= wf_lm75_release,

	.owner		= THIS_MODULE,

drivers/macintosh/windfarm_lm87_sensor.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static void wf_lm87_release(struct wf_sensor *sr) 
	kfree(lm);

}



static struct wf_sensor_ops wf_lm87_ops = {

static const struct wf_sensor_ops wf_lm87_ops = {

	.get_value	= wf_lm87_get,

	.release	= wf_lm87_release,

	.owner		= THIS_MODULE,

drivers/macintosh/windfarm_max6690_sensor.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void wf_max6690_release(struct wf_sensor *sr) 
	kfree(max);

}



static struct wf_sensor_ops wf_max6690_ops = {

static const struct wf_sensor_ops wf_max6690_ops = {

	.get_value	= wf_max6690_get,

	.release	= wf_max6690_release,

	.owner		= THIS_MODULE,

drivers/macintosh/windfarm_smu_sat.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void wf_sat_sensor_release(struct wf_sensor *sr) 
	kref_put(&sat->ref, wf_sat_release);

}



static struct wf_sensor_ops wf_sat_ops = {

static const struct wf_sensor_ops wf_sat_ops = {

	.get_value	= wf_sat_sensor_get,

	.release	= wf_sat_sensor_release,

	.owner		= THIS_MODULE,

drivers/macintosh/windfarm_smu_sensors.c

+5 −5
Original line number Diff line number Diff line
@@ -172,22 +172,22 @@ static int smu_slotspow_get(struct wf_sensor *sr, s32 *value) 
}





static struct wf_sensor_ops smu_cputemp_ops = {

static const struct wf_sensor_ops smu_cputemp_ops = {

	.get_value	= smu_cputemp_get,

	.release	= smu_ads_release,

	.owner		= THIS_MODULE,

};

static struct wf_sensor_ops smu_cpuamp_ops = {

static const struct wf_sensor_ops smu_cpuamp_ops = {

	.get_value	= smu_cpuamp_get,

	.release	= smu_ads_release,

	.owner		= THIS_MODULE,

};

static struct wf_sensor_ops smu_cpuvolt_ops = {

static const struct wf_sensor_ops smu_cpuvolt_ops = {

	.get_value	= smu_cpuvolt_get,

	.release	= smu_ads_release,

	.owner		= THIS_MODULE,

};

static struct wf_sensor_ops smu_slotspow_ops = {

static const struct wf_sensor_ops smu_slotspow_ops = {

	.get_value	= smu_slotspow_get,

	.release	= smu_ads_release,

	.owner		= THIS_MODULE,
@@ -327,7 +327,7 @@ static int smu_cpu_power_get(struct wf_sensor *sr, s32 *value) 
	return 0;

}



static struct wf_sensor_ops smu_cpu_power_ops = {

static const struct wf_sensor_ops smu_cpu_power_ops = {

	.get_value	= smu_cpu_power_get,

	.release	= smu_cpu_power_release,

	.owner		= THIS_MODULE,