From patchwork Wed Mar 20 12:14:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 2307411 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 9804140213 for ; Wed, 20 Mar 2013 12:15:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756604Ab3CTMPC (ORCPT ); Wed, 20 Mar 2013 08:15:02 -0400 Received: from mga11.intel.com ([192.55.52.93]:37080 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756226Ab3CTMPB (ORCPT ); Wed, 20 Mar 2013 08:15:01 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 20 Mar 2013 05:14:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,877,1355126400"; d="scan'208";a="309421583" Received: from smile.fi.intel.com (HELO smile) ([10.237.72.173]) by fmsmga002.fm.intel.com with ESMTP; 20 Mar 2013 05:14:52 -0700 Received: from andy by smile with local (Exim 4.80) (envelope-from ) id 1UIHua-0001M8-EZ; Wed, 20 Mar 2013 14:14:33 +0200 From: Andy Shevchenko To: linux-acpi@vger.kernel.org, "Rafael J. Wysocki" , Mika Westerberg Cc: Andy Shevchenko Subject: [PATCH 1/2] ACPI / LPSS: Make condition local to lpt_register_clock_device Date: Wed, 20 Mar 2013 14:14:29 +0200 Message-Id: <1363781670-28775-1-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 1.8.2.rc0.22.gb3600c3 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org It seems more logical to have the check of lpss_clk_dev variable in lpt_register_clock_device() because last one actually assignes the variable. Signed-off-by: Andy Shevchenko --- drivers/acpi/acpi_lpss.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index c87db0e..c695841 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -84,6 +84,9 @@ static struct platform_device *lpss_clk_dev; static inline void lpt_register_clock_device(void) { + if (lpss_clk_dev) + return; + lpss_clk_dev = platform_device_register_simple("clk-lpt", -1, NULL, 0); } @@ -92,8 +95,7 @@ static int register_device_clock(struct acpi_device *adev, { const struct lpss_device_desc *dev_desc = pdata->dev_desc; - if (!lpss_clk_dev) - lpt_register_clock_device(); + lpt_register_clock_device(); if (!dev_desc->clk_parent || !pdata->mmio_base || pdata->mmio_size < dev_desc->prv_offset + LPSS_CLK_SIZE)