diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-10-16 01:02:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:39 -0400 |
commit | f841a487d4dff35386e989768ec03a86a376bfde (patch) | |
tree | 196bdfbc27447bcbd93a65b9a0214a5faea04598 | |
parent | cb49a5e9ee4fb0ab6a84a29c4de6c1bd112d38df (diff) |
rtc: remove some NOP open/release methods
Remove NOP methods from rtc-pl030 and rtc-pl031 drivers;
this is pure wasted code.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/rtc/rtc-pl030.c | 11 | ||||
-rw-r--r-- | drivers/rtc/rtc-pl031.c | 14 |
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index 8448eeb9d675..826153552157 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c | |||
@@ -34,15 +34,6 @@ static irqreturn_t pl030_interrupt(int irq, void *dev_id) | |||
34 | return IRQ_HANDLED; | 34 | return IRQ_HANDLED; |
35 | } | 35 | } |
36 | 36 | ||
37 | static int pl030_open(struct device *dev) | ||
38 | { | ||
39 | return 0; | ||
40 | } | ||
41 | |||
42 | static void pl030_release(struct device *dev) | ||
43 | { | ||
44 | } | ||
45 | |||
46 | static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) | 37 | static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) |
47 | { | 38 | { |
48 | return -ENOIOCTLCMD; | 39 | return -ENOIOCTLCMD; |
@@ -104,8 +95,6 @@ static int pl030_set_time(struct device *dev, struct rtc_time *tm) | |||
104 | } | 95 | } |
105 | 96 | ||
106 | static const struct rtc_class_ops pl030_ops = { | 97 | static const struct rtc_class_ops pl030_ops = { |
107 | .open = pl030_open, | ||
108 | .release = pl030_release, | ||
109 | .ioctl = pl030_ioctl, | 98 | .ioctl = pl030_ioctl, |
110 | .read_time = pl030_read_time, | 99 | .read_time = pl030_read_time, |
111 | .set_time = pl030_set_time, | 100 | .set_time = pl030_set_time, |
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 08b4610ec5a6..333eec689d2f 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c | |||
@@ -45,18 +45,6 @@ static irqreturn_t pl031_interrupt(int irq, void *dev_id) | |||
45 | return IRQ_HANDLED; | 45 | return IRQ_HANDLED; |
46 | } | 46 | } |
47 | 47 | ||
48 | static int pl031_open(struct device *dev) | ||
49 | { | ||
50 | /* | ||
51 | * We request IRQ in pl031_probe, so nothing to do here... | ||
52 | */ | ||
53 | return 0; | ||
54 | } | ||
55 | |||
56 | static void pl031_release(struct device *dev) | ||
57 | { | ||
58 | } | ||
59 | |||
60 | static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) | 48 | static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) |
61 | { | 49 | { |
62 | struct pl031_local *ldata = dev_get_drvdata(dev); | 50 | struct pl031_local *ldata = dev_get_drvdata(dev); |
@@ -118,8 +106,6 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) | |||
118 | } | 106 | } |
119 | 107 | ||
120 | static const struct rtc_class_ops pl031_ops = { | 108 | static const struct rtc_class_ops pl031_ops = { |
121 | .open = pl031_open, | ||
122 | .release = pl031_release, | ||
123 | .ioctl = pl031_ioctl, | 109 | .ioctl = pl031_ioctl, |
124 | .read_time = pl031_read_time, | 110 | .read_time = pl031_read_time, |
125 | .set_time = pl031_set_time, | 111 | .set_time = pl031_set_time, |