Commit e1b95dc6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

SHPCHP: fix __must_check warnings

Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4bf3392e
...@@ -173,7 +173,7 @@ struct controller { ...@@ -173,7 +173,7 @@ struct controller {
#define msg_button_cancel "PCI slot #%s - action canceled due to button press.\n" #define msg_button_cancel "PCI slot #%s - action canceled due to button press.\n"
/* sysfs functions for the hotplug controller info */ /* sysfs functions for the hotplug controller info */
extern void shpchp_create_ctrl_files (struct controller *ctrl); extern int __must_check shpchp_create_ctrl_files(struct controller *ctrl);
extern int shpchp_sysfs_enable_slot(struct slot *slot); extern int shpchp_sysfs_enable_slot(struct slot *slot);
extern int shpchp_sysfs_disable_slot(struct slot *slot); extern int shpchp_sysfs_disable_slot(struct slot *slot);
......
...@@ -449,10 +449,14 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -449,10 +449,14 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ctrl->speed = PCI_SPEED_33MHz; ctrl->speed = PCI_SPEED_33MHz;
} }
shpchp_create_ctrl_files(ctrl); rc = shpchp_create_ctrl_files(ctrl);
if (rc)
goto err_cleanup_slots;
return 0; return 0;
err_cleanup_slots:
cleanup_slots(ctrl);
err_out_release_ctlr: err_out_release_ctlr:
ctrl->hpc_ops->release_ctlr(ctrl); ctrl->hpc_ops->release_ctlr(ctrl);
err_out_free_ctrl: err_out_free_ctrl:
......
...@@ -91,9 +91,9 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha ...@@ -91,9 +91,9 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
} }
static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
void shpchp_create_ctrl_files (struct controller *ctrl) int __must_check shpchp_create_ctrl_files (struct controller *ctrl)
{ {
device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl); return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
} }
void shpchp_remove_ctrl_files(struct controller *ctrl) void shpchp_remove_ctrl_files(struct controller *ctrl)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment