From a1d67d59182901e606c67d2d7f02bb6ec1c5936d Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 18 Apr 2012 22:16:47 +0000 Subject: [PATCH] --- yaml --- r: 305349 b: refs/heads/master c: e074d08e2b98db1b19328bb9395052b34366831d h: refs/heads/master i: 305347: eb5c25e4ca73b9ac16ba523741c37b57bd7120be v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/windfarm.h | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 434dcf7cea21..ca44a76f93d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e326b30fda9a985a2e7fda6fb9212b86bf025c39 +refs/heads/master: e074d08e2b98db1b19328bb9395052b34366831d diff --git a/trunk/drivers/macintosh/windfarm.h b/trunk/drivers/macintosh/windfarm.h index 7a2482cc26a7..3ef192a1fca0 100644 --- a/trunk/drivers/macintosh/windfarm.h +++ b/trunk/drivers/macintosh/windfarm.h @@ -35,12 +35,12 @@ struct wf_control_ops { }; struct wf_control { - struct list_head link; - struct wf_control_ops *ops; - char *name; - int type; - struct kref ref; - struct device_attribute attr; + struct list_head link; + const struct wf_control_ops *ops; + const char *name; + int type; + struct kref ref; + struct device_attribute attr; }; #define WF_CONTROL_TYPE_GENERIC 0 @@ -85,11 +85,12 @@ struct wf_sensor_ops { }; struct wf_sensor { - struct list_head link; - struct wf_sensor_ops *ops; - char *name; - struct kref ref; - struct device_attribute attr; + struct list_head link; + const struct wf_sensor_ops *ops; + const char *name; + struct kref ref; + struct device_attribute attr; + void *priv; }; /* Same lifetime rules as controls */