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

This project is archived. Its data is read-only.

Commit 600485ed authored Feb 03, 2013 by Hauke Mehrtens Committed by John W. Linville Feb 04, 2013

ssb: unregister gpios before unloading ssb



This patch unregisters the gpio chip before ssb gets unloaded.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent c50ae947

drivers/ssb/driver_gpio.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -174,3 +174,15 @@ int ssb_gpio_init(struct ssb_bus *bus)

	return -1;		return -1;
	}		}

			int ssb_gpio_unregister(struct ssb_bus *bus)
			{
			if (ssb_chipco_available(&bus->chipco) \|\|
			ssb_extif_available(&bus->extif)) {
			return gpiochip_remove(&bus->gpio);
			} else {
			SSB_WARN_ON(1);
			}

			return -1;
			}

drivers/ssb/main.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -443,6 +443,15 @@ static void ssb_devices_unregister(struct ssb_bus *bus)

	void ssb_bus_unregister(struct ssb_bus *bus)		void ssb_bus_unregister(struct ssb_bus *bus)
	{		{
			int err;

			err = ssb_gpio_unregister(bus);
			if (err == -EBUSY)
			ssb_dprintk(KERN_ERR PFX "Some GPIOs are still in use.\n");
			else if (err)
			ssb_dprintk(KERN_ERR PFX
			"Can not unregister GPIO driver: %i\n", err);

	ssb_buses_lock();		ssb_buses_lock();
	ssb_devices_unregister(bus);		ssb_devices_unregister(bus);
	list_del(&bus->list);		list_del(&bus->list);

drivers/ssb/ssb_private.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -252,11 +252,16 @@ static inline void ssb_extif_init(struct ssb_extif *extif)

	#ifdef CONFIG_SSB_DRIVER_GPIO		#ifdef CONFIG_SSB_DRIVER_GPIO
	extern int ssb_gpio_init(struct ssb_bus *bus);		extern int ssb_gpio_init(struct ssb_bus *bus);
			extern int ssb_gpio_unregister(struct ssb_bus *bus);
	#else /* CONFIG_SSB_DRIVER_GPIO */		#else /* CONFIG_SSB_DRIVER_GPIO */
	static inline int ssb_gpio_init(struct ssb_bus *bus)		static inline int ssb_gpio_init(struct ssb_bus *bus)
	{		{
	return -ENOTSUPP;		return -ENOTSUPP;
	}		}
			static inline int ssb_gpio_unregister(struct ssb_bus *bus)
			{
			return 0;
			}
	#endif /* CONFIG_SSB_DRIVER_GPIO */		#endif /* CONFIG_SSB_DRIVER_GPIO */

	#endif /* LINUX_SSB_PRIVATE_H_ */		#endif /* LINUX_SSB_PRIVATE_H_ */