Merge tag 'for-linus-5.15-1' of git://github.com/cminyard/linux-ipmi

[linux-2.6-microblaze.git] / drivers / char / ipmi / ipmi_si_intf.c

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 5bf9271..6f3272b 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2227,22 +2227,18 @@ static void cleanup_one_si(struct smi_info *smi_info)
        kfree(smi_info);
 }
 
        kfree(smi_info);
 }
 

-int ipmi_si_remove_by_dev(struct device *dev)
+void ipmi_si_remove_by_dev(struct device *dev)

 {
        struct smi_info *e;
 {
        struct smi_info *e;

-       int rv = -ENOENT;

 
        mutex_lock(&smi_infos_lock);
        list_for_each_entry(e, &smi_infos, link) {
                if (e->io.dev == dev) {
                        cleanup_one_si(e);
 
        mutex_lock(&smi_infos_lock);
        list_for_each_entry(e, &smi_infos, link) {
                if (e->io.dev == dev) {
                        cleanup_one_si(e);

-                       rv = 0;

                        break;
                }
        }
        mutex_unlock(&smi_infos_lock);
                        break;
                }
        }
        mutex_unlock(&smi_infos_lock);

-
-       return rv;

 }
 
 struct device *ipmi_si_remove_by_data(int addr_space, enum si_type si_type,
 }
 
 struct device *ipmi_si_remove_by_data(int addr_space, enum si_type si_type,