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

Commit 0aa3f139 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

staging: Use GFP_ATOMIC when a lock is held 

In each case, the containing function is only called from one place, where
a spin lock is held.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@gfp exists@
identifier fn;
position p;
@@

fn(...) {
... when != spin_unlock
    when any
  GFP_KERNEL@p
 ... when any
}

@locked@
identifier gfp.fn;
@@

spin_lock(...)
... when != spin_unlock
fn(...)

@depends on locked@
position gfp.p;
@@

- GFP_KERNEL@p
+ GFP_ATOMIC
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ebe86223

drivers/staging/iio/ring_sw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ static inline int __iio_allocate_sw_ring_buffer(struct iio_sw_ring_buffer *ring, 
	if ((length == 0) || (bytes_per_datum == 0))

	if ((length == 0) || (bytes_per_datum == 0))

		return -EINVAL;

		return -EINVAL;

	__iio_update_ring_buffer(&ring->buf, bytes_per_datum, length);

	__iio_update_ring_buffer(&ring->buf, bytes_per_datum, length);

	ring->data = kmalloc(length*ring->buf.bpd, GFP_KERNEL);

	ring->data = kmalloc(length*ring->buf.bpd, GFP_ATOMIC);

	ring->read_p = NULL;

	ring->read_p = NULL;

	ring->write_p = NULL;

	ring->write_p = NULL;

	ring->last_written_p = NULL;

	ring->last_written_p = NULL;

drivers/staging/vme/bridges/vme_ca91cx42.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, 
	}

	}





	if (image->bus_resource.name == NULL) {

	if (image->bus_resource.name == NULL) {

		image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_KERNEL);

		image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);

		if (image->bus_resource.name == NULL) {

		if (image->bus_resource.name == NULL) {

			dev_err(ca91cx42_bridge->parent, "Unable to allocate "

			dev_err(ca91cx42_bridge->parent, "Unable to allocate "

				"memory for resource name\n");

				"memory for resource name\n");

drivers/staging/vme/bridges/vme_tsi148.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -828,7 +828,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, 
		return 0;

		return 0;





	if (image->bus_resource.name == NULL) {

	if (image->bus_resource.name == NULL) {

		image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_KERNEL);

		image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);

		if (image->bus_resource.name == NULL) {

		if (image->bus_resource.name == NULL) {

			dev_err(tsi148_bridge->parent, "Unable to allocate "

			dev_err(tsi148_bridge->parent, "Unable to allocate "

				"memory for resource name\n");

				"memory for resource name\n");