xenbus: prevent warnings on unhandled enumeration values

XenbusStateReconfiguring/XenbusStateReconfigured were introduced by
c/s 437, but aren't handled in many switch statements. This c/s also
introduced a possibly un-referenced label, which also gets eliminated
here.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/drivers/char/tpm/tpm_xen.c b/drivers/char/tpm/tpm_xen.c
index a0ac589675361a2d31dc93c61872e35ba1ce98de..806db48d94bb45d450c2f406c7fd97c6dce1680b 100644 (file)
--- a/drivers/char/tpm/tpm_xen.c
+++ b/drivers/char/tpm/tpm_xen.c
@@ -347,6 +347,8 @@ static void backend_changed(struct xenbus_device *dev,
        case XenbusStateInitialising:
        case XenbusStateInitWait:
        case XenbusStateInitialised:
+       case XenbusStateReconfiguring:
+       case XenbusStateReconfigured:
        case XenbusStateUnknown:
                break;
 

diff --git a/drivers/xen/blkfront/blkfront.c b/drivers/xen/blkfront/blkfront.c
index 9b569ca833b268e73608568a0510bf5f689b48ff..815ea88f83421a487e6c8757a3becb8bb1efdfe8 100644 (file)
--- a/drivers/xen/blkfront/blkfront.c
+++ b/drivers/xen/blkfront/blkfront.c
@@ -266,6 +266,8 @@ static void backend_changed(struct xenbus_device *dev,
        case XenbusStateInitialising:
        case XenbusStateInitWait:
        case XenbusStateInitialised:
+       case XenbusStateReconfiguring:
+       case XenbusStateReconfigured:
        case XenbusStateUnknown:
        case XenbusStateClosed:
                break;

diff --git a/drivers/xen/fbfront/xenfb.c b/drivers/xen/fbfront/xenfb.c
index 49bfe5295b1667cb458002f9339bd8b4a2052706..3606aedfb533f4702de71195a49ac6877fb8a1bd 100644 (file)
--- a/drivers/xen/fbfront/xenfb.c
+++ b/drivers/xen/fbfront/xenfb.c
@@ -687,6 +687,8 @@ static void xenfb_backend_changed(struct xenbus_device *dev,
        switch (backend_state) {
        case XenbusStateInitialising:
        case XenbusStateInitialised:
+       case XenbusStateReconfiguring:
+       case XenbusStateReconfigured:
        case XenbusStateUnknown:
        case XenbusStateClosed:
                break;

diff --git a/drivers/xen/fbfront/xenkbd.c b/drivers/xen/fbfront/xenkbd.c
index 41dac5a7afb2d704c8ab4b217a9219f34ae49f58..fd5ca117cb088b40f22361ec22e82082e8f7f708 100644 (file)
--- a/drivers/xen/fbfront/xenkbd.c
+++ b/drivers/xen/fbfront/xenkbd.c
@@ -268,6 +268,8 @@ static void xenkbd_backend_changed(struct xenbus_device *dev,
        switch (backend_state) {
        case XenbusStateInitialising:
        case XenbusStateInitialised:
+       case XenbusStateReconfiguring:
+       case XenbusStateReconfigured:
        case XenbusStateUnknown:
        case XenbusStateClosed:
                break;

diff --git a/drivers/xen/netfront/netfront.c b/drivers/xen/netfront/netfront.c
index 4d4b0c315fe5f9d0de65476c887bba8e3973499c..108022b97f9305b11b68b808c8b88d4229ad15cb 100644 (file)
--- a/drivers/xen/netfront/netfront.c
+++ b/drivers/xen/netfront/netfront.c
@@ -536,6 +536,8 @@ static void backend_changed(struct xenbus_device *dev,
        case XenbusStateInitialising:
        case XenbusStateInitialised:
        case XenbusStateConnected:
+       case XenbusStateReconfiguring:
+       case XenbusStateReconfigured:
        case XenbusStateUnknown:
        case XenbusStateClosed:
                break;

diff --git a/drivers/xen/pcifront/pci_op.c b/drivers/xen/pcifront/pci_op.c
index 2784135c4e44ce4999bdd9d43cf3d114c7943dcc..54cb83cad7ac0f006fe9345ae2685c51e77c48e0 100644 (file)
--- a/drivers/xen/pcifront/pci_op.c
+++ b/drivers/xen/pcifront/pci_op.c
@@ -359,7 +359,6 @@ int pcifront_rescan_root(struct pcifront_device *pdev,
        struct pci_bus *b;
        struct pci_dev *d;
        unsigned int devfn;
-       int err = 0;
 
 #ifndef CONFIG_PCI_DOMAINS
        if (domain != 0) {
@@ -367,8 +366,7 @@ int pcifront_rescan_root(struct pcifront_device *pdev,
                        "PCI Root in non-zero PCI Domain! domain=%d\n", domain);
                dev_err(&pdev->xdev->dev,
                        "Please compile with CONFIG_PCI_DOMAINS\n");
-               err = -EINVAL;
-               goto err_out;
+               return -EINVAL;
        }
 #endif
 
@@ -401,8 +399,7 @@ int pcifront_rescan_root(struct pcifront_device *pdev,
                }
        }
 
-      err_out:
-       return err;
+       return 0;
 }
 
 static void free_root_bus_devs(struct pci_bus *bus)