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

Commit 83dc2cbc authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files

rapidio: add shutdown notification for RapidIO devices 



Add bus-specific callback to stop RapidIO devices during a system
shutdown.

Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dbe74afe

drivers/rapidio/rio-driver.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,17 @@ static int rio_device_remove(struct device *dev) 
	return 0;

	return 0;

}

}





static void rio_device_shutdown(struct device *dev)

{

	struct rio_dev *rdev = to_rio_dev(dev);

	struct rio_driver *rdrv = rdev->driver;



	dev_dbg(dev, "RIO: %s\n", __func__);



	if (rdrv && rdrv->shutdown)

		rdrv->shutdown(rdev);

}



/**

/**

 *  rio_register_driver - register a new RIO driver

 *  rio_register_driver - register a new RIO driver

 *  @rdrv: the RIO driver structure to register

 *  @rdrv: the RIO driver structure to register
@@ -229,6 +240,7 @@ struct bus_type rio_bus_type = { 
	.bus_groups = rio_bus_groups,

	.bus_groups = rio_bus_groups,

	.probe = rio_device_probe,

	.probe = rio_device_probe,

	.remove = rio_device_remove,

	.remove = rio_device_remove,

	.shutdown = rio_device_shutdown,

	.uevent	= rio_uevent,

	.uevent	= rio_uevent,

};

};

include/linux/rio.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,7 @@ struct rio_ops { 
 * @id_table: RIO device ids to be associated with this driver

 * @id_table: RIO device ids to be associated with this driver

 * @probe: RIO device inserted

 * @probe: RIO device inserted

 * @remove: RIO device removed

 * @remove: RIO device removed

 * @shutdown: shutdown notification callback

 * @suspend: RIO device suspended

 * @suspend: RIO device suspended

 * @resume: RIO device awakened

 * @resume: RIO device awakened

 * @enable_wake: RIO device enable wake event

 * @enable_wake: RIO device enable wake event
@@ -437,6 +438,7 @@ struct rio_driver { 
	const struct rio_device_id *id_table;

	const struct rio_device_id *id_table;

	int (*probe) (struct rio_dev * dev, const struct rio_device_id * id);

	int (*probe) (struct rio_dev * dev, const struct rio_device_id * id);

	void (*remove) (struct rio_dev * dev);

	void (*remove) (struct rio_dev * dev);

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

	int (*suspend) (struct rio_dev * dev, u32 state);

	int (*suspend) (struct rio_dev * dev, u32 state);

	int (*resume) (struct rio_dev * dev);

	int (*resume) (struct rio_dev * dev);

	int (*enable_wake) (struct rio_dev * dev, u32 state, int enable);

	int (*enable_wake) (struct rio_dev * dev, u32 state, int enable);