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

Commit c6a09196 authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

[PATCH] Add sh_bus_type probe and remove methods 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 91fb5386

arch/sh/kernel/cpu/bus.c

+17 −17
Original line number Diff line number Diff line
@@ -53,21 +53,6 @@ static int sh_bus_resume(struct device *dev) 
	return 0;

}



static struct device sh_bus_devices[SH_NR_BUSES] = {

	{

		.bus_id		= SH_BUS_NAME_VIRT,

	},

};



struct bus_type sh_bus_types[SH_NR_BUSES] = {

	{

		.name		= SH_BUS_NAME_VIRT,

		.match		= sh_bus_match,

		.suspend	= sh_bus_suspend,

		.resume		= sh_bus_resume,

	},

};



static int sh_device_probe(struct device *dev)

{

	struct sh_dev *shdev = to_sh_dev(dev);
@@ -90,6 +75,23 @@ static int sh_device_remove(struct device *dev) 
	return 0;

}



static struct device sh_bus_devices[SH_NR_BUSES] = {

	{

		.bus_id		= SH_BUS_NAME_VIRT,

	},

};



struct bus_type sh_bus_types[SH_NR_BUSES] = {

	{

		.name		= SH_BUS_NAME_VIRT,

		.match		= sh_bus_match,

		.probe		= sh_bus_probe,

		.remove		= sh_bus_remove,

		.suspend	= sh_bus_suspend,

		.resume		= sh_bus_resume,

	},

};



int sh_device_register(struct sh_dev *dev)

{

	if (!dev)
@@ -133,8 +135,6 @@ int sh_driver_register(struct sh_driver *drv) 
		return -EINVAL;

	}



	drv->drv.probe  = sh_device_probe;

	drv->drv.remove = sh_device_remove;

	drv->drv.bus    = &sh_bus_types[drv->bus_id];



	return driver_register(&drv->drv);