From patchwork Wed Dec 12 10:24:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 13499 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F02974C17AA for ; Wed, 12 Dec 2012 10:31:37 +0000 (UTC) Received: from mail-ie0-f172.google.com (mail-ie0-f172.google.com [209.85.223.172]) by fiordland.canonical.com (Postfix) with ESMTP id 6B99DA196A9 for ; Wed, 12 Dec 2012 10:31:37 +0000 (UTC) Received: by mail-ie0-f172.google.com with SMTP id c13so1446405ieb.3 for ; Wed, 12 Dec 2012 02:31:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=6Vy2AL3mNkPLa1XgTxBV7Y88X0bLDnYO+rtiSmOjHg8=; b=lzUPG+n2E7SJRE0v8jMFAjd9nN3wk072kOy+pMfG2wX/4yGdlZH1uERJ3ftDtz9dKl wEpK5rtxR6U53BC7VUs4/de8KFB86aZR9DKHKmhtqeSz97ye25/2I8cLUxQ+/78sIRCF fe/iEWX03uLnh74NGcWlWZWP1+DJT0pQTlpN69nd5h2lNZJuCfxevBOmAB+nzjiOlDly e7bNRsTxuih39+EEhK+KIFDZUB3t4XRQUylhmk5WDctKxoig+MDYXkDvYBGvnsrEolpz 3XmVE7RMfJqo9IpIs9rrNJeEK3isAQKKZdF54SSEt60Vl3y6O5kTNCqrzap6dSGEiBsa 7bNQ== Received: by 10.50.187.197 with SMTP id fu5mr12739683igc.70.1355308296783; Wed, 12 Dec 2012 02:31:36 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp190445igt; Wed, 12 Dec 2012 02:31:36 -0800 (PST) Received: by 10.68.115.75 with SMTP id jm11mr1457685pbb.28.1355308296195; Wed, 12 Dec 2012 02:31:36 -0800 (PST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id l2si28093488pav.329.2012.12.12.02.31.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 02:31:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pa0-f42.google.com with SMTP id rl6so452737pac.15 for ; Wed, 12 Dec 2012 02:31:35 -0800 (PST) Received: by 10.68.253.4 with SMTP id zw4mr1472055pbc.143.1355308295734; Wed, 12 Dec 2012 02:31:35 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id gu5sm15454802pbc.10.2012.12.12.02.31.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 02:31:34 -0800 (PST) From: Sachin Kamat To: linux-pm@vger.kernel.org Cc: rui.zhang@intel.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] thermal: exynos: Use of_match_ptr() macro Date: Wed, 12 Dec 2012 15:54:24 +0530 Message-Id: <1355307864-22194-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQk+Lx4kbc0rdGF/D+N+ndBh6zltUUlHtl32qeAS4nELTo44HPIGYzCSMqBUuI9jtSnkYRmF This eliminates having an #ifdef returning NULL for the case when OF is disabled. Signed-off-by: Sachin Kamat --- drivers/thermal/exynos_thermal.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c index 7772d16..3f6a54a 100644 --- a/drivers/thermal/exynos_thermal.c +++ b/drivers/thermal/exynos_thermal.c @@ -800,8 +800,6 @@ static const struct of_device_id exynos_tmu_match[] = { {}, }; MODULE_DEVICE_TABLE(of, exynos_tmu_match); -#else -#define exynos_tmu_match NULL #endif static struct platform_device_id exynos_tmu_driver_ids[] = { @@ -982,7 +980,7 @@ static struct platform_driver exynos_tmu_driver = { .name = "exynos-tmu", .owner = THIS_MODULE, .pm = EXYNOS_TMU_PM, - .of_match_table = exynos_tmu_match, + .of_match_table = of_match_ptr(exynos_tmu_match), }, .probe = exynos_tmu_probe, .remove = __devexit_p(exynos_tmu_remove),