From patchwork Fri Sep 28 07:39:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 1517241 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id ED078DF283 for ; Fri, 28 Sep 2012 07:38:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754211Ab2I1Hih (ORCPT ); Fri, 28 Sep 2012 03:38:37 -0400 Received: from mga11.intel.com ([192.55.52.93]:23450 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753709Ab2I1Hig (ORCPT ); Fri, 28 Sep 2012 03:38:36 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 28 Sep 2012 00:38:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,499,1344236400"; d="scan'208,223";a="227634165" Received: from rui.sh.intel.com (HELO [10.239.36.18]) ([10.239.36.18]) by fmsmga001.fm.intel.com with ESMTP; 28 Sep 2012 00:38:34 -0700 Message-ID: <1348817955.10877.322.camel@rui.sh.intel.com> Subject: [RFC PATCH 2/6] Introduce ACPI style match in platform_match From: Zhang Rui To: LKML Cc: linux-pm , linux-i2c , "linux-acpi@vger.kernel.org" , "Len, Brown" , "Rafael J. Wysocki" , Grant Likely , Dirk Brandewie , "Zhang, Rui" Date: Fri, 28 Sep 2012 15:39:15 +0800 X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) Mime-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From 5d7ecd12c2994b8c5905d52718c2870c3b62746e Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Fri, 28 Sep 2012 14:51:03 +0800 Subject: [RFC PATCH 2/6] Introduce ACPI style match in platform_match Signed-off-by: Zhang Rui --- drivers/base/platform.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index a1a7225..90e64c6f 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "base.h" @@ -635,6 +636,13 @@ static const struct platform_device_id *platform_match_id( struct platform_device *pdev) { while (id->name[0]) { +#ifdef CONFIG_ACPI + /* attempt ACPI style match */ + if (acpi_match_device_id(&pdev->dev, id->name) == 0) { + pdev->id_entry = id; + return id; + } +#endif if (strcmp(pdev->name, id->name) == 0) { pdev->id_entry = id; return id;