summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-10 10:39:26 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-10 10:39:26 -0700
commitf96c3bbe91117402f13119ce9e609db9087ed58f (patch)
tree5516a661bc9f251edb6afab424f912214f33efa3 /drivers
parentec384d297c2c47611cae835284fe970073d41783 (diff)
parent585f54575d832506bbe9b5a2f435f37b81efc849 (diff)
downloadop-kernel-dev-f96c3bbe91117402f13119ce9e609db9087ed58f.zip
op-kernel-dev-f96c3bbe91117402f13119ce9e609db9087ed58f.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-ucb
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/ucb1x00-core.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 612564a..e335d54 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -457,6 +457,17 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb)
return probe_irq_off(mask);
}
+static void ucb1x00_release(struct class_device *dev)
+{
+ struct ucb1x00 *ucb = classdev_to_ucb1x00(dev);
+ kfree(ucb);
+}
+
+static struct class ucb1x00_class = {
+ .name = "ucb1x00",
+ .release = ucb1x00_release,
+};
+
static int ucb1x00_probe(struct mcp *mcp)
{
struct ucb1x00 *ucb;
@@ -546,17 +557,6 @@ static void ucb1x00_remove(struct mcp *mcp)
class_device_unregister(&ucb->cdev);
}
-static void ucb1x00_release(struct class_device *dev)
-{
- struct ucb1x00 *ucb = classdev_to_ucb1x00(dev);
- kfree(ucb);
-}
-
-static struct class ucb1x00_class = {
- .name = "ucb1x00",
- .release = ucb1x00_release,
-};
-
int ucb1x00_register_driver(struct ucb1x00_driver *drv)
{
struct ucb1x00 *ucb;
OpenPOWER on IntegriCloud