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

Commit 1a6f2a75 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

Driver core: allow certain drivers prohibit bind/unbind via sysfs 



Platform drivers registered via platform_driver_probe() can be bound
to devices only once, upon registration, because discard their probe()
routines to save memory. Unbinding the driver through sysfs 'unbind'
leaves the device stranded and confuses users so let's not create
bind and unbind attributes for such drivers.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Cc: Éric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 39acbc12

drivers/base/bus.c

+11 −6
Original line number Diff line number Diff line
@@ -689,15 +689,19 @@ int bus_add_driver(struct device_driver *drv) 
		printk(KERN_ERR "%s: driver_add_attrs(%s) failed\n",

			__func__, drv->name);

	}



	if (!drv->suppress_bind_attrs) {

		error = add_bind_files(drv);

		if (error) {

			/* Ditto */

			printk(KERN_ERR "%s: add_bind_files(%s) failed\n",

				__func__, drv->name);

		}

	}



	kobject_uevent(&priv->kobj, KOBJ_ADD);

	return 0;



out_unregister:

	kfree(drv->p);

	drv->p = NULL;
@@ -720,6 +724,7 @@ void bus_remove_driver(struct device_driver *drv) 
	if (!drv->bus)

		return;



	if (!drv->suppress_bind_attrs)

		remove_bind_files(drv);

	driver_remove_attrs(drv->bus, drv);

	driver_remove_file(drv, &driver_attr_uevent);

drivers/base/platform.c

+5 −1
Original line number Diff line number Diff line
@@ -521,11 +521,15 @@ int __init_or_module platform_driver_probe(struct platform_driver *drv, 
{

	int retval, code;



	/* make sure driver won't have bind/unbind attributes */

	drv->driver.suppress_bind_attrs = true;



	/* temporary section violation during probe() */

	drv->probe = probe;

	retval = code = platform_driver_register(drv);



	/* Fixup that section violation, being paranoid about code scanning

	/*

	 * Fixup that section violation, being paranoid about code scanning

	 * the list of drivers in order to probe new devices.  Check to see

	 * if the probe was successful, and make sure any forced probes of

	 * new devices fail.

include/linux/device.h

+3 −1
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ struct device_driver { 
	struct module		*owner;

	const char		*mod_name;	/* used for built-in modules */



	bool suppress_bind_attrs;	/* disables bind/unbind via sysfs */



	int (*probe) (struct device *dev);

	int (*remove) (struct device *dev);

	void (*shutdown) (struct device *dev);