summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 11:19:46 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 11:19:46 -0700
commit2fe83b3ad12d43799af5f3156886eca443a88bac (patch)
tree1f09c2f0013f4742106f7b1732da6fdc45b18d39 /include
parentdd6ccfe64dad4ea498392805b477308abef43a4c (diff)
parentce8c47cf88af4da2ff429933c07f203a55d5d0a1 (diff)
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: leds: cr_bllcd.c: build fix backlight: Convert from struct class_device to struct device backlight: Fix order of Kconfig entries
Diffstat (limited to 'include')
-rw-r--r--include/linux/backlight.h11
-rw-r--r--include/linux/lcd.h14
2 files changed, 18 insertions, 7 deletions
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index 1023ba0d6e55..c897c7b03858 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -69,8 +69,8 @@ struct backlight_device {
/* The framebuffer notifier block */
struct notifier_block fb_notif;
- /* The class device structure */
- struct class_device class_dev;
+
+ struct device dev;
};
static inline void backlight_update_status(struct backlight_device *bd)
@@ -85,6 +85,11 @@ extern struct backlight_device *backlight_device_register(const char *name,
struct device *dev, void *devdata, struct backlight_ops *ops);
extern void backlight_device_unregister(struct backlight_device *bd);
-#define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev)
+#define to_backlight_device(obj) container_of(obj, struct backlight_device, dev)
+
+static inline void * bl_get_data(struct backlight_device *bl_dev)
+{
+ return dev_get_drvdata(&bl_dev->dev);
+}
#endif
diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index 598793c0745b..1d379787f2e7 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -62,8 +62,8 @@ struct lcd_device {
struct mutex update_lock;
/* The framebuffer notifier block */
struct notifier_block fb_notif;
- /* The class device structure */
- struct class_device class_dev;
+
+ struct device dev;
};
static inline void lcd_set_power(struct lcd_device *ld, int power)
@@ -75,9 +75,15 @@ static inline void lcd_set_power(struct lcd_device *ld, int power)
}
extern struct lcd_device *lcd_device_register(const char *name,
- void *devdata, struct lcd_ops *ops);
+ struct device *parent, void *devdata, struct lcd_ops *ops);
extern void lcd_device_unregister(struct lcd_device *ld);
-#define to_lcd_device(obj) container_of(obj, struct lcd_device, class_dev)
+#define to_lcd_device(obj) container_of(obj, struct lcd_device, dev)
+
+static inline void * lcd_get_data(struct lcd_device *ld_dev)
+{
+ return dev_get_drvdata(&ld_dev->dev);
+}
+
#endif
rm>
AgeCommit message (Expand)AuthorFilesLines
2014-07-09Branch libreoffice-4-2-6libreoffice-4-2-6Christian Lohmaier0-0/+0
2014-07-08update translations for 4.2.6 rc1Christian Lohmaier191-2167/+2147
2014-05-27update translations for 4.2.5 rc1Christian Lohmaier573-8867/+9059
2014-04-15update translations for 4.2.4 rc1Christian Lohmaier713-18976/+60974
2014-03-11update for 4.2.3 rc1Christian Lohmaier1137-21460/+82901
2014-02-21typo fixes in xml tags (also fixed in Pootle)Andras Timar2-2/+2
2014-02-12update translations for 4.2.1 rc1Christian Lohmaier3160-119336/+266940
2014-02-02updated Slovenian translationAndras Timar15-45/+1971
2014-01-30fdo#74119 fix unlocalized redline menuAndras Timar112-896/+896
2014-01-17updated Slovenian translationAndras Timar10-327/+364
2014-01-11Updated Serbian translation (pomigrate2)Andras Timar600-53085/+70756
2014-01-07update translations for 4.2.0rc2Christian Lohmaier4214-101185/+432052
2014-01-07updated Slovenian translationAndras Timar11-55/+64
2013-12-30updated Slovenian translationAndras Timar19-89/+1898
2013-12-17update translations for 4.2.0rc1Christian Lohmaier2032-138450/+90097
2013-12-14updated Slovenian translationAndras Timar28-242/+285
2013-12-03update translations for 4.2.0 Beta2Christian Lohmaier12941-2727950/+2678643
2013-12-01updated Slovenian translationAndras Timar36-248/+661
2013-12-01updated Slovenian translationAndras Timar13-80/+46
2013-11-25updated Slovenian translationAndras Timar352-1457/+2281
2013-11-21Branch libreoffice-4-2Christian Lohmaier0-0/+0
2013-11-21sync with po-templates for 4.2libreoffice-4-2-branch-pointChristian Lohmaier