Eliminate fbfront union member in struct file

Replace the fbfront specific union member in struct file with the
common dev pointer.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/fbfront.c b/fbfront.c
index 6725da1e44d95bc02441239287151a60c14adc8b..c8410af9ca8bd2cbdb0db1611f7b64392010abaa 100644 (file)
--- a/fbfront.c
+++ b/fbfront.c
@@ -703,7 +703,7 @@ int fbfront_open(struct fbfront_dev *dev)
 {
     dev->fd = alloc_fd(FTYPE_FB);
     printk("fb_open(%s) -> %d\n", dev->nodename, dev->fd);
-    files[dev->fd].fb.dev = dev;
+    files[dev->fd].dev = dev;
     return dev->fd;
 }
 #endif

diff --git a/include/lib.h b/include/lib.h
index 0cedae69cefdb375b1bbeab18ad5c21c75b0027d..2a9a01c1fed835b47172d8f051fe7393f045ad69 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -199,9 +199,6 @@ struct file {
        struct {
            struct kbdfront_dev *dev;
        } kbd;
-       struct {
-           struct fbfront_dev *dev;
-       } fb;
 #ifdef CONFIG_TPMFRONT
        struct {
           struct tpmfront_dev *dev;

diff --git a/lib/sys.c b/lib/sys.c
index 62c202082b2e6c8dd75d406fad1399d0658a852d..2d4865760a8636cfe249d2e4158e2b1f2ae73d3a 100644 (file)
--- a/lib/sys.c
+++ b/lib/sys.c
@@ -287,7 +287,7 @@ int read(int fd, void *buf, size_t nbytes)
         case FTYPE_FB: {
             int ret, n;
             n = nbytes / sizeof(union xenfb_in_event);
-            ret = fbfront_receive(files[fd].fb.dev, buf, n);
+            ret = fbfront_receive(files[fd].dev, buf, n);
            if (ret <= 0) {
                errno = EAGAIN;
                return -1;
@@ -480,7 +480,7 @@ int close(int fd)
 #endif
 #ifdef CONFIG_FBFRONT
        case FTYPE_FB:
-            shutdown_fbfront(files[fd].fb.dev);
+            shutdown_fbfront(files[fd].dev);
             files[fd].type = FTYPE_NONE;
             return 0;
 #endif