gpiolib: Split fastpath array to two
PATCH 1/2 gpiolib: Split fastpath array to two
Split fastpath array to two, i.e. for mask and for bits. At the same time declare them as bitmaps.
This makes code better to read and gives a clue about use of bitmap API.
--- drivers/gpio/gpiolib.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
drivers/gpio/gpiolib.c +15 -9
@@ -2540,21 +2540,24 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep,while (i < array_size) {struct gpio_chip *gc = desc_array[i]->gdev->chip; -unsigned long fastpath[2 *BITS_TO_LONGS (FASTPATH_NGPIO )]; +DECLARE_BITMAP (fastpath_mask,FASTPATH_NGPIO ); +DECLARE_BITMAP (fastpath_bits,FASTPATH_NGPIO );unsigned long *mask, *bits;int first, j;if (likely (gc->ngpio <=FASTPATH_NGPIO )) { - mask = fastpath; + mask = fastpath_mask; + bits = fastpath_bits; }else { mask =kmalloc_array (2 *BITS_TO_LONGS (gc->ngpio),sizeof (*mask), can_sleep ?GFP_KERNEL :GFP_ATOMIC );if (!mask)return -ENOMEM ; + + bits = mask +BITS_TO_LONGS (gc->ngpio); } - bits = mask +BITS_TO_LONGS (gc->ngpio);bitmap_zero (mask, gc->ngpio);if (!can_sleep)
@@ -2577,7 +2580,7 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep, ret =gpio_chip_get_multiple (gc, mask, bits);if (ret) { -if (mask != fastpath) +if (mask != fastpath_mask)kfree (mask);return ret; }
@@ -2598,7 +2601,7 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep, j); } -if (mask != fastpath) +if (mask != fastpath_mask)kfree (mask); }return 0 ;
@@ -2823,21 +2826,24 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,while (i < array_size) {struct gpio_chip *gc = desc_array[i]->gdev->chip; -unsigned long fastpath[2 *BITS_TO_LONGS (FASTPATH_NGPIO )]; +DECLARE_BITMAP (fastpath_mask,FASTPATH_NGPIO ); +DECLARE_BITMAP (fastpath_bits,FASTPATH_NGPIO );unsigned long *mask, *bits;int count =0 ;if (likely (gc->ngpio <=FASTPATH_NGPIO )) { - mask = fastpath; + mask = fastpath_mask; + bits = fastpath_bits; }else { mask =kmalloc_array (2 *BITS_TO_LONGS (gc->ngpio),sizeof (*mask), can_sleep ?GFP_KERNEL :GFP_ATOMIC );if (!mask)return -ENOMEM ; + + bits = mask +BITS_TO_LONGS (gc->ngpio); } - bits = mask +BITS_TO_LONGS (gc->ngpio);bitmap_zero (mask, gc->ngpio);if (!can_sleep)
@@ -2882,7 +2888,7 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,if (count !=0 )gpio_chip_set_multiple (gc, mask, bits); -if (mask != fastpath) +if (mask != fastpath_mask)kfree (mask); }return 0 ;
Signature · 1 line
2.30.2
PATCH 2/2 gpiolib: Switch to bitmap_alloc()
Switch to bitmap_alloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.
--- drivers/gpio/gpiolib.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)
drivers/gpio/gpiolib.c +25 -11
@@ -2549,13 +2549,17 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep, mask = fastpath_mask; bits = fastpath_bits; }else { - mask =kmalloc_array (2 *BITS_TO_LONGS (gc->ngpio), -sizeof (*mask), - can_sleep ?GFP_KERNEL :GFP_ATOMIC ); +gfp_t flags = can_sleep ?GFP_KERNEL :GFP_ATOMIC ; + + mask =bitmap_alloc (gc->ngpio, flags);if (!mask)return -ENOMEM ; - bits = mask +BITS_TO_LONGS (gc->ngpio); + bits =bitmap_alloc (gc->ngpio, flags); +if (!bits) { +bitmap_free (mask); +return -ENOMEM ; + } }bitmap_zero (mask, gc->ngpio);
@@ -2581,7 +2585,9 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep, ret =gpio_chip_get_multiple (gc, mask, bits);if (ret) {if (mask != fastpath_mask) -kfree (mask); +bitmap_free (mask); +if (bits != fastpath_bits) +bitmap_free (bits);return ret; }
@@ -2602,7 +2608,9 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep, }if (mask != fastpath_mask) -kfree (mask); +bitmap_free (mask); +if (bits != fastpath_bits) +bitmap_free (bits); }return 0 ; }
@@ -2835,13 +2843,17 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep, mask = fastpath_mask; bits = fastpath_bits; }else { - mask =kmalloc_array (2 *BITS_TO_LONGS (gc->ngpio), -sizeof (*mask), - can_sleep ?GFP_KERNEL :GFP_ATOMIC ); +gfp_t flags = can_sleep ?GFP_KERNEL :GFP_ATOMIC ; + + mask =bitmap_alloc (gc->ngpio, flags);if (!mask)return -ENOMEM ; - bits = mask +BITS_TO_LONGS (gc->ngpio); + bits =bitmap_alloc (gc->ngpio, flags); +if (!bits) { +bitmap_free (mask); +return -ENOMEM ; + } }bitmap_zero (mask, gc->ngpio);
@@ -2889,7 +2901,9 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,gpio_chip_set_multiple (gc, mask, bits);if (mask != fastpath_mask) -kfree (mask); +bitmap_free (mask); +if (bits != fastpath_bits) +bitmap_free (bits); }return 0 ; }
Signature · 1 line
2.30.2
Re: [PATCH v1 2/2] gpiolib: Switch to bitmap_alloc()
Quoted 4 lines · Andy Shevchenko
Switch to
bitmap_alloc()to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.Signed-off-by Andy Shevchenko <[email protected]>
Yours,
Linus Walleij
Bartosz Golaszewski
AppliedRe: [PATCH v1 2/2] gpiolib: Switch to bitmap_alloc()
In reply to Andy ShevchenkoQuoted 6 lines · Andy Shevchenko
Switch to
bitmap_alloc()to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.Signed-off-by Andy Shevchenko <[email protected]>---
Applied, thanks!
Bart
Quoted 7 lines · Andy Shevchenko
Split fastpath array to two, i.e. for mask and for bits. At the same time declare them as bitmaps.
This makes code better to read and gives a clue about use of bitmap API.
Signed-off-by Andy Shevchenko <[email protected]>
Excellent code!
Yours,
Linus Walleij
Bartosz Golaszewski
AppliedQuoted 9 lines · Andy Shevchenko
Split fastpath array to two, i.e. for mask and for bits. At the same time declare them as bitmaps.
This makes code better to read and gives a clue about use of bitmap API.
Signed-off-by Andy Shevchenko <[email protected]>---
Applied, thanks!
Bart