Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a0d23ed authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi: ipmi_unregister_smi() cannot fail, have it return void 



Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent e56710d2

drivers/char/ipmi/ipmi_msghandler.c

+1 −3
Original line number Diff line number Diff line
@@ -3711,7 +3711,7 @@ static void cleanup_smi_msgs(struct ipmi_smi *intf) 
	}

}



int ipmi_unregister_smi(struct ipmi_smi *intf)

void ipmi_unregister_smi(struct ipmi_smi *intf)

{

	struct ipmi_smi_watcher *w;

	int intf_num = intf->intf_num, index;
@@ -3755,8 +3755,6 @@ int ipmi_unregister_smi(struct ipmi_smi *intf) 


	cleanup_srcu_struct(&intf->users_srcu);

	kref_put(&intf->refcount, intf_free);



	return 0;

}

EXPORT_SYMBOL(ipmi_unregister_smi);

drivers/char/ipmi/ipmi_si_intf.c

+1 −4
Original line number Diff line number Diff line
@@ -2365,16 +2365,13 @@ static void shutdown_smi(void *send_info) 


static void shutdown_one_si(struct smi_info *smi_info)

{

	int rv;

	ipmi_smi_t intf = smi_info->intf;



	if (!intf)

		return;



	smi_info->intf = NULL;

	rv = ipmi_unregister_smi(intf);

	if (rv)

		pr_err(PFX "Unable to unregister device: errno=%d\n", rv);

	ipmi_unregister_smi(intf);

}



static void cleanup_one_si(struct smi_info *smi_info)

drivers/char/ipmi/ipmi_ssif.c

+1 −3
Original line number Diff line number Diff line
@@ -1247,9 +1247,7 @@ static int ssif_remove(struct i2c_client *client) 
	 */

	intf = ssif_info->intf;

	ssif_info->intf = NULL;

	rv = ipmi_unregister_smi(intf);

	if (rv)

		pr_err(PFX "Unable to unregister device: errno=%d\n", rv);

	ipmi_unregister_smi(intf);



	list_for_each_entry(addr_info, &ssif_infos, link) {

		if (addr_info->client == client) {

include/linux/ipmi_smi.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers, 
 * Remove a low-level interface from the IPMI driver.  This will

 * return an error if the interface is still in use by a user.

 */

int ipmi_unregister_smi(ipmi_smi_t intf);

void ipmi_unregister_smi(ipmi_smi_t intf);



/*

 * The lower layer reports received messages through this interface.