From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: [patch 15/53] PNPACPI: pass pnp_dev instead of acpi_handle Date: Fri, 18 Apr 2008 14:50:10 -0600 Message-ID: <20080418205050.254067454@ldl.fc.hp.com> References: <20080418204955.342963315@ldl.fc.hp.com> Return-path: Content-Disposition: inline; filename=pnpacpi-use-pnp_dev Sender: linux-kernel-owner@vger.kernel.org To: Len Brown Cc: linux-acpi@vger.kernel.org, Rene Herman , linux-kernel@vger.kernel.org, Adam Belay , Li Shaohua , Matthieu Castet , Thomas Renninger , Rene Herman , Jaroslav Kysela , Andrew Morton List-Id: linux-acpi@vger.kernel.org Pass the pnp_dev pointer when possible instead of the acpi_handle. This allows better error messages and reduces the chance of error in the caller. Signed-off-by: Bjorn Helgaas Acked-By: Rene Herman Index: work7/drivers/pnp/pnpacpi/core.c =================================================================== --- work7.orig/drivers/pnp/pnpacpi/core.c 2008-03-21 15:35:05.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/core.c 2008-03-21 15:36:00.000000000 -0600 @@ -88,10 +88,10 @@ { acpi_handle handle = dev->data; struct acpi_buffer buffer; - int ret = 0; + int ret; acpi_status status; - ret = pnpacpi_build_resource_template(handle, &buffer); + ret = pnpacpi_build_resource_template(dev, &buffer); if (ret) return ret; ret = pnpacpi_encode_resources(res, &buffer); Index: work7/drivers/pnp/pnpacpi/pnpacpi.h =================================================================== --- work7.orig/drivers/pnp/pnpacpi/pnpacpi.h 2008-03-21 15:28:07.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/pnpacpi.h 2008-03-21 15:36:00.000000000 -0600 @@ -8,5 +8,5 @@ acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*); acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*); int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *); -int pnpacpi_build_resource_template(acpi_handle, struct acpi_buffer*); +int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *); #endif Index: work7/drivers/pnp/pnpacpi/rsparser.c =================================================================== --- work7.orig/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:35:59.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:36:00.000000000 -0600 @@ -775,9 +775,10 @@ return AE_OK; } -int pnpacpi_build_resource_template(acpi_handle handle, +int pnpacpi_build_resource_template(struct pnp_dev *dev, struct acpi_buffer *buffer) { + acpi_handle handle = dev->data; struct acpi_resource *resource; int res_cnt = 0; acpi_status status; -- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762163AbYDRU4f (ORCPT ); Fri, 18 Apr 2008 16:56:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760973AbYDRUwB (ORCPT ); Fri, 18 Apr 2008 16:52:01 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:31702 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759306AbYDRUvq (ORCPT ); Fri, 18 Apr 2008 16:51:46 -0400 Message-Id: <20080418205050.254067454@ldl.fc.hp.com> References: <20080418204955.342963315@ldl.fc.hp.com> User-Agent: quilt/0.46-1 Date: Fri, 18 Apr 2008 14:50:10 -0600 From: Bjorn Helgaas To: Len Brown Cc: linux-acpi@vger.kernel.org, Rene Herman Cc: linux-kernel@vger.kernel.org Cc: Adam Belay Cc: Li Shaohua Cc: Matthieu Castet Cc: Thomas Renninger Cc: Rene Herman Cc: Jaroslav Kysela Cc: Andrew Morton Subject: [patch 15/53] PNPACPI: pass pnp_dev instead of acpi_handle Content-Disposition: inline; filename=pnpacpi-use-pnp_dev Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Pass the pnp_dev pointer when possible instead of the acpi_handle. This allows better error messages and reduces the chance of error in the caller. Signed-off-by: Bjorn Helgaas Acked-By: Rene Herman Index: work7/drivers/pnp/pnpacpi/core.c =================================================================== --- work7.orig/drivers/pnp/pnpacpi/core.c 2008-03-21 15:35:05.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/core.c 2008-03-21 15:36:00.000000000 -0600 @@ -88,10 +88,10 @@ { acpi_handle handle = dev->data; struct acpi_buffer buffer; - int ret = 0; + int ret; acpi_status status; - ret = pnpacpi_build_resource_template(handle, &buffer); + ret = pnpacpi_build_resource_template(dev, &buffer); if (ret) return ret; ret = pnpacpi_encode_resources(res, &buffer); Index: work7/drivers/pnp/pnpacpi/pnpacpi.h =================================================================== --- work7.orig/drivers/pnp/pnpacpi/pnpacpi.h 2008-03-21 15:28:07.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/pnpacpi.h 2008-03-21 15:36:00.000000000 -0600 @@ -8,5 +8,5 @@ acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*); acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*); int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *); -int pnpacpi_build_resource_template(acpi_handle, struct acpi_buffer*); +int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *); #endif Index: work7/drivers/pnp/pnpacpi/rsparser.c =================================================================== --- work7.orig/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:35:59.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:36:00.000000000 -0600 @@ -775,9 +775,10 @@ return AE_OK; } -int pnpacpi_build_resource_template(acpi_handle handle, +int pnpacpi_build_resource_template(struct pnp_dev *dev, struct acpi_buffer *buffer) { + acpi_handle handle = dev->data; struct acpi_resource *resource; int res_cnt = 0; acpi_status status; --