[Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[WANG Cong]

Fix this warning:

drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe':
drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' discards qualifiers from pointer target type

(I don't know whether this fix hits the real problem.)

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>

---
 drivers/acpi/ec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.23-rc3-git3/drivers/acpi/ec.c
===================================================================
--- linux-2.6.23-rc3-git3.orig/drivers/acpi/ec.c
+++ linux-2.6.23-rc3-git3/drivers/acpi/ec.c
@@ -869,8 +869,8 @@ int __init acpi_ec_ecdt_probe(void)
 		boot_ec->handle = ACPI_ROOT_OBJECT;
 	} else {
 		printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
-		status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
-						boot_ec, NULL);
+		status = acpi_get_devices((char *)ec_device_ids[0].id,
+						ec_parse_device, boot_ec, NULL);
 		if (ACPI_FAILURE(status))
 			goto error;
 	}

Re: [Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Alexey Starikovskiy]

WANG Cong wrote:
> Fix this warning:
>
> drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe':
> drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' discards qualifiers from pointer target type
>
> (I don't know whether this fix hits the real problem.)
>   
It is safe to give acpi_get_devices() const string, as it should not
modify it in any condition.
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
>
>   
ACK

Thanks,
Alex
> ---
>  drivers/acpi/ec.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-2.6.23-rc3-git3/drivers/acpi/ec.c
> ===================================================================
> --- linux-2.6.23-rc3-git3.orig/drivers/acpi/ec.c
> +++ linux-2.6.23-rc3-git3/drivers/acpi/ec.c
> @@ -869,8 +869,8 @@ int __init acpi_ec_ecdt_probe(void)
>  		boot_ec->handle = ACPI_ROOT_OBJECT;
>  	} else {
>  		printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
> -		status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
> -						boot_ec, NULL);
> +		status = acpi_get_devices((char *)ec_device_ids[0].id,
> +						ec_parse_device, boot_ec, NULL);
>  		if (ACPI_FAILURE(status))
>  			goto error;
>  	}
>   

Re: [Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Al Viro]

On Tue, Aug 21, 2007 at 07:14:49PM +0400, Alexey Starikovskiy wrote:
> WANG Cong wrote:
> > Fix this warning:
> >
> > drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe':
> > drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' discards qualifiers from pointer target type
> >
> > (I don't know whether this fix hits the real problem.)
> >   
> It is safe to give acpi_get_devices() const string, as it should not
> modify it in any condition.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index ab65b2c..f39fbc6 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  ******************************************************************************/
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
 		 acpi_walk_callback user_function,
 		 void *context, void **return_value)
 {
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index b5cca5d..3d7ab9e 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
 		    void *context, void **return_value);
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
 		 acpi_walk_callback user_function,
 		 void *context, void **return_value);
 
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
index aeb4498..8848265 100644
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
 struct acpi_get_devices_info {
 	acpi_walk_callback user_function;
 	void *context;
-	char *hid;
+	const char *hid;
 };
 
 union acpi_aml_operands {

Re: [Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Alexey Starikovskiy]

Al Viro wrote:
> On Tue, Aug 21, 2007 at 07:14:49PM +0400, Alexey Starikovskiy wrote:
>   
>> WANG Cong wrote:
>>     
>>> Fix this warning:
>>>
>>> drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe':
>>> drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' discards qualifiers from pointer target type
>>>
>>> (I don't know whether this fix hits the real problem.)
>>>   
>>>       
>> It is safe to give acpi_get_devices() const string, as it should not
>> modify it in any condition.
>>     
>
>   
Yes, that is the proper solution with a single drawback:
it touches ACPICA dual-licensed code and would take ages to commit,
and Len would probably ask you to give permission to re-license it under
BSD.

Regards,
Alex.
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
> diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
> index ab65b2c..f39fbc6 100644
> --- a/drivers/acpi/namespace/nsxfeval.c
> +++ b/drivers/acpi/namespace/nsxfeval.c
> @@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
>   ******************************************************************************/
>  
>  acpi_status
> -acpi_get_devices(char *HID,
> +acpi_get_devices(const char *HID,
>  		 acpi_walk_callback user_function,
>  		 void *context, void **return_value)
>  {
> diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
> index b5cca5d..3d7ab9e 100644
> --- a/include/acpi/acpixf.h
> +++ b/include/acpi/acpixf.h
> @@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
>  		    void *context, void **return_value);
>  
>  acpi_status
> -acpi_get_devices(char *HID,
> +acpi_get_devices(const char *HID,
>  		 acpi_walk_callback user_function,
>  		 void *context, void **return_value);
>  
> diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
> index aeb4498..8848265 100644
> --- a/include/acpi/acstruct.h
> +++ b/include/acpi/acstruct.h
> @@ -146,7 +146,7 @@ struct acpi_init_walk_info {
>  struct acpi_get_devices_info {
>  	acpi_walk_callback user_function;
>  	void *context;
> -	char *hid;
> +	const char *hid;
>  };
>  
>  union acpi_aml_operands {
>   

Re: [Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Al Viro]

On Tue, Aug 21, 2007 at 07:22:51PM +0400, Alexey Starikovskiy wrote:
> Yes, that is the proper solution with a single drawback:
> it touches ACPICA dual-licensed code and would take ages to commit,
> and Len would probably ask you to give permission to re-license it under
> BSD.

The latter is certainly not a problem (assuming that it's non-trivial
enough to be copyrightable, in the first place).

Re: [Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Jarek Poplawski]

On Tue, Aug 21, 2007 at 04:18:20PM +0100, Al Viro wrote:
> On Tue, Aug 21, 2007 at 07:14:49PM +0400, Alexey Starikovskiy wrote:
> > WANG Cong wrote:
> > > Fix this warning:
> > >
> > > drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe':
> > > drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' discards qualifiers from pointer target type
> > >
> > > (I don't know whether this fix hits the real problem.)
> > >   
> > It is safe to give acpi_get_devices() const string, as it should not
> > modify it in any condition.
> 
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
> diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
> index ab65b2c..f39fbc6 100644
> --- a/drivers/acpi/namespace/nsxfeval.c
> +++ b/drivers/acpi/namespace/nsxfeval.c
> @@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
>   ******************************************************************************/
>  
>  acpi_status
> -acpi_get_devices(char *HID,
> +acpi_get_devices(const char *HID,
>  		 acpi_walk_callback user_function,
>  		 void *context, void **return_value)
>  {
> diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
> index b5cca5d..3d7ab9e 100644
> --- a/include/acpi/acpixf.h
> +++ b/include/acpi/acpixf.h
> @@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
>  		    void *context, void **return_value);
>  
>  acpi_status
> -acpi_get_devices(char *HID,
> +acpi_get_devices(const char *HID,
>  		 acpi_walk_callback user_function,
>  		 void *context, void **return_value);
>  
> diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
> index aeb4498..8848265 100644
> --- a/include/acpi/acstruct.h
> +++ b/include/acpi/acstruct.h
> @@ -146,7 +146,7 @@ struct acpi_init_walk_info {
>  struct acpi_get_devices_info {
>  	acpi_walk_callback user_function;
>  	void *context;
> -	char *hid;
> +	const char *hid;
>  };
>  
>  union acpi_aml_operands {
> 

So, it looks like this patch (or at least its -mm version) is working.

Now there is 'only' like this (there could be something new, because
I've forgotten to mention this yesterday's log was the second make,
after removing some small testing patch; here it's after make clean;
.config is the same; gcc 3.2.3):

sed: -e expression #1, char 154: Unknown option to 's'
kernel/power/pm.c:205: warning: `pm_register' is deprecated (declared at kernel/power/pm.c:64)
kernel/power/pm.c:205: warning: `pm_register' is deprecated (declared at kernel/power/pm.c:64)
kernel/power/pm.c:206: warning: `pm_send_all' is deprecated (declared at kernel/power/pm.c:180)
kernel/power/pm.c:206: warning: `pm_send_all' is deprecated (declared at kernel/power/pm.c:180)
drivers/pci/search.c: In function `pci_find_slot':
drivers/pci/search.c:99: warning: `pci_find_device' is deprecated (declared at include/linux/pci.h:480)
drivers/pci/search.c: At top level:
drivers/pci/search.c:437: warning: `pci_find_device' is deprecated (declared at drivers/pci/search.c:244)
drivers/pci/search.c:437: warning: `pci_find_device' is deprecated (declared at drivers/pci/search.c:244)
drivers/pci/search.c:438: warning: `pci_find_slot' is deprecated (declared at drivers/pci/search.c:96)
drivers/pci/search.c:438: warning: `pci_find_slot' is deprecated (declared at drivers/pci/search.c:96)
drivers/pci/msi.c:686: warning: weak declaration of `arch_msi_check_device' after first use results in unspecified behavior
drivers/pci/msi.c:698: warning: weak declaration of `arch_setup_msi_irqs' after first use results in unspecified behavior
drivers/pci/msi.c:718: warning: weak declaration of `arch_teardown_msi_irqs' after first use results in unspecified behavior
In file included from drivers/usb/host/ohci-hcd.c:859:
drivers/usb/host/ohci-pci.c: In function `ohci_pci_start':
drivers/usb/host/ohci-pci.c:202: warning: unused variable `pdev'
include/asm/processor.h: In function `native_get_debugreg':
include/asm/processor.h:524: warning: asm operand 0 probably doesn't match constraints
include/asm/processor.h: In function `native_set_debugreg':
include/asm/processor.h:551: warning: asm operand 0 probably doesn't match constraints
Root device is (8, 1)
Setup is 11036 bytes (padded to 11264 bytes).
System is 2428 kB

Cheers,
Jarek P.

PS: does somebody here remember these old good times:
real    56m19.454s
user    53m38.580s
sys     2m7.610s

RE: [Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Brown, Len]

>On Tue, Aug 21, 2007 at 07:22:51PM +0400, Alexey Starikovskiy wrote:
>> Yes, that is the proper solution with a single drawback:
>> it touches ACPICA dual-licensed code and would take ages to commit,
>> and Len would probably ask you to give permission to 
>re-license it under
>> BSD.
>
>The latter is certainly not a problem (assuming that it's non-trivial
>enough to be copyrightable, in the first place).

The dual license is at the top of the file.
I just need to know when you touch one of these dual-license files
that Intel has your permission to ship your change to folks we
send the same file to under the BSD-style non-GPL license.
eg. BSD, Solaris and HPUX uses this same ACPICA files -- though in a
different format.

I've actually never had anybody say no when I asked.
And I've had some people who play laywers on TV tell me
this is not strictly necessary, but other people who play laywers
on TV tell me it is best to ask, so I do.

thanks,
-Len

Re: [Git Patch] ACPI: Fix a warning of discarding qualifiers from pointer target type

[Al Viro]

On Wed, Aug 22, 2007 at 08:59:48PM -0400, Brown, Len wrote:
> The dual license is at the top of the file.
> I just need to know when you touch one of these dual-license files
> that Intel has your permission to ship your change to folks we
> send the same file to under the BSD-style non-GPL license.
> eg. BSD, Solaris and HPUX uses this same ACPICA files -- though in a
> different format.

You have it.