Commit e5f167f1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

greybus: can't use devm anymore, we aren't tieing into the driver model lifecycle :(

parent ba4468d4

drivers/staging/greybus/gpio-gb.c

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int gb_gpio_probe(struct greybus_device *gdev, 
	struct device *dev = &gdev->dev;

	int retval;



	gb_gpio = devm_kzalloc(dev, sizeof(*gb_gpio), GFP_KERNEL);

	gb_gpio = kzalloc(dev, sizeof(*gb_gpio), GFP_KERNEL);

	if (!gb_gpio)

		return -ENOMEM;

	gb_gpio->gdev = gdev;
@@ -95,6 +95,7 @@ void gb_gpio_disconnect(struct greybus_device *gdev) 
	gb_gpio_dev = gdev->gb_gpio_dev;



	gpiochip_remove(&gb_gpio_dev->chip);

	kfree(gb_gpio_dev);

}



#if 0

drivers/staging/greybus/uart-gb.c

+3 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ int gb_tty_probe(struct greybus_device *gdev, 
	int retval;

	int minor;



	gb_tty = devm_kzalloc(&gdev->dev, sizeof(*gb_tty), GFP_KERNEL);

	gb_tty = kzalloc(&gdev->dev, sizeof(*gb_tty), GFP_KERNEL);

	if (!gb_tty)

		return -ENOMEM;
@@ -455,6 +455,8 @@ void gb_tty_disconnect(struct greybus_device *gdev) 
	/* FIXME - free transmit / recieve buffers */



	tty_port_put(&gb_tty->port);



	kfree(gb_tty);

}



static struct greybus_driver tty_gb_driver = {