From: Greg Kroah-Hartman Date: Sun, 31 Aug 2014 00:18:04 +0000 (-0700) Subject: greybus: actually get the devm() change to build... X-Git-Tag: v4.14-rc1~2366^2~378^2~21^2~2169 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bf23e84d7cc2d63cfe433ded084e1052fc6d487;p=platform%2Fkernel%2Flinux-rpi.git greybus: actually get the devm() change to build... --- diff --git a/drivers/staging/greybus/gpio-gb.c b/drivers/staging/greybus/gpio-gb.c index 43fd0d3..2047794 100644 --- a/drivers/staging/greybus/gpio-gb.c +++ b/drivers/staging/greybus/gpio-gb.c @@ -59,7 +59,7 @@ int gb_gpio_probe(struct greybus_device *gdev, struct device *dev = &gdev->dev; int retval; - gb_gpio = kzalloc(dev, sizeof(*gb_gpio), GFP_KERNEL); + gb_gpio = kzalloc(sizeof(*gb_gpio), GFP_KERNEL); if (!gb_gpio) return -ENOMEM; gb_gpio->gdev = gdev; diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c index 298b9ff..f667b5c 100644 --- a/drivers/staging/greybus/uart-gb.c +++ b/drivers/staging/greybus/uart-gb.c @@ -390,7 +390,7 @@ int gb_tty_probe(struct greybus_device *gdev, int retval; int minor; - gb_tty = kzalloc(&gdev->dev, sizeof(*gb_tty), GFP_KERNEL); + gb_tty = kzalloc(sizeof(*gb_tty), GFP_KERNEL); if (!gb_tty) return -ENOMEM;