diff --git a/[refs] b/[refs]
index 70ab9468c012..0fbc8ef6d288 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94fd0db7bfb4a03da202fd426d4e8e7eab42ab86
+refs/heads/master: 9a8af6b3b64ee97a1aeecde017ffd02e6796913a
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 21f58c4b3c79..888dad5eef34 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/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)