pch_phub: fix error return code in pch_phub_probe()

Error code had been assigned to retval in some error handling case
but never use it, 0 is always returned in those case, this patch
fix them to return a negative error code.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index 8b4d4fb9187b23a4aa9556a9b802132334800e9a..a5925f7f17f6a564cab6296dd2333fb5ae08d92e 100644 (file)
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -665,8 +665,6 @@ static struct bin_attribute pch_bin_attr = {
 static int pch_phub_probe(struct pci_dev *pdev,
                                    const struct pci_device_id *id)
 {
-       int retval;
-
        int ret;
        struct pch_phub_reg *chip;
 
@@ -709,13 +707,13 @@ static int pch_phub_probe(struct pci_dev *pdev,
        if (id->driver_data == 1) { /* EG20T PCH */
                const char *board_name;
 
-               retval = sysfs_create_file(&pdev->dev.kobj,
-                                          &dev_attr_pch_mac.attr);
-               if (retval)
+               ret = sysfs_create_file(&pdev->dev.kobj,
+                                       &dev_attr_pch_mac.attr);
+               if (ret)
                        goto err_sysfs_create;
 
-               retval = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
-               if (retval)
+               ret = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
+               if (ret)
                        goto exit_bin_attr;
 
                pch_phub_read_modify_write_reg(chip,
@@ -739,8 +737,8 @@ static int pch_phub_probe(struct pci_dev *pdev,
                chip->pch_opt_rom_start_address = PCH_PHUB_ROM_START_ADDR_EG20T;
                chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_EG20T;
        } else if (id->driver_data == 2) { /* ML7213 IOH */
-               retval = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
-               if (retval)
+               ret = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
+               if (ret)
                        goto err_sysfs_create;
                /* set the prefech value
                 * Device2(USB OHCI #1/ USB EHCI #1/ USB Device):a
@@ -762,12 +760,12 @@ static int pch_phub_probe(struct pci_dev *pdev,
                                                 PCH_PHUB_ROM_START_ADDR_ML7223;
                chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_ML7223;
        } else if (id->driver_data == 4) { /* ML7223 IOH Bus-n*/
-               retval = sysfs_create_file(&pdev->dev.kobj,
-                                          &dev_attr_pch_mac.attr);
-               if (retval)
+               ret = sysfs_create_file(&pdev->dev.kobj,
+                                       &dev_attr_pch_mac.attr);
+               if (ret)
                        goto err_sysfs_create;
-               retval = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
-               if (retval)
+               ret = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
+               if (ret)
                        goto exit_bin_attr;
                /* set the prefech value
                 * Device2(USB OHCI #0,1,2,3/ USB EHCI #0):a
@@ -779,13 +777,13 @@ static int pch_phub_probe(struct pci_dev *pdev,
                                                 PCH_PHUB_ROM_START_ADDR_ML7223;
                chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_ML7223;
        } else if (id->driver_data == 5) { /* ML7831 */
-               retval = sysfs_create_file(&pdev->dev.kobj,
-                                          &dev_attr_pch_mac.attr);
-               if (retval)
+               ret = sysfs_create_file(&pdev->dev.kobj,
+                                       &dev_attr_pch_mac.attr);
+               if (ret)
                        goto err_sysfs_create;
 
-               retval = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
-               if (retval)
+               ret = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
+               if (ret)
                        goto exit_bin_attr;
 
                /* set the prefech value */