aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/ucb1x00.h
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-09-24 20:03:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:06 -0500
commit0c55445f201841bfd6c658c47df8311b6722f002 (patch)
tree68b02474461eea74e0fd54c5858a433b6aa942ab /drivers/mfd/ucb1x00.h
parent68db2bc98cc1594a1cc487755aff4340fd4f1611 (diff)
MCP_UCB1200: Convert from class_device to device
struct class_device is going away, this converts the code to use struct device instead. Signed-off-by: Tony Jones <tonyj@suse.de> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mfd/ucb1x00.h')
-rw-r--r--drivers/mfd/ucb1x00.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h
index ca8df8072d43..a8ad8a0ed5db 100644
--- a/drivers/mfd/ucb1x00.h
+++ b/drivers/mfd/ucb1x00.h
@@ -120,7 +120,7 @@ struct ucb1x00 {
120 u16 irq_fal_enbl; 120 u16 irq_fal_enbl;
121 u16 irq_ris_enbl; 121 u16 irq_ris_enbl;
122 struct ucb1x00_irq irq_handler[16]; 122 struct ucb1x00_irq irq_handler[16];
123 struct class_device cdev; 123 struct device dev;
124 struct list_head node; 124 struct list_head node;
125 struct list_head devs; 125 struct list_head devs;
126}; 126};
@@ -144,7 +144,7 @@ struct ucb1x00_driver {
144 int (*resume)(struct ucb1x00_dev *dev); 144 int (*resume)(struct ucb1x00_dev *dev);
145}; 145};
146 146
147#define classdev_to_ucb1x00(cd) container_of(cd, struct ucb1x00, cdev) 147#define classdev_to_ucb1x00(cd) container_of(cd, struct ucb1x00, dev)
148 148
149int ucb1x00_register_driver(struct ucb1x00_driver *); 149int ucb1x00_register_driver(struct ucb1x00_driver *);
150void ucb1x00_unregister_driver(struct ucb1x00_driver *); 150void ucb1x00_unregister_driver(struct ucb1x00_driver *);