Merge 'staging-next' to Linus's tree

[linux-2.6.git] / drivers / staging / frontier / tranzport.c

diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index 3d12c1737edce5e3d5c9e0971bf988cab6063c9e..a145a15cfdb39d865a62200a83298192f2670098 100644 (file)
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -174,37 +174,37 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev)
                        usb_kill_urb(dev->interrupt_out_urb);
 }
 
-#define show_int(value)                                                        \
-  static ssize_t show_##value(struct device *dev,                      \
+#define show_int(value)        \
+       static ssize_t show_##value(struct device *dev, \
                              struct device_attribute *attr, char *buf) \
-  {                                                                    \
-    struct usb_interface *intf = to_usb_interface(dev);                        \
-    struct usb_tranzport *t = usb_get_intfdata(intf);                  \
-    return sprintf(buf, "%d\n", t->value);                             \
-  }                                                                    \
-  static DEVICE_ATTR(value, S_IRUGO, show_##value, NULL);
-
-#define show_set_int(value)                                            \
-  static ssize_t show_##value(struct device *dev,                      \
+       {       \
+               struct usb_interface *intf = to_usb_interface(dev);     \
+               struct usb_tranzport *t = usb_get_intfdata(intf);       \
+               return sprintf(buf, "%d\n", t->value);  \
+       }       \
+       static DEVICE_ATTR(value, S_IRUGO, show_##value, NULL);
+
+#define show_set_int(value)    \
+       static ssize_t show_##value(struct device *dev, \
                              struct device_attribute *attr, char *buf) \
-  {                                                                    \
-    struct usb_interface *intf = to_usb_interface(dev);                        \
-    struct usb_tranzport *t = usb_get_intfdata(intf);                  \
-    return sprintf(buf, "%d\n", t->value);                             \
-  }                                                                    \
-  static ssize_t set_##value(struct device *dev,                       \
+       {       \
+               struct usb_interface *intf = to_usb_interface(dev);     \
+               struct usb_tranzport *t = usb_get_intfdata(intf);       \
+               return sprintf(buf, "%d\n", t->value);  \
+       }       \
+       static ssize_t set_##value(struct device *dev,  \
                             struct device_attribute *attr,             \
                             const char *buf, size_t count)             \
-  {                                                                    \
-    struct usb_interface *intf = to_usb_interface(dev);                        \
-    struct usb_tranzport *t = usb_get_intfdata(intf);                  \
-    unsigned long temp;                                                        \
-    if (strict_strtoul(buf, 10, &temp))                                        \
-       return -EINVAL;                                                 \
-    t->value = temp;                                                   \
-    return count;                                                      \
-  }                                                                    \
-  static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
+       {       \
+               struct usb_interface *intf = to_usb_interface(dev);     \
+               struct usb_tranzport *t = usb_get_intfdata(intf);       \
+               unsigned long temp;     \
+               if (strict_strtoul(buf, 10, &temp))     \
+                       return -EINVAL; \
+               t->value = temp;        \
+               return count;   \
+       }       \
+       static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
 
 show_int(enable);
 show_int(offline);
@@ -796,7 +796,7 @@ static int usb_tranzport_probe(struct usb_interface *intf,
        int true_size;
        int retval = -ENOMEM;
 
-       /* allocate memory for our device state and intialize it */
+       /* allocate memory for our device state and initialize it */
 
         dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (dev == NULL) {