2011-05-14 17:28:20

by Németh Márton

Subject: [PATCH] x86 pci acpi: fix type mismatch

From: Márton Németh <[email protected]>

The flags field of struct resource from linux/ioport.h is "unsigned long". Change
the "type" parameter of coalesce_windows() function to match that field. This fixes
the following warning messages when compiling with "make C=1 W=1 bzImage modules":

arch/x86/pci/acpi.c: In function ‘coalesce_windows’:
arch/x86/pci/acpi.c:198: warning: conversion to ‘long unsigned int’ from ‘int’ may change the sign of the result
arch/x86/pci/acpi.c:203: warning: conversion to ‘long unsigned int’ from ‘int’ may change the sign of the result

Signed-off-by: Márton Németh <[email protected]>
---
--- linux-2.6.39-rc6/arch/x86/pci/acpi.c.orig 2011-05-04 04:59:13.000000000 +0200
+++ linux-2.6.39-rc6/arch/x86/pci/acpi.c 2011-05-14 19:12:42.000000000 +0200
@@ -188,7 +188,7 @@ static bool resource_contains(struct res
return false;
}

-static void coalesce_windows(struct pci_root_info *info, int type)
+static void coalesce_windows(struct pci_root_info *info, unsigned long type)
{
int i, j;
struct resource *res1, *res2;

2011-06-01 18:51:39

by Jesse Barnes

Subject: Re: [PATCH] x86 pci acpi: fix type mismatch

On Sat, 14 May 2011 19:27:33 +0200
Németh Márton <[email protected]> wrote:

> From: Márton Németh <[email protected]>
>
> The flags field of struct resource from linux/ioport.h is "unsigned long". Change
> the "type" parameter of coalesce_windows() function to match that field. This fixes
> the following warning messages when compiling with "make C=1 W=1 bzImage modules":
>
> arch/x86/pci/acpi.c: In function ‘coalesce_windows’:
> arch/x86/pci/acpi.c:198: warning: conversion to ‘long unsigned int’ from ‘int’ may change the sign of the result
> arch/x86/pci/acpi.c:203: warning: conversion to ‘long unsigned int’ from ‘int’ may change the sign of the result
>
> Signed-off-by: Márton Németh <[email protected]>
> ---
> --- linux-2.6.39-rc6/arch/x86/pci/acpi.c.orig 2011-05-04 04:59:13.000000000 +0200
> +++ linux-2.6.39-rc6/arch/x86/pci/acpi.c 2011-05-14 19:12:42.000000000 +0200
> @@ -188,7 +188,7 @@ static bool resource_contains(struct res
> return false;
> }
>
> -static void coalesce_windows(struct pci_root_info *info, int type)
> +static void coalesce_windows(struct pci_root_info *info, unsigned long type)
> {
> int i, j;
> struct resource *res1, *res2;

Applied to my for-linus tree, thanks.

--
Jesse Barnes, Intel Open Source Technology Center