aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-07-27 17:37:34 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 16:03:11 -0700
commit9a8af6b3b64ee97a1aeecde017ffd02e6796913a (patch)
tree1e2fe584510f1af920b084cbbe1f2fe756508733
parent94fd0db7bfb4a03da202fd426d4e8e7eab42ab86 (diff)
[PATCH] Floppy: add cmos attribute to floppy driver tidy
Fiddle with coding style a bit. Cc: Hannes Reinecke <hare@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/block/floppy.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 21f58c4b3c7..888dad5eef3 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4193,17 +4193,16 @@ static int __init floppy_setup(char *str)
static int have_no_fdc = -ENODEV;
-static ssize_t floppy_cmos_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t floppy_cmos_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
- struct platform_device *p = container_of(dev,struct platform_device,dev);
- int drive = p->id;
- ssize_t retval;
-
- retval = sprintf(buf,"%X\n", UDP->cmos);
+ struct platform_device *p;
+ int drive;
- return retval;
+ p = container_of(dev, struct platform_device,dev);
+ drive = p->id;
+ return sprintf(buf, "%X\n", UDP->cmos);
}
-
DEVICE_ATTR(cmos,S_IRUGO,floppy_cmos_show,NULL);
static void floppy_device_release(struct device *dev)