From 9a8af6b3b64ee97a1aeecde017ffd02e6796913a Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 27 Jul 2005 17:37:34 -0700 Subject: [PATCH] [PATCH] Floppy: add cmos attribute to floppy driver tidy Fiddle with coding style a bit. Cc: Hannes Reinecke Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/block/floppy.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 21f58c4b3c79..888dad5eef34 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; + struct platform_device *p; + int drive; - retval = sprintf(buf,"%X\n", UDP->cmos); - - 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)