* [PATCH] video: fbdev: fix sys_copyarea
From: Mans Rullgard @ 2015-01-22 0:17 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev,
linux-kernel
The sys_copyarea() function performs the same operation as
cfb_copyarea() but using normal memory access instead of I/O
accessors. Since the introduction of sys_copyarea(), there
have been two fixes to cfb_copyarea():
- 00a9d699 ("framebuffer: fix cfb_copyarea")
- 5b789da8 ("framebuffer: fix screen corruption when copying")
This patch incorporates the fixes into sys_copyarea() as well.
Signed-off-by: Mans Rullgard <mans@mansr.com>
---
drivers/video/fbdev/core/syscopyarea.c | 137 ++++++++++++++++-----------------
1 file changed, 65 insertions(+), 72 deletions(-)
diff --git a/drivers/video/fbdev/core/syscopyarea.c b/drivers/video/fbdev/core/syscopyarea.c
index 844a32f..67b4d6d 100644
--- a/drivers/video/fbdev/core/syscopyarea.c
+++ b/drivers/video/fbdev/core/syscopyarea.c
@@ -25,8 +25,8 @@
*/
static void
-bitcpy(struct fb_info *p, unsigned long *dst, int dst_idx,
- const unsigned long *src, int src_idx, int bits, unsigned n)
+bitcpy(struct fb_info *p, unsigned long *dst, unsigned dst_idx,
+ const unsigned long *src, unsigned src_idx, int bits, unsigned n)
{
unsigned long first, last;
int const shift = dst_idx-src_idx;
@@ -86,15 +86,15 @@ bitcpy(struct fb_info *p, unsigned long *dst, int dst_idx,
first &= last;
if (shift > 0) {
/* Single source word */
- *dst = comp(*src >> right, *dst, first);
+ *dst = comp(*src << left, *dst, first);
} else if (src_idx+n <= bits) {
/* Single source word */
- *dst = comp(*src << left, *dst, first);
+ *dst = comp(*src >> right, *dst, first);
} else {
/* 2 source words */
d0 = *src++;
d1 = *src;
- *dst = comp(d0 << left | d1 >> right, *dst,
+ *dst = comp(d0 >> right | d1 << left, *dst,
first);
}
} else {
@@ -109,13 +109,14 @@ bitcpy(struct fb_info *p, unsigned long *dst, int dst_idx,
/* Leading bits */
if (shift > 0) {
/* Single source word */
- *dst = comp(d0 >> right, *dst, first);
+ *dst = comp(d0 << left, *dst, first);
dst++;
n -= bits - dst_idx;
} else {
/* 2 source words */
d1 = *src++;
- *dst = comp(d0 << left | *dst >> right, *dst, first);
+ *dst = comp(d0 >> right | d1 << left, *dst,
+ first);
d0 = d1;
dst++;
n -= bits - dst_idx;
@@ -126,36 +127,36 @@ bitcpy(struct fb_info *p, unsigned long *dst, int dst_idx,
n /= bits;
while (n >= 4) {
d1 = *src++;
- *dst++ = d0 << left | d1 >> right;
+ *dst++ = d0 >> right | d1 << left;
d0 = d1;
d1 = *src++;
- *dst++ = d0 << left | d1 >> right;
+ *dst++ = d0 >> right | d1 << left;
d0 = d1;
d1 = *src++;
- *dst++ = d0 << left | d1 >> right;
+ *dst++ = d0 >> right | d1 << left;
d0 = d1;
d1 = *src++;
- *dst++ = d0 << left | d1 >> right;
+ *dst++ = d0 >> right | d1 << left;
d0 = d1;
n -= 4;
}
while (n--) {
d1 = *src++;
- *dst++ = d0 << left | d1 >> right;
+ *dst++ = d0 >> right | d1 << left;
d0 = d1;
}
/* Trailing bits */
- if (last) {
- if (m <= right) {
+ if (m) {
+ if (m <= bits - right) {
/* Single source word */
- *dst = comp(d0 << left, *dst, last);
+ d0 >>= right;
} else {
/* 2 source words */
d1 = *src;
- *dst = comp(d0 << left | d1 >> right,
- *dst, last);
+ d0 = d0 >> right | d1 << left;
}
+ *dst = comp(d0, *dst, last);
}
}
}
@@ -166,40 +167,35 @@ bitcpy(struct fb_info *p, unsigned long *dst, int dst_idx,
*/
static void
-bitcpy_rev(struct fb_info *p, unsigned long *dst, int dst_idx,
- const unsigned long *src, int src_idx, int bits, unsigned n)
+bitcpy_rev(struct fb_info *p, unsigned long *dst, unsigned dst_idx,
+ const unsigned long *src, unsigned src_idx, unsigned bits,
+ unsigned n)
{
unsigned long first, last;
int shift;
- dst += (n-1)/bits;
- src += (n-1)/bits;
- if ((n-1) % bits) {
- dst_idx += (n-1) % bits;
- dst += dst_idx >> (ffs(bits) - 1);
- dst_idx &= bits - 1;
- src_idx += (n-1) % bits;
- src += src_idx >> (ffs(bits) - 1);
- src_idx &= bits - 1;
- }
+ dst += (dst_idx + n - 1) / bits;
+ src += (src_idx + n - 1) / bits;
+ dst_idx = (dst_idx + n - 1) % bits;
+ src_idx = (src_idx + n - 1) % bits;
shift = dst_idx-src_idx;
- first = FB_SHIFT_LOW(p, ~0UL, bits - 1 - dst_idx);
- last = ~(FB_SHIFT_LOW(p, ~0UL, bits - 1 - ((dst_idx-n) % bits)));
+ first = ~FB_SHIFT_LOW(p, ~0UL, (dst_idx + 1) % bits);
+ last = FB_SHIFT_LOW(p, ~0UL, (bits + dst_idx + 1 - n) % bits);
if (!shift) {
/* Same alignment for source and dest */
if ((unsigned long)dst_idx+1 >= n) {
/* Single word */
- if (last)
- first &= last;
- *dst = comp(*src, *dst, first);
+ if (first)
+ last &= first;
+ *dst = comp(*src, *dst, last);
} else {
/* Multiple destination words */
/* Leading bits */
- if (first != ~0UL) {
+ if (first) {
*dst = comp(*src, *dst, first);
dst--;
src--;
@@ -222,29 +218,29 @@ bitcpy_rev(struct fb_info *p, unsigned long *dst, int dst_idx,
while (n--)
*dst-- = *src--;
/* Trailing bits */
- if (last)
+ if (last != -1UL)
*dst = comp(*src, *dst, last);
}
} else {
/* Different alignment for source and dest */
- int const left = -shift & (bits-1);
- int const right = shift & (bits-1);
+ int const left = shift & (bits-1);
+ int const right = -shift & (bits-1);
if ((unsigned long)dst_idx+1 >= n) {
/* Single destination word */
- if (last)
- first &= last;
+ if (first)
+ last &= first;
if (shift < 0) {
/* Single source word */
- *dst = comp(*src << left, *dst, first);
+ *dst = comp(*src >> right, *dst, last);
} else if (1+(unsigned long)src_idx >= n) {
/* Single source word */
- *dst = comp(*src >> right, *dst, first);
+ *dst = comp(*src << left, *dst, last);
} else {
/* 2 source words */
- *dst = comp(*src >> right | *(src-1) << left,
- *dst, first);
+ *dst = comp(*src << left | *(src-1) >> right,
+ *dst, last);
}
} else {
/* Multiple destination words */
@@ -261,14 +257,18 @@ bitcpy_rev(struct fb_info *p, unsigned long *dst, int dst_idx,
/* Leading bits */
if (shift < 0) {
/* Single source word */
- *dst = comp(d0 << left, *dst, first);
+ d1 = d0;
+ d0 >>= right;
} else {
/* 2 source words */
d1 = *src--;
- *dst = comp(d0 >> right | d1 << left, *dst,
- first);
- d0 = d1;
+ d0 = d0 << left | d1 >> right;
}
+ if (!first)
+ *dst = d0;
+ else
+ *dst = comp(d0, *dst, first);
+ d0 = d1;
dst--;
n -= dst_idx+1;
@@ -277,36 +277,36 @@ bitcpy_rev(struct fb_info *p, unsigned long *dst, int dst_idx,
n /= bits;
while (n >= 4) {
d1 = *src--;
- *dst-- = d0 >> right | d1 << left;
+ *dst-- = d0 << left | d1 >> right;
d0 = d1;
d1 = *src--;
- *dst-- = d0 >> right | d1 << left;
+ *dst-- = d0 << left | d1 >> right;
d0 = d1;
d1 = *src--;
- *dst-- = d0 >> right | d1 << left;
+ *dst-- = d0 << left | d1 >> right;
d0 = d1;
d1 = *src--;
- *dst-- = d0 >> right | d1 << left;
+ *dst-- = d0 << left | d1 >> right;
d0 = d1;
n -= 4;
}
while (n--) {
d1 = *src--;
- *dst-- = d0 >> right | d1 << left;
+ *dst-- = d0 << left | d1 >> right;
d0 = d1;
}
/* Trailing bits */
- if (last) {
- if (m <= left) {
+ if (m) {
+ if (m <= bits - left) {
/* Single source word */
- *dst = comp(d0 >> right, *dst, last);
+ d0 <<= left;
} else {
/* 2 source words */
d1 = *src;
- *dst = comp(d0 >> right | d1 << left,
- *dst, last);
+ d0 = d0 << left | d1 >> right;
}
+ *dst = comp(d0, *dst, last);
}
}
}
@@ -317,9 +317,9 @@ void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area)
u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy;
u32 height = area->height, width = area->width;
unsigned long const bits_per_line = p->fix.line_length*8u;
- unsigned long *dst = NULL, *src = NULL;
+ unsigned long *base = NULL;
int bits = BITS_PER_LONG, bytes = bits >> 3;
- int dst_idx = 0, src_idx = 0, rev_copy = 0;
+ unsigned dst_idx = 0, src_idx = 0, rev_copy = 0;
if (p->state != FBINFO_STATE_RUNNING)
return;
@@ -334,8 +334,7 @@ void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area)
/* split the base of the framebuffer into a long-aligned address and
the index of the first bit */
- dst = src = (unsigned long *)((unsigned long)p->screen_base &
- ~(bytes-1));
+ base = (unsigned long *)((unsigned long)p->screen_base & ~(bytes-1));
dst_idx = src_idx = 8*((unsigned long)p->screen_base & (bytes-1));
/* add offset of source and target area */
dst_idx += dy*bits_per_line + dx*p->var.bits_per_pixel;
@@ -348,20 +347,14 @@ void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area)
while (height--) {
dst_idx -= bits_per_line;
src_idx -= bits_per_line;
- dst += dst_idx >> (ffs(bits) - 1);
- dst_idx &= (bytes - 1);
- src += src_idx >> (ffs(bits) - 1);
- src_idx &= (bytes - 1);
- bitcpy_rev(p, dst, dst_idx, src, src_idx, bits,
+ bitcpy_rev(p, base + (dst_idx / bits), dst_idx % bits,
+ base + (src_idx / bits), src_idx % bits, bits,
width*p->var.bits_per_pixel);
}
} else {
while (height--) {
- dst += dst_idx >> (ffs(bits) - 1);
- dst_idx &= (bytes - 1);
- src += src_idx >> (ffs(bits) - 1);
- src_idx &= (bytes - 1);
- bitcpy(p, dst, dst_idx, src, src_idx, bits,
+ bitcpy(p, base + (dst_idx / bits), dst_idx % bits,
+ base + (src_idx / bits), src_idx % bits, bits,
width*p->var.bits_per_pixel);
dst_idx += bits_per_line;
src_idx += bits_per_line;
--
2.0.5
^ permalink raw reply related
* Re: Font generation
From: Geert Uytterhoeven @ 2015-01-21 18:35 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <CAMuHMdUV1DYDpQOvEJ1K=dMxMpndMdBjXTALGA6U3ePmOAaE2Q@mail.gmail.com>
Hi Sagar,
> Thanks for the pointers, I tried xxd/convert/font2c but nothing worked out for me!
> In the fbtest how is the penguin_data[] and clut [] array populated ?
They're created from images/penguin.ppm using pnmtohex/pnmtohex.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* RE: Font generation
From: Ssagarr Patil @ 2015-01-21 16:58 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <CAMuHMdUV1DYDpQOvEJ1K=dMxMpndMdBjXTALGA6U3ePmOAaE2Q@mail.gmail.com>
Hi Geert,
>
> On Wed, Jan 21, 2015 at 3:47 PM, Ssagarr Patil <hugarsagar@outlook.com> wrote:
>> How do we generate the fonts is there any tool to do it ? I was looking at the fbtest tool which has predefined fonts for sun which says its generated
>> by cpi2fnt but I didnt find any tool to do that.
>>
>> Any pointers on this would be much helpful.
>
> https://bugzilla.kernel.org/show_bug.cgi?id\x15635
>
Thanks for the pointers, I tried xxd/convert/font2c but nothing worked out for me!
In the fbtest how is the penguin_data[] and clut [] array populated ?
Thanks & Regards,
-Sagar
^ permalink raw reply
* Re: [PATCH] backlight: da9052_bl: terminate da9052_wled_ids array with empty element
From: Lee Jones @ 2015-01-21 16:18 UTC (permalink / raw)
To: Andrey Ryabinin
Cc: linux-kernel, Support Opensource, Jingoo Han,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen,
open list:FRAMEBUFFER LAYER
In-Reply-To: <1421852768-29622-1-git-send-email-a.ryabinin@samsung.com>
On Wed, 21 Jan 2015, Andrey Ryabinin wrote:
> Array of platform_device_id elements should be terminated
> with empty element.
>
> Signed-off-by: Andrey Ryabinin <a.ryabinin@samsung.com>
> ---
> drivers/video/backlight/da9052_bl.c | 1 +
> 1 file changed, 1 insertion(+)
Applied, thanks.
> diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
> index d4bd74bd..b1943e7 100644
> --- a/drivers/video/backlight/da9052_bl.c
> +++ b/drivers/video/backlight/da9052_bl.c
> @@ -165,6 +165,7 @@ static struct platform_device_id da9052_wled_ids[] = {
> .name = "da9052-wled3",
> .driver_data = DA9052_TYPE_WLED3,
> },
> + { },
> };
>
> static struct platform_driver da9052_wled_driver = {
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply
* [PATCH] backlight: da9052_bl: terminate da9052_wled_ids array with empty element
From: Andrey Ryabinin @ 2015-01-21 15:06 UTC (permalink / raw)
To: linux-kernel, Support Opensource, Jingoo Han, Lee Jones,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen,
open list:FRAMEBUFFER LAYER
Cc: Andrey Ryabinin
Array of platform_device_id elements should be terminated
with empty element.
Signed-off-by: Andrey Ryabinin <a.ryabinin@samsung.com>
---
drivers/video/backlight/da9052_bl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
index d4bd74bd..b1943e7 100644
--- a/drivers/video/backlight/da9052_bl.c
+++ b/drivers/video/backlight/da9052_bl.c
@@ -165,6 +165,7 @@ static struct platform_device_id da9052_wled_ids[] = {
.name = "da9052-wled3",
.driver_data = DA9052_TYPE_WLED3,
},
+ { },
};
static struct platform_driver da9052_wled_driver = {
--
2.2.1
^ permalink raw reply related
* Font generation
From: Ssagarr Patil @ 2015-01-21 14:59 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <CAMuHMdUV1DYDpQOvEJ1K=dMxMpndMdBjXTALGA6U3ePmOAaE2Q@mail.gmail.com>
Hi,
Not sure if this query belongs to this forum sorry for that!
How do we generate the fonts is there any tool to do it ? I was looking at the fbtest tool which has predefined fonts for sun which says its generated
by cpi2fnt but I didnt find any tool to do that.
Any pointers on this would be much helpful.
Thanks & Regards,
-Sagar
^ permalink raw reply
* Re: Font generation
From: Geert Uytterhoeven @ 2015-01-21 14:52 UTC (permalink / raw)
To: linux-fbdev
On Wed, Jan 21, 2015 at 3:47 PM, Ssagarr Patil <hugarsagar@outlook.com> wrote:
> How do we generate the fonts is there any tool to do it ? I was looking at the fbtest tool which has predefined fonts for sun which says its generated
> by cpi2fnt but I didnt find any tool to do that.
>
> Any pointers on this would be much helpful.
https://bugzilla.kernel.org/show_bug.cgi?id\x15635
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* Re: [PATCH 1/2] backlight: pwm: don't call legacy pwm request for device defined in dt
From: Vladimir Zapolskiy @ 2015-01-21 13:18 UTC (permalink / raw)
To: Thierry Reding; +Cc: linux-fbdev, linux-pwm, Jingoo Han, Bryan Wu, Lee Jones
In-Reply-To: <547C7F8A.40707@mentor.com>
Hello Thierry,
On 01.12.2014 16:47, Vladimir Zapolskiy wrote:
> Hello Thierry,
>
> On 07.11.2014 16:57, Vladimir Zapolskiy wrote:
>> Thierry,
>>
>> On 07.11.2014 16:19, Vladimir Zapolskiy wrote:
>>> Hi Thierry,
>>>
>>> On 07.11.2014 15:48, Thierry Reding wrote:
>>>> On Sat, Oct 11, 2014 at 04:46:25PM +0300, Vladimir Zapolskiy wrote:
>>>>> Platform PWM backlight data provided by board's device tree should be
>>>>> complete enough to successfully request a pwm device using pwm_get() API.
>>>>>
>>>>> Based on initial implementation done by Dmitry Eremin-Solenikov.
>>>>>
>>>>> Reported-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
>>>>> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
>>>>> Cc: Thierry Reding <thierry.reding@gmail.com>
>>>>> Cc: Jingoo Han <jg1.han@samsung.com>
>>>>> Cc: Bryan Wu <cooloney@gmail.com>
>>>>> Cc: Lee Jones <lee.jones@linaro.org>
>>>>> ---
>>>>> drivers/video/backlight/pwm_bl.c | 14 +++++++-------
>>>>> 1 file changed, 7 insertions(+), 7 deletions(-)
>>>>
>>>> I don't really understand what this is supposed to do. The commit
>>>> message doesn't make a very good job of explaining it either.
>>>>
>>>> Can you describe in more detail what problem this fixes and why it
>>>> should be merged?
>>>
>>> thank you for review.
>>>
>>> As it is shown by the code this particular change rejects fallback to
>>> legacy PWM device request (which itself in turn is fixed in the next
>>> commit) for boards with supplied DTS, "pwm-backlight" compatible node
>>> and unregistered corresponding PWM device in that node.
>>>
>>> I don't know if there is a good enough reason to register PWM backlight
>>> device connected to some quite arbitrary PWM device, if no PWM device
>>> information is given in the "pwm-backlight" compatible node, so I think
>>> it makes sense to change the default policy.
>>>
>>
>> also please note that
>> Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
>> quite fairly describes "pwms" as a required property, but right now this
>> statement from the documentation is wrong, it is possible to register
>> pwm-backlight device driver (using notorious pwm_request() legacy API)
>> connected to some unspecified pwm device.
>>
>> I don't think that the current registration policy is correct, that's
>> why I propose to fix the logic instead of making a documentation update.
>>
>
> have you had a chance to check the rationale of the change?
>
> If you accept it, should I make the commit message more verbose?
any updates? Do you have plans to merge the change?
--
With best wishes,
Vladimir
^ permalink raw reply
* linux-next: tidy up of trees
From: Stephen Rothwell @ 2015-01-21 4:10 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 4846 bytes --]
Hi all,
[affected tree contacts are bcc'd on this email]
I have decided to do a bit of a tidy up of the trees in linux-next and
my first pass is to remove any tree that has not been updated on over a
year (since next-20140120). The following 29 trees have been removed
today (of these, 13 have not been updated for more than 2 years). If
you want a tree restored, just drop me a line - it is easy to do.
Most if the trees are empty, but for the others I have included a
diffstat.
configfs
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next
cpupowerutils
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master
dwmw2
Git URL: git://git.infradead.org/users/dwmw2/random-2.6.git#master
embedded
Git URL: git://git.infradead.org/embedded-2.6.git#master
ep93xx
Git URL: git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next
arch/arm/mach-ep93xx/Kconfig | 1 +
arch/arm/mach-ep93xx/core.c | 110 ++++++++++++++++++++++++++-
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +-
3 files changed, 111 insertions(+), 3 deletions(-)
fbdev
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next
firmware
Git URL: git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
fsnotify
Git URL: git://git.infradead.org/users/eparis/notify.git#for-next
fw-nohz
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next
hwspinlock
Git URL: git://github.com/ohadbc/hwspinlock-next.git#linux-next
input-mt
Git URL: git://github.com/rydberg/linux.git#for-next
ixp4xx
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next
kconfig
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
logfs
Git URL: git://github.com/prasad-joshi/logfs_upstream.git#master
fs/logfs/dev_mtd.c | 2 +-
fs/logfs/super.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
lzo-update
Git URL: git://github.com/markus-oberhumer/linux.git#lzo-update
lib/lzo/lzo1x_decompress_safe.c | 4 ++++
lib/lzo/lzodefs.h | 6 ++++++
2 files changed, 10 insertions(+)
md-current
Git URL: git://neil.brown.name/md#for-linus
msm
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next
omfs
Git URL: git://github.com/bcopeland/omfs.git#for-next
openrisc
Git URL: git://openrisc.net/jonas/linux#for-upstream
oprofile
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
parisc
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next
pcmcia
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
signal
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next
sysctl
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master
uclinux
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next
uml
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#next
arch/um/include/asm/Kbuild | 1 +
arch/um/include/asm/processor-generic.h | 3 -
arch/um/include/shared/os.h | 2 -
arch/um/include/shared/skas/proc_mm.h | 44 ------
arch/um/include/shared/skas/skas.h | 3 -
arch/um/include/shared/skas_ptrace.h | 14 --
arch/um/kernel/ptrace.c | 32 ----
arch/um/kernel/reboot.c | 35 ++---
arch/um/kernel/skas/mmu.c | 68 +++------
arch/um/kernel/skas/process.c | 27 ----
arch/um/kernel/trap.c | 2 +-
arch/um/kernel/um_arch.c | 10 --
arch/um/os-Linux/process.c | 16 --
arch/um/os-Linux/skas/mem.c | 100 ++----------
arch/um/os-Linux/skas/process.c | 200 ++++++------------------
arch/um/os-Linux/start_up.c | 154 -------------------
arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 ---
arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 ---
arch/x86/um/ldt.c | 227 ++++++----------------------
arch/x86/um/shared/sysdep/faultinfo_32.h | 3 -
arch/x86/um/shared/sysdep/faultinfo_64.h | 3 -
arch/x86/um/shared/sysdep/skas_ptrace.h | 22 ---
22 files changed, 149 insertions(+), 861 deletions(-)
uprobes
Git URL: git://github.com/srikard/linux.git#for-next
viafb
Git URL: git://github.com/schandinat/linux-2.6.git#viafb-next
writeback
Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* [PATCH] video: treat signal like timeout as failure
From: Nicholas Mc Guire @ 2015-01-20 5:23 UTC (permalink / raw)
To: linux-arm-kernel
if(!wait_for_completion_interruptible_timeout(...))
only handles the timeout case - this patch adds handling the
signal case the same as timeout and cleans up.
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
---
Only the timeout case was being handled, return of 0 in
wait_for_completion_interruptible_timeout, the signal case (-ERESTARTSYS)
was treated just like the case of successful completion, which is most
likely not reasonable.
Note that exynos_mipi_dsi_wr_data/exynos_mipi_dsi_rd_data return values
are not checked at the call sites in s6e8ax0.c (cmd_read/cmd_write)!
This patch simply treats the signal case the same way as the timeout case,
by releasing locks and returning 0 - which might not be the right thing to
do - this needs a review by someone knowing the details of this driver.
Patch is against 3.19.0-rc5 -next-20150119
Patch was only compile-tested with exynos_defconfig
drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c b/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c
index 2358a2f..55a7a45 100644
--- a/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c
@@ -157,6 +157,7 @@ int exynos_mipi_dsi_wr_data(struct mipi_dsim_device *dsim, unsigned int data_id,
const unsigned char *data0, unsigned int data_size)
{
unsigned int check_rx_ack = 0;
+ long timeout;
if (dsim->state = DSIM_STATE_ULPS) {
dev_err(dsim->dev, "state is ULPS.\n");
@@ -244,9 +245,11 @@ int exynos_mipi_dsi_wr_data(struct mipi_dsim_device *dsim, unsigned int data_id,
exynos_mipi_dsi_wr_tx_header(dsim, data_id, data_size & 0xff,
(data_size & 0xff00) >> 8);
- if (!wait_for_completion_interruptible_timeout(&dsim_wr_comp,
- MIPI_FIFO_TIMEOUT)) {
- dev_warn(dsim->dev, "command write timeout.\n");
+ timeout = wait_for_completion_interruptible_timeout(
+ &dsim_wr_comp, MIPI_FIFO_TIMEOUT);
+ if (timeout <= 0) {
+ dev_warn(dsim->dev,
+ "command write timed-out/interrupted.\n");
mutex_unlock(&dsim->lock);
return -EAGAIN;
}
@@ -345,6 +348,7 @@ int exynos_mipi_dsi_rd_data(struct mipi_dsim_device *dsim, unsigned int data_id,
unsigned int rx_data, rcv_pkt, i;
u8 response = 0;
u16 rxsize;
+ long timeout;
if (dsim->state = DSIM_STATE_ULPS) {
dev_err(dsim->dev, "state is ULPS.\n");
@@ -380,9 +384,10 @@ int exynos_mipi_dsi_rd_data(struct mipi_dsim_device *dsim, unsigned int data_id,
return -EINVAL;
}
- if (!wait_for_completion_interruptible_timeout(&dsim_rd_comp,
- MIPI_FIFO_TIMEOUT)) {
- pr_err("RX done interrupt timeout\n");
+ timeout = wait_for_completion_interruptible_timeout(&dsim_rd_comp,
+ MIPI_FIFO_TIMEOUT);
+ if (timeout <= 0) {
+ pr_err("RX done interrupt timeout/interrupted\n");
mutex_unlock(&dsim->lock);
return 0;
}
--
1.7.10.4
^ permalink raw reply related
* [PATCH 9/9] video: Less function calls in w100fb_probe() after error detection
From: SF Markus Elfring @ 2015-01-19 18:49 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 17:56:11 +0100
The iounmap() function could be called in three cases by the w100fb_probe()
function during error handling even if the passed data structure element
contained still a null pointer.
* This implementation detail could be improved by adjustments for
jump labels.
* Let us also delete two unnecessary null pointer checks for the
variable "info".
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/w100fb.c | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/drivers/video/fbdev/w100fb.c b/drivers/video/fbdev/w100fb.c
index aeb53eb..67ddc57 100644
--- a/drivers/video/fbdev/w100fb.c
+++ b/drivers/video/fbdev/w100fb.c
@@ -645,12 +645,12 @@ int w100fb_probe(struct platform_device *pdev)
/* Remap the chip base address */
remapped_base = ioremap_nocache(mem->start+W100_CFG_BASE, W100_CFG_LEN);
if (remapped_base = NULL)
- goto out;
+ goto exit;
/* Map the register space */
remapped_regs = ioremap_nocache(mem->start+W100_REG_BASE, W100_REG_LEN);
if (remapped_regs = NULL)
- goto out;
+ goto io_unmap_base;
/* Identify the chip */
printk("Found ");
@@ -662,19 +662,19 @@ int w100fb_probe(struct platform_device *pdev)
default:
printk("Unknown imageon chip ID\n");
err = -ENODEV;
- goto out;
+ goto io_unmap_regs;
}
printk(" at 0x%08lx.\n", (unsigned long) mem->start+W100_CFG_BASE);
/* Remap the framebuffer */
remapped_fbuf = ioremap_nocache(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);
if (remapped_fbuf = NULL)
- goto out;
+ goto io_unmap_regs;
info=framebuffer_alloc(sizeof(struct w100fb_par), &pdev->dev);
if (!info) {
err = -ENOMEM;
- goto out;
+ goto io_unmap_framebuffer;
}
par = info->par;
@@ -690,13 +690,13 @@ int w100fb_probe(struct platform_device *pdev)
if (!par->pll_table) {
printk(KERN_ERR "No matching Xtal definition found\n");
err = -EINVAL;
- goto out;
+ goto release_framebuffer;
}
info->pseudo_palette = kmalloc(sizeof (u32) * MAX_PALETTES, GFP_KERNEL);
if (!info->pseudo_palette) {
err = -ENOMEM;
- goto out;
+ goto release_framebuffer;
}
info->fbops = &w100fb_ops;
@@ -716,7 +716,7 @@ int w100fb_probe(struct platform_device *pdev)
if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
err = -ENOMEM;
- goto out;
+ goto free_palette;
}
par->mode = &inf->modelist[0];
@@ -766,15 +766,18 @@ int w100fb_probe(struct platform_device *pdev)
fb_info(info, "%s frame buffer device\n", info->fix.id);
return 0;
out:
- if (info) {
- fb_dealloc_cmap(&info->cmap);
- kfree(info->pseudo_palette);
- }
+ fb_dealloc_cmap(&info->cmap);
+free_palette:
+ kfree(info->pseudo_palette);
+release_framebuffer:
+ framebuffer_release(info);
+io_unmap_framebuffer:
iounmap(remapped_fbuf);
+io_unmap_regs:
iounmap(remapped_regs);
+io_unmap_base:
iounmap(remapped_base);
- if (info)
- framebuffer_release(info);
+exit:
return err;
}
--
2.2.2
^ permalink raw reply related
* [PATCH 8/9] video: Less function calls in valkyriefb_init() after error detection
From: SF Markus Elfring @ 2015-01-19 18:46 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 17:01:25 +0100
The iounmap() function could be called in three cases by the valkyriefb_init()
function during error handling even if the passed data structure element
contained still a null pointer.
This implementation detail could be improved by adjustments for jump labels
(according also to current Linux coding style) and error messages.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/valkyriefb.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/drivers/video/fbdev/valkyriefb.c b/drivers/video/fbdev/valkyriefb.c
index 2a9213b..a81a0f1 100644
--- a/drivers/video/fbdev/valkyriefb.c
+++ b/drivers/video/fbdev/valkyriefb.c
@@ -369,40 +369,50 @@ int __init valkyriefb_init(void)
}
p->total_vram = 0x100000;
p->frame_buffer_phys = frame_buffer_phys;
+ err = -ENOMEM;
p->frame_buffer = __ioremap(frame_buffer_phys, p->total_vram, flags);
+ if (p->frame_buffer = NULL) {
+ pr_err("%s: %s failed\n", __func__, "Frame buffer mapping");
+ goto free_memory;
+ }
p->cmap_regs_phys = cmap_regs_phys;
p->cmap_regs = ioremap(p->cmap_regs_phys, 0x1000);
+ if (p->cmap_regs = NULL) {
+ pr_err("%s: %s failed\n", __func__, "cmap");
+ goto io_unmap_framebuffer;
+ }
p->valkyrie_regs_phys = cmap_regs_phys+0x6000;
p->valkyrie_regs = ioremap(p->valkyrie_regs_phys, 0x1000);
- err = -ENOMEM;
- if (p->frame_buffer = NULL || p->cmap_regs = NULL
- || p->valkyrie_regs = NULL) {
- printk(KERN_ERR "valkyriefb: couldn't map resources\n");
- goto out_free;
+ if (p->valkyrie_regs = NULL) {
+ pr_err("%s: %s failed\n", __func__, "ioremap");
+ goto io_unmap_cmap;
}
valkyrie_choose_mode(p);
mac_vmode_to_var(default_vmode, default_cmode, &p->info.var);
err = valkyrie_init_info(&p->info, p);
if (err < 0)
- goto out_free;
+ goto io_unmap_valkyrie;
valkyrie_init_fix(&p->info.fix, p);
if (valkyriefb_set_par(&p->info))
/* "can't happen" */
printk(KERN_ERR "valkyriefb: can't set default video mode\n");
if ((err = register_framebuffer(&p->info)) != 0)
- goto out_cmap_free;
+ goto dealloc_cmap;
fb_info(&p->info, "valkyrie frame buffer device\n");
return 0;
- out_cmap_free:
+dealloc_cmap:
fb_dealloc_cmap(&p->info.cmap);
- out_free:
- iounmap(p->frame_buffer);
- iounmap(p->cmap_regs);
+io_unmap_valkyrie:
iounmap(p->valkyrie_regs);
+io_unmap_cmap:
+ iounmap(p->cmap_regs);
+io_unmap_framebuffer:
+ iounmap(p->frame_buffer);
+free_memory:
kfree(p);
return err;
}
--
2.2.2
^ permalink raw reply related
* [PATCH 7/9] video: One function call less in tgafb_register() after, error detection
From: SF Markus Elfring @ 2015-01-19 18:43 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 15:30:45 +0100
The iounmap() function could be called in one case by the tgafb_register()
function during error handling even if the passed variable "mem_base"
contained still a null pointer.
This implementation detail could be improved by adjustments for jump labels
(according also to current Linux coding style).
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/tgafb.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
index b6fb7e8..a3cd0ef 100644
--- a/drivers/video/fbdev/tgafb.c
+++ b/drivers/video/fbdev/tgafb.c
@@ -1436,14 +1436,14 @@ static int tgafb_register(struct device *dev)
}
if (!request_mem_region (bar0_start, bar0_len, "tgafb")) {
printk(KERN_ERR "tgafb: cannot reserve FB region\n");
- goto err0;
+ goto release_framebuffer;
}
/* Map the framebuffer. */
mem_base = ioremap_nocache(bar0_start, bar0_len);
if (!mem_base) {
printk(KERN_ERR "tgafb: Cannot map MMIO\n");
- goto err1;
+ goto release_memory_region;
}
/* Grab info about the card. */
@@ -1484,13 +1484,13 @@ static int tgafb_register(struct device *dev)
if (ret = 0 || ret = 4) {
printk(KERN_ERR "tgafb: Could not find valid video mode\n");
ret = -EINVAL;
- goto err1;
+ goto io_unmap;
}
if (fb_alloc_cmap(&info->cmap, 256, 0)) {
printk(KERN_ERR "tgafb: Could not allocate color map\n");
ret = -ENOMEM;
- goto err1;
+ goto io_unmap;
}
tgafb_set_par(info);
@@ -1498,7 +1498,7 @@ static int tgafb_register(struct device *dev)
if (register_framebuffer(info) < 0) {
printk(KERN_ERR "tgafb: Could not register framebuffer\n");
ret = -EINVAL;
- goto err2;
+ goto dealloc_cmap;
}
if (tga_bus_pci) {
@@ -1517,12 +1517,13 @@ static int tgafb_register(struct device *dev)
return 0;
- err2:
+dealloc_cmap:
fb_dealloc_cmap(&info->cmap);
- err1:
+io_unmap:
iounmap(mem_base);
+release_memory_region:
release_mem_region(bar0_start, bar0_len);
- err0:
+release_framebuffer:
framebuffer_release(info);
return ret;
}
--
2.2.2
^ permalink raw reply related
* [PATCH 6/9] video: One function call less in pvr2fb_common_init() after error detection
From: SF Markus Elfring @ 2015-01-19 18:41 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 14:50:44 +0100
The iounmap() function could be called in two cases by the pvr2fb_common_init()
function during error handling even if the passed data structure element
contained still a null pointer.
This implementation detail could be improved by adjustments for jump labels.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/pvr2fb.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index 7aa4ef1..9fb8bbf 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -773,14 +773,14 @@ static int pvr2fb_common_init(void)
if (!fb_info->screen_base) {
printk(KERN_ERR "pvr2fb: Failed to remap smem space\n");
- goto out_err;
+ return -ENXIO;
}
par->mmio_base = (unsigned long)ioremap_nocache(pvr2_fix.mmio_start,
pvr2_fix.mmio_len);
if (!par->mmio_base) {
printk(KERN_ERR "pvr2fb: Failed to remap mmio space\n");
- goto out_err;
+ goto io_unmap_screen;
}
fb_memset(fb_info->screen_base, 0, pvr2_fix.smem_len);
@@ -807,7 +807,7 @@ static int pvr2fb_common_init(void)
fb_alloc_cmap(&fb_info->cmap, 256, 0);
if (register_framebuffer(fb_info) < 0)
- goto out_err;
+ goto io_unmap_mmio;
/*Must write PIXDEPTH to register before anything is displayed - so force init */
pvr2_init_display(fb_info);
@@ -840,10 +840,10 @@ static int pvr2fb_common_init(void)
return 0;
-out_err:
+io_unmap_mmio:
+ iounmap((void *)par->mmio_base);
+io_unmap_screen:
iounmap(fb_info->screen_base);
- if (par->mmio_base)
- iounmap((void *)par->mmio_base);
return -ENXIO;
}
--
2.2.2
^ permalink raw reply related
* [PATCH 5/9] video: Less function calls in trident_pci_probe() after error detection
From: SF Markus Elfring @ 2015-01-19 18:38 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 14:18:47 +0100
The functions "iounmap" and "kfree" could be called in a few cases by the
trident_pci_probe() function during error handling even if the passed data
structure element contained still a null pointer.
This implementation detail could be improved by adjustments for jump labels.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/tridentfb.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/tridentfb.c b/drivers/video/fbdev/tridentfb.c
index 71567401..86d4733 100644
--- a/drivers/video/fbdev/tridentfb.c
+++ b/drivers/video/fbdev/tridentfb.c
@@ -1436,7 +1436,7 @@ static int trident_pci_probe(struct pci_dev *dev,
if (!default_par->io_virt) {
debug("ioremap failed\n");
err = -1;
- goto out_unmap1;
+ goto release_memory_region_mmio;
}
enable_mmio(default_par);
@@ -1459,7 +1459,7 @@ static int trident_pci_probe(struct pci_dev *dev,
if (!info->screen_base) {
debug("ioremap failed\n");
err = -1;
- goto out_unmap2;
+ goto release_memory_region_smem;
}
default_par->flatpanel = is_flatpanel(default_par);
@@ -1485,7 +1485,7 @@ static int trident_pci_probe(struct pci_dev *dev,
info->pixmap.addr = kmalloc(4096, GFP_KERNEL);
if (!info->pixmap.addr) {
err = -ENOMEM;
- goto out_unmap2;
+ goto io_unmap_screenbase;
}
info->pixmap.size = 4096;
@@ -1531,11 +1531,14 @@ static int trident_pci_probe(struct pci_dev *dev,
out_unmap2:
kfree(info->pixmap.addr);
+io_unmap_screenbase:
iounmap(info->screen_base);
+release_memory_region_smem:
release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
disable_mmio(info->par);
out_unmap1:
iounmap(default_par->io_virt);
+release_memory_region_mmio:
release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
framebuffer_release(info);
return err;
--
2.2.2
^ permalink raw reply related
* [PATCH 4/9] video: Add check for return value of ioremap() in cirrusfb_pci_register()
From: SF Markus Elfring @ 2015-01-19 18:34 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 13:18:50 +0100
The return value from a call of the ioremap() function was not checked
by the implementation of the cirrusfb_pci_register() function.
Let us complete the corresponding error detection and exception handling
at this source code place.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/cirrusfb.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c
index d8b3359..aa4050c 100644
--- a/drivers/video/fbdev/cirrusfb.c
+++ b/drivers/video/fbdev/cirrusfb.c
@@ -2111,6 +2111,10 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
/* FIXME: this forces VGA. alternatives? */
cinfo->regbase = NULL;
cinfo->laguna_mmio = ioremap(info->fix.mmio_start, 0x1000);
+ if (!cinfo->laguna_mmio) {
+ ret = -EIO;
+ goto err_release_fb;
+ }
dev_dbg(info->device, "Board address: 0x%lx, register address: 0x%lx\n",
board_addr, info->fix.mmio_start);
@@ -2122,7 +2126,7 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
if (ret < 0) {
dev_err(info->device, "cannot reserve region 0x%lx, abort\n",
board_addr);
- goto err_release_fb;
+ goto io_unmap_laguna;
}
#if 0 /* if the system didn't claim this region, we would... */
if (!request_mem_region(0xA0000, 65535, "cirrusfb")) {
@@ -2163,8 +2167,9 @@ err_release_legacy:
err_release_regions:
#endif
pci_release_regions(pdev);
-err_release_fb:
+io_unmap_laguna:
iounmap(cinfo->laguna_mmio);
+err_release_fb:
framebuffer_release(info);
err_out:
return ret;
--
2.2.2
^ permalink raw reply related
* [PATCH 3/9] video: One function call less in vesafb_probe() after, error detection
From: SF Markus Elfring @ 2015-01-19 18:30 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 11:30:33 +0100
The iounmap() function could be called in two cases by the vesafb_probe()
function during error handling even if the passed data structure element
contained still a null pointer.
This implementation detail could be improved by adjustments for jump labels.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/vesafb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
index 693d18e..de7cad0 100644
--- a/drivers/video/fbdev/vesafb.c
+++ b/drivers/video/fbdev/vesafb.c
@@ -303,7 +303,7 @@ static int vesafb_probe(struct platform_device *dev)
info->apertures = alloc_apertures(1);
if (!info->apertures) {
err = -ENOMEM;
- goto err;
+ goto release_framebuffer;
}
info->apertures->ranges[0].base = screen_info.lfb_base;
info->apertures->ranges[0].size = size_total;
@@ -462,7 +462,7 @@ static int vesafb_probe(struct platform_device *dev)
"vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
vesafb_fix.smem_len, vesafb_fix.smem_start);
err = -EIO;
- goto err;
+ goto release_framebuffer;
}
printk(KERN_INFO "vesafb: framebuffer at 0x%lx, mapped to 0x%p, "
@@ -492,6 +492,7 @@ static int vesafb_probe(struct platform_device *dev)
return 0;
err:
iounmap(info->screen_base);
+release_framebuffer:
framebuffer_release(info);
release_mem_region(vesafb_fix.smem_start, size_total);
return err;
--
2.2.2
^ permalink raw reply related
* video: One function call less in tdfxfb_probe() after error detection
From: SF Markus Elfring @ 2015-01-19 18:25 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 18 Jan 2015 23:30:41 +0100
The iounmap() function could be called in two cases by the tdfxfb_probe()
function during error handling even if the passed data structure element
contained still a null pointer.
This implementation detail could be improved by adjustments for jump labels.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/tdfxfb.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/video/fbdev/tdfxfb.c b/drivers/video/fbdev/tdfxfb.c
index 69d4062..c280a3b 100644
--- a/drivers/video/fbdev/tdfxfb.c
+++ b/drivers/video/fbdev/tdfxfb.c
@@ -1438,20 +1438,20 @@ static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!default_par->regbase_virt) {
printk(KERN_ERR "fb: Can't remap %s register area.\n",
info->fix.id);
- goto out_err_regbase;
+ goto release_memory_region_regbase;
}
info->fix.smem_start = pci_resource_start(pdev, 1);
info->fix.smem_len = do_lfb_size(default_par, pdev->device);
if (!info->fix.smem_len) {
printk(KERN_ERR "fb: Can't count %s memory.\n", info->fix.id);
- goto out_err_regbase;
+ goto io_unmap_regbase;
}
if (!request_mem_region(info->fix.smem_start,
pci_resource_len(pdev, 1), "tdfx smem")) {
printk(KERN_ERR "tdfxfb: Can't reserve smem\n");
- goto out_err_regbase;
+ goto io_unmap_regbase;
}
info->screen_base = ioremap_nocache(info->fix.smem_start,
@@ -1459,7 +1459,7 @@ static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!info->screen_base) {
printk(KERN_ERR "fb: Can't remap %s framebuffer.\n",
info->fix.id);
- goto out_err_screenbase;
+ goto release_memory_region_screenbase;
}
default_par->iobase = pci_resource_start(pdev, 2);
@@ -1467,7 +1467,7 @@ static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!request_region(pci_resource_start(pdev, 2),
pci_resource_len(pdev, 2), "tdfx iobase")) {
printk(KERN_ERR "tdfxfb: Can't reserve iobase\n");
- goto out_err_screenbase;
+ goto io_unmap_screenbase;
}
printk(KERN_INFO "fb: %s memory = %dK\n", info->fix.id,
@@ -1571,14 +1571,16 @@ out_err_iobase:
info->fix.smem_len);
release_region(pci_resource_start(pdev, 2),
pci_resource_len(pdev, 2));
-out_err_screenbase:
+io_unmap_screenbase:
iounmap(info->screen_base);
+release_memory_region_screenbase:
release_mem_region(info->fix.smem_start, pci_resource_len(pdev, 1));
-out_err_regbase:
+io_unmap_regbase:
/*
* Cleanup after anything that was remapped/allocated.
*/
iounmap(default_par->regbase_virt);
+release_memory_region_regbase:
release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
out_err:
framebuffer_release(info);
--
2.2.2
^ permalink raw reply related
* [PATCH 1/9] video: Deletion of checks before the function call "iounmap"
From: SF Markus Elfring @ 2015-01-19 18:00 UTC (permalink / raw)
To: Antonino Daplas, Ferenc Bakonyi, Hans de Goede, Helge Deller,
James E. J. Bottomley, Jean-Christophe Plagniol-Villard,
Kristoffer Ericson, Peter Jones, Tomi Valkeinen, linux-fbdev,
linux-nvidia, linux-parisc
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <54BD44F0.3040705@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 18 Jan 2015 22:45:39 +0100
The iounmap() function performs also input parameter validation.
Thus the test around the call is not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/video/fbdev/aty/atyfb_base.c | 15 +++++----------
drivers/video/fbdev/cirrusfb.c | 3 +--
drivers/video/fbdev/controlfb.c | 6 ++----
drivers/video/fbdev/efifb.c | 3 +--
drivers/video/fbdev/hgafb.c | 3 +--
drivers/video/fbdev/hpfb.c | 3 +--
drivers/video/fbdev/i810/i810_main.c | 6 ++----
drivers/video/fbdev/macfb.c | 15 +++++----------
drivers/video/fbdev/offb.c | 3 +--
drivers/video/fbdev/pvr2fb.c | 3 +--
drivers/video/fbdev/s1d13xxxfb.c | 3 +--
drivers/video/fbdev/s3fb.c | 6 ++----
drivers/video/fbdev/sh_mobile_hdmi.c | 6 ++----
drivers/video/fbdev/sh_mobile_lcdcfb.c | 3 +--
drivers/video/fbdev/simplefb.c | 3 +--
drivers/video/fbdev/stifb.c | 3 +--
drivers/video/fbdev/tdfxfb.c | 6 ++----
drivers/video/fbdev/tgafb.c | 3 +--
drivers/video/fbdev/tridentfb.c | 6 ++----
drivers/video/fbdev/valkyriefb.c | 9 +++------
drivers/video/fbdev/vesafb.c | 6 ++----
drivers/video/fbdev/w100fb.c | 9 +++------
22 files changed, 41 insertions(+), 82 deletions(-)
diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 37ec09b..0f4b147 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -3605,10 +3605,8 @@ err_release_io:
#ifdef __sparc__
kfree(par->mmap_map);
#else
- if (par->ati_regbase)
- iounmap(par->ati_regbase);
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(par->ati_regbase);
+ iounmap(info->screen_base);
#endif
err_release_mem:
if (par->aux_start)
@@ -3733,13 +3731,10 @@ static void atyfb_remove(struct fb_info *info)
}
#endif
#ifndef __sparc__
- if (par->ati_regbase)
- iounmap(par->ati_regbase);
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(par->ati_regbase);
+ iounmap(info->screen_base);
#ifdef __BIG_ENDIAN
- if (info->sprite.addr)
- iounmap(info->sprite.addr);
+ iounmap(info->sprite.addr);
#endif
#endif
#ifdef __sparc__
diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c
index d992aa5..d8b3359 100644
--- a/drivers/video/fbdev/cirrusfb.c
+++ b/drivers/video/fbdev/cirrusfb.c
@@ -2164,8 +2164,7 @@ err_release_regions:
#endif
pci_release_regions(pdev);
err_release_fb:
- if (cinfo->laguna_mmio != NULL)
- iounmap(cinfo->laguna_mmio);
+ iounmap(cinfo->laguna_mmio);
framebuffer_release(info);
err_out:
return ret;
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
index 080fdd2..d386fed 100644
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -1068,10 +1068,8 @@ static void control_cleanup(void)
if (!p)
return;
- if (p->cmap_regs)
- iounmap(p->cmap_regs);
- if (p->control_regs)
- iounmap(p->control_regs);
+ iounmap(p->cmap_regs);
+ iounmap(p->control_regs);
if (p->frame_buffer) {
if (p->control_use_bank2)
p->frame_buffer -= 0x600000;
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 4bfff34..a6d08f0 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -65,8 +65,7 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
static void efifb_destroy(struct fb_info *info)
{
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
if (request_mem_succeeded)
release_mem_region(info->apertures->ranges[0].base,
info->apertures->ranges[0].size);
diff --git a/drivers/video/fbdev/hgafb.c b/drivers/video/fbdev/hgafb.c
index 5ff9fe2..76b231e 100644
--- a/drivers/video/fbdev/hgafb.c
+++ b/drivers/video/fbdev/hgafb.c
@@ -552,8 +552,7 @@ static int hgafb_probe(struct platform_device *pdev)
if (! hga_card_detect()) {
printk(KERN_INFO "hgafb: HGA card not detected.\n");
- if (hga_vram)
- iounmap(hga_vram);
+ iounmap(hga_vram);
return -EINVAL;
}
diff --git a/drivers/video/fbdev/hpfb.c b/drivers/video/fbdev/hpfb.c
index a1b7e5f..9b47102 100644
--- a/drivers/video/fbdev/hpfb.c
+++ b/drivers/video/fbdev/hpfb.c
@@ -355,8 +355,7 @@ static void hpfb_remove_one(struct dio_dev *d)
iounmap((void *)fb_regs);
release_mem_region(d->resource.start, resource_size(&d->resource));
fb_dealloc_cmap(&fb_info.cmap);
- if (fb_info.screen_base)
- iounmap(fb_info.screen_base);
+ iounmap(fb_info.screen_base);
}
static struct dio_device_id hpfb_dio_tbl[] = {
diff --git a/drivers/video/fbdev/i810/i810_main.c b/drivers/video/fbdev/i810/i810_main.c
index bb674e4..ce3a585 100644
--- a/drivers/video/fbdev/i810/i810_main.c
+++ b/drivers/video/fbdev/i810/i810_main.c
@@ -2105,10 +2105,8 @@ static void i810fb_release_resource(struct fb_info *info,
if (par->i810_gtt.i810_fb_memory)
agp_free_memory(gtt->i810_fb_memory);
- if (par->mmio_start_virtual)
- iounmap(par->mmio_start_virtual);
- if (par->aperture.virtual)
- iounmap(par->aperture.virtual);
+ iounmap(par->mmio_start_virtual);
+ iounmap(par->aperture.virtual);
kfree(par->edid);
if (par->res_flags & FRAMEBUFFER_REQ)
release_mem_region(par->aperture.physical,
diff --git a/drivers/video/fbdev/macfb.c b/drivers/video/fbdev/macfb.c
index cda7587..dde0520 100644
--- a/drivers/video/fbdev/macfb.c
+++ b/drivers/video/fbdev/macfb.c
@@ -541,16 +541,11 @@ static void __init macfb_setup(char *options)
static void __init iounmap_macfb(void)
{
- if (dafb_cmap_regs)
- iounmap(dafb_cmap_regs);
- if (v8_brazil_cmap_regs)
- iounmap(v8_brazil_cmap_regs);
- if (rbv_cmap_regs)
- iounmap(rbv_cmap_regs);
- if (civic_cmap_regs)
- iounmap(civic_cmap_regs);
- if (csc_cmap_regs)
- iounmap(csc_cmap_regs);
+ iounmap(dafb_cmap_regs);
+ iounmap(v8_brazil_cmap_regs);
+ iounmap(rbv_cmap_regs);
+ iounmap(civic_cmap_regs);
+ iounmap(csc_cmap_regs);
}
static int __init macfb_init(void)
diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
index 43a0a52..5efce99 100644
--- a/drivers/video/fbdev/offb.c
+++ b/drivers/video/fbdev/offb.c
@@ -281,8 +281,7 @@ static int offb_set_par(struct fb_info *info)
static void offb_destroy(struct fb_info *info)
{
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
framebuffer_release(info);
}
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index 7c74f58..7aa4ef1 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -841,8 +841,7 @@ static int pvr2fb_common_init(void)
return 0;
out_err:
- if (fb_info->screen_base)
- iounmap(fb_info->screen_base);
+ iounmap(fb_info->screen_base);
if (par->mmio_base)
iounmap((void *)par->mmio_base);
diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
index 83433cb..dff38b7 100644
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c
@@ -750,8 +750,7 @@ s1d13xxxfb_remove(struct platform_device *pdev)
fb_dealloc_cmap(&info->cmap);
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
framebuffer_release(info);
}
diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c
index f0ae61a..3d9d45f 100644
--- a/drivers/video/fbdev/s3fb.c
+++ b/drivers/video/fbdev/s3fb.c
@@ -1382,8 +1382,7 @@ err_find_mode:
#ifdef CONFIG_FB_S3_DDC
if (par->ddc_registered)
i2c_del_adapter(&par->ddc_adapter);
- if (par->mmio)
- iounmap(par->mmio);
+ iounmap(par->mmio);
#endif
pci_iounmap(dev, info->screen_base);
err_iomap:
@@ -1419,8 +1418,7 @@ static void s3_pci_remove(struct pci_dev *dev)
#ifdef CONFIG_FB_S3_DDC
if (par->ddc_registered)
i2c_del_adapter(&par->ddc_adapter);
- if (par->mmio)
- iounmap(par->mmio);
+ iounmap(par->mmio);
#endif
pci_iounmap(dev, info->screen_base);
diff --git a/drivers/video/fbdev/sh_mobile_hdmi.c b/drivers/video/fbdev/sh_mobile_hdmi.c
index 7c72a3f..2a7187d 100644
--- a/drivers/video/fbdev/sh_mobile_hdmi.c
+++ b/drivers/video/fbdev/sh_mobile_hdmi.c
@@ -1397,8 +1397,7 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
ecodec:
free_irq(irq, hdmi);
ereqirq:
- if (hdmi->htop1)
- iounmap(hdmi->htop1);
+ iounmap(hdmi->htop1);
emap_htop1:
pm_runtime_put(&pdev->dev);
pm_runtime_disable(&pdev->dev);
@@ -1428,8 +1427,7 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
clk_disable_unprepare(hdmi->hdmi_clk);
clk_put(hdmi->hdmi_clk);
- if (hdmi->htop1)
- iounmap(hdmi->htop1);
+ iounmap(hdmi->htop1);
iounmap(hdmi->base);
release_mem_region(res->start, resource_size(res));
diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
index d3013cd..4f9a25b 100644
--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
@@ -2489,8 +2489,7 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
clk_put(priv->dot_clk);
}
- if (priv->base)
- iounmap(priv->base);
+ iounmap(priv->base);
if (priv->irq)
free_irq(priv->irq, priv);
diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 92cac80..40e6b33 100644
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -72,8 +72,7 @@ static int simplefb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
static void simplefb_destroy(struct fb_info *info)
{
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
}
static struct fb_ops simplefb_ops = {
diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
index 86621fa..ea12305 100644
--- a/drivers/video/fbdev/stifb.c
+++ b/drivers/video/fbdev/stifb.c
@@ -1374,8 +1374,7 @@ stifb_cleanup(void)
unregister_framebuffer(sti->info);
release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
release_mem_region(info->fix.smem_start, info->fix.smem_len);
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
}
diff --git a/drivers/video/fbdev/tdfxfb.c b/drivers/video/fbdev/tdfxfb.c
index f761fe3..69d4062 100644
--- a/drivers/video/fbdev/tdfxfb.c
+++ b/drivers/video/fbdev/tdfxfb.c
@@ -1572,15 +1572,13 @@ out_err_iobase:
release_region(pci_resource_start(pdev, 2),
pci_resource_len(pdev, 2));
out_err_screenbase:
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
release_mem_region(info->fix.smem_start, pci_resource_len(pdev, 1));
out_err_regbase:
/*
* Cleanup after anything that was remapped/allocated.
*/
- if (default_par->regbase_virt)
- iounmap(default_par->regbase_virt);
+ iounmap(default_par->regbase_virt);
release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
out_err:
framebuffer_release(info);
diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
index 65ba992..b6fb7e8 100644
--- a/drivers/video/fbdev/tgafb.c
+++ b/drivers/video/fbdev/tgafb.c
@@ -1520,8 +1520,7 @@ static int tgafb_register(struct device *dev)
err2:
fb_dealloc_cmap(&info->cmap);
err1:
- if (mem_base)
- iounmap(mem_base);
+ iounmap(mem_base);
release_mem_region(bar0_start, bar0_len);
err0:
framebuffer_release(info);
diff --git a/drivers/video/fbdev/tridentfb.c b/drivers/video/fbdev/tridentfb.c
index 7ed9a22..71567401 100644
--- a/drivers/video/fbdev/tridentfb.c
+++ b/drivers/video/fbdev/tridentfb.c
@@ -1531,13 +1531,11 @@ static int trident_pci_probe(struct pci_dev *dev,
out_unmap2:
kfree(info->pixmap.addr);
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
disable_mmio(info->par);
out_unmap1:
- if (default_par->io_virt)
- iounmap(default_par->io_virt);
+ iounmap(default_par->io_virt);
release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
framebuffer_release(info);
return err;
diff --git a/drivers/video/fbdev/valkyriefb.c b/drivers/video/fbdev/valkyriefb.c
index 275fb98..2a9213b 100644
--- a/drivers/video/fbdev/valkyriefb.c
+++ b/drivers/video/fbdev/valkyriefb.c
@@ -400,12 +400,9 @@ int __init valkyriefb_init(void)
out_cmap_free:
fb_dealloc_cmap(&p->info.cmap);
out_free:
- if (p->frame_buffer)
- iounmap(p->frame_buffer);
- if (p->cmap_regs)
- iounmap(p->cmap_regs);
- if (p->valkyrie_regs)
- iounmap(p->valkyrie_regs);
+ iounmap(p->frame_buffer);
+ iounmap(p->cmap_regs);
+ iounmap(p->valkyrie_regs);
kfree(p);
return err;
}
diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
index d79a0ac..693d18e 100644
--- a/drivers/video/fbdev/vesafb.c
+++ b/drivers/video/fbdev/vesafb.c
@@ -176,8 +176,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
static void vesafb_destroy(struct fb_info *info)
{
fb_dealloc_cmap(&info->cmap);
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
}
@@ -492,8 +491,7 @@ static int vesafb_probe(struct platform_device *dev)
fb_info(info, "%s frame buffer device\n", info->fix.id);
return 0;
err:
- if (info->screen_base)
- iounmap(info->screen_base);
+ iounmap(info->screen_base);
framebuffer_release(info);
release_mem_region(vesafb_fix.smem_start, size_total);
return err;
diff --git a/drivers/video/fbdev/w100fb.c b/drivers/video/fbdev/w100fb.c
index 10951c8..aeb53eb 100644
--- a/drivers/video/fbdev/w100fb.c
+++ b/drivers/video/fbdev/w100fb.c
@@ -770,12 +770,9 @@ out:
fb_dealloc_cmap(&info->cmap);
kfree(info->pseudo_palette);
}
- if (remapped_fbuf != NULL)
- iounmap(remapped_fbuf);
- if (remapped_regs != NULL)
- iounmap(remapped_regs);
- if (remapped_base != NULL)
- iounmap(remapped_base);
+ iounmap(remapped_fbuf);
+ iounmap(remapped_regs);
+ iounmap(remapped_base);
if (info)
framebuffer_release(info);
return err;
--
2.2.2
^ permalink raw reply related
* [PATCH 0/9] video: fbdev: Deletion of some unnecessary checks
From: SF Markus Elfring @ 2015-01-19 17:54 UTC (permalink / raw)
To: Antonino Daplas, Ferenc Bakonyi, Hans de Goede, Helge Deller,
James E. J. Bottomley, Jean-Christophe Plagniol-Villard,
Kristoffer Ericson, Peter Jones, Tomi Valkeinen, linux-fbdev,
linux-nvidia, linux-parisc
Cc: LKML, kernel-janitors, Julia Lawall
In-Reply-To: <5317A59D.4@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 19 Jan 2015 17:57:25 +0100
Further update suggestions were taken into account after a patch was applied
from static source code analysis.
Markus Elfring (9):
fbdev: Deletion of checks before the function call "iounmap"
One function call less in tdfxfb_probe() after error detection
One function call less in vesafb_probe() after error detection
Add check for return value of ioremap() in cirrusfb_pci_register()
Less function calls in trident_pci_probe() after error detection
One function call less in pvr2fb_common_init() after error detection
One function call less in tgafb_register() after error detection
Less function calls in valkyriefb_init() after error detection
Less function calls in w100fb_probe() after error detection
drivers/video/fbdev/aty/atyfb_base.c | 15 +++++--------
drivers/video/fbdev/cirrusfb.c | 10 ++++++---
drivers/video/fbdev/controlfb.c | 6 ++---
drivers/video/fbdev/efifb.c | 3 +--
drivers/video/fbdev/hgafb.c | 3 +--
drivers/video/fbdev/hpfb.c | 3 +--
drivers/video/fbdev/i810/i810_main.c | 6 ++---
drivers/video/fbdev/macfb.c | 15 +++++--------
drivers/video/fbdev/offb.c | 3 +--
drivers/video/fbdev/pvr2fb.c | 15 ++++++-------
drivers/video/fbdev/s1d13xxxfb.c | 3 +--
drivers/video/fbdev/s3fb.c | 6 ++---
drivers/video/fbdev/sh_mobile_hdmi.c | 6 ++---
drivers/video/fbdev/sh_mobile_lcdcfb.c | 3 +--
drivers/video/fbdev/simplefb.c | 3 +--
drivers/video/fbdev/stifb.c | 3 +--
drivers/video/fbdev/tdfxfb.c | 22 +++++++++----------
drivers/video/fbdev/tgafb.c | 20 ++++++++---------
drivers/video/fbdev/tridentfb.c | 15 +++++++------
drivers/video/fbdev/valkyriefb.c | 37 ++++++++++++++++++-------------
drivers/video/fbdev/vesafb.c | 11 +++++-----
drivers/video/fbdev/w100fb.c | 40 +++++++++++++++++-----------------
22 files changed, 116 insertions(+), 132 deletions(-)
--
2.2.2
^ permalink raw reply
* Re: [PATCH] video: fbdev: Fix sparse warning messages
From: Tomi Valkeinen @ 2015-01-19 12:58 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1421455200-11231-1-git-send-email-davidu@nvidia.com>
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
On 17/01/15 02:40, David Ung wrote:
> Use NULL instead of 0 for the last entry of dmt_modes struct.
> Supresses "sparse: Using plain integer as NULL pointer" warning.
>
> Signed-off-by: David Ung <davidu@nvidia.com>
> ---
> drivers/video/fbdev/core/modedb.c | 74 +++++++++++++++++++--------------------
> 1 file changed, 37 insertions(+), 37 deletions(-)
Thanks, queued for 3.20.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* [PATCH v2 7/7] staging: sm7xxfb: fix alignment
From: Sudip Mukherjee @ 2015-01-19 8:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Sudip Mukherjee, Teddy Wang, linux-kernel, devel, linux-fbdev
In-Reply-To: <1421655067-7490-1-git-send-email-sudipm.mukherjee@gmail.com>
checkpatch cleanup: alignment should match open parenthesis
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/staging/sm7xxfb/sm7xxfb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 097747c..2ae9fd0 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -509,7 +509,7 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb)
(i + 0x30) != 0x6a &&
(i + 0x30) != 0x6b)
smtc_seqw(i + 0x30,
- VGAMode[j].Init_SR30_SR75[i]);
+ VGAMode[j].Init_SR30_SR75[i]);
/* init SEQ register SR80 - SR93 */
for (i = 0; i < SIZE_SR80_SR93; i++)
@@ -720,7 +720,7 @@ static void smtc_unmap_mmio(struct smtcfb_info *sfb)
*/
static int smtc_map_smem(struct smtcfb_info *sfb,
- struct pci_dev *pdev, u_long smem_len)
+ struct pci_dev *pdev, u_long smem_len)
{
sfb->fb.fix.smem_start = pci_resource_start(pdev, 0);
@@ -764,7 +764,7 @@ static inline void sm7xx_init_hw(void)
}
static int smtcfb_pci_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
struct smtcfb_info *sfb;
u_long smem_size = 0x00800000; /* default 8MB */
--
1.8.1.2
^ permalink raw reply related
* [PATCH v2 6/7] staging: sm7xxfb: remove unnecessary blank lines
From: Sudip Mukherjee @ 2015-01-19 8:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Sudip Mukherjee, Teddy Wang, linux-kernel, devel, linux-fbdev
In-Reply-To: <1421655067-7490-1-git-send-email-sudipm.mukherjee@gmail.com>
checkpatch cleanup: blank lines are not necessary before closing brace
and after opening brace.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
these are actually two different checkpatch warning, but am sending
them together as they are of similar type.
drivers/staging/sm7xxfb/sm7xxfb.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 6f0469a..097747c 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -298,7 +298,6 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green,
}
return 0;
-
}
#ifdef __BIG_ENDIAN
@@ -482,7 +481,6 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb)
VGAMode[j].mmSizeY = sfb->height &&
VGAMode[j].bpp = sfb->fb.var.bits_per_pixel &&
VGAMode[j].hz = sfb->hz) {
-
dev_dbg(&sfb->pdev->dev,
"VGAMode[j].mmSizeX=%d VGAMode[j].mmSizeY=%d VGAMode[j].bpp=%d VGAMode[j].hz=%d\n",
VGAMode[j].mmSizeX, VGAMode[j].mmSizeY,
@@ -571,7 +569,6 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb)
}
writel((u32) (((m_nScreenStride + 2) << 16) | m_nScreenStride),
sfb->vp_regs + 0x10);
-
}
static void smtc_set_timing(struct smtcfb_info *sfb)
@@ -725,7 +722,6 @@ static void smtc_unmap_mmio(struct smtcfb_info *sfb)
static int smtc_map_smem(struct smtcfb_info *sfb,
struct pci_dev *pdev, u_long smem_len)
{
-
sfb->fb.fix.smem_start = pci_resource_start(pdev, 0);
#ifdef __BIG_ENDIAN
--
1.8.1.2
^ permalink raw reply related
* [PATCH v2 5/7] staging: sm7xxfb: no space is necessary after a cast
From: Sudip Mukherjee @ 2015-01-19 8:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Sudip Mukherjee, Teddy Wang, linux-kernel, devel, linux-fbdev
In-Reply-To: <1421655067-7490-1-git-send-email-sudipm.mukherjee@gmail.com>
checkpatch cleanup: space is not necessary after cast
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/staging/sm7xxfb/sm7xxfb.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 6bce9f1..6f0469a 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -352,8 +352,8 @@ static ssize_t smtcfb_read(struct fb_info *info, char __user *buf, size_t
dst++;
}
if (c & 3) {
- u8 *dst8 = (u8 *) dst;
- u8 __iomem *src8 = (u8 __iomem *) src;
+ u8 *dst8 = (u8 *)dst;
+ u8 __iomem *src8 = (u8 __iomem *)src;
for (i = c & 3; i--;) {
if (i & 1) {
@@ -363,7 +363,7 @@ static ssize_t smtcfb_read(struct fb_info *info, char __user *buf, size_t
src8 += 2;
}
}
- src = (u32 __iomem *) src8;
+ src = (u32 __iomem *)src8;
}
if (copy_to_user(buf, buffer, c)) {
@@ -442,8 +442,8 @@ smtcfb_write(struct fb_info *info, const char __user *buf, size_t count,
src++;
}
if (c & 3) {
- u8 *src8 = (u8 *) src;
- u8 __iomem *dst8 = (u8 __iomem *) dst;
+ u8 *src8 = (u8 *)src;
+ u8 __iomem *dst8 = (u8 __iomem *)dst;
for (i = c & 3; i--;) {
if (i & 1) {
@@ -453,7 +453,7 @@ smtcfb_write(struct fb_info *info, const char __user *buf, size_t count,
dst8 += 2;
}
}
- dst = (u32 __iomem *) dst8;
+ dst = (u32 __iomem *)dst8;
}
*ppos += c;
--
1.8.1.2
^ permalink raw reply related
* [PATCH v2 4/7] staging: sm7xxfb: add missing blank line
From: Sudip Mukherjee @ 2015-01-19 8:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Sudip Mukherjee, Teddy Wang, linux-kernel, devel, linux-fbdev
In-Reply-To: <1421655067-7490-1-git-send-email-sudipm.mukherjee@gmail.com>
checkpatch cleanup to add missing blank line after declaration
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/staging/sm7xxfb/sm7xxfb.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index c550b71..6bce9f1 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -259,6 +259,7 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green,
if (regno < 16) {
if (sfb->fb.var.bits_per_pixel = 16) {
u32 *pal = sfb->fb.pseudo_palette;
+
val = chan_to_field(red, &sfb->fb.var.red);
val |= chan_to_field(green, &sfb->fb.var.green);
val |= chan_to_field(blue, &sfb->fb.var.blue);
@@ -273,6 +274,7 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green,
#endif
} else {
u32 *pal = sfb->fb.pseudo_palette;
+
val = chan_to_field(red, &sfb->fb.var.red);
val |= chan_to_field(green, &sfb->fb.var.green);
val |= chan_to_field(blue, &sfb->fb.var.blue);
--
1.8.1.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox