]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
greybus: core: fix two container-of macros
authorJohan Hovold <johan@hovoldconsulting.com>
Wed, 30 Mar 2016 20:53:17 +0000 (16:53 -0400)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 30 Mar 2016 21:13:05 +0000 (14:13 -0700)
Fix two greybus container-of macros that used the pointer name for the
member.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/hd.h
drivers/staging/greybus/svc.h

index fe6c086a8e3dd18d5b714013dab5a8c5221ee22f..b481dd03bd73378284400ff7d250bf785291d9a3 100644 (file)
@@ -48,7 +48,7 @@ struct gb_host_device {
        /* Private data for the host driver */
        unsigned long hd_priv[0] __aligned(sizeof(s64));
 };
-#define to_gb_host_device(d) container_of(d, struct gb_host_device, d)
+#define to_gb_host_device(d) container_of(d, struct gb_host_device, dev)
 
 struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
                                        struct device *parent,
index 0436f49ef8fa2ba45841e8fe84d716352908ab14..2f23bc081f821ef2596f0df5943db3b5c31518b5 100644 (file)
@@ -41,7 +41,7 @@ struct gb_svc {
        char                    *input_phys;
        struct gb_svc_watchdog  *watchdog;
 };
-#define to_gb_svc(d) container_of(d, struct gb_svc, d)
+#define to_gb_svc(d) container_of(d, struct gb_svc, dev)
 
 struct gb_svc *gb_svc_create(struct gb_host_device *hd);
 int gb_svc_add(struct gb_svc *svc);