Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

[linux-2.6-block.git] / drivers / pcmcia / socket_sysfs.c

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 78d5aab542f7fdfc8fcf29361cb4b053b9b2bdec..7a456000332a77ada559a04c4c238cdabbc69e6f 100644 (file)
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -164,7 +164,7 @@ static ssize_t pccard_store_irq_mask(struct device *dev,
        if (!count)
                return -EINVAL;
 
-       ret = sscanf (buf, "0x%x\n", &mask);
+       ret = sscanf(buf, "0x%x\n", &mask);
 
        if (ret == 1) {
                s->irq_mask &= mask;
@@ -278,7 +278,7 @@ static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off
  free_tuple:
        kfree(tuplebuffer);
 
-       return (ret);
+       return ret;
 }
 
 static ssize_t pccard_show_cis(struct kobject *kobj,
@@ -308,7 +308,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj,
                count = pccard_extract_cis(s, buf, off, count);
        }
 
-       return (count);
+       return count;
 }
 
 static ssize_t pccard_store_cis(struct kobject *kobj,