From patchwork Sat Dec 21 07:50:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 304396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 742E72C00A4 for ; Sat, 21 Dec 2013 18:54:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751192Ab3LUHyK (ORCPT ); Sat, 21 Dec 2013 02:54:10 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:56853 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751067Ab3LUHyJ (ORCPT ); Sat, 21 Dec 2013 02:54:09 -0500 Received: by mail-pd0-f170.google.com with SMTP id g10so3456697pdj.1 for ; Fri, 20 Dec 2013 23:54:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ffgbMGgjzAtfo7iu1n97TEx+AvxQxGapwm+jiQEluEA=; b=LO2AhiLFKeTovdLcaRCflVadco5nAjUzluopZIi6D+vjJ7uqLVJaeTGoY2o1Kq61LS nNzrJY2Da+kD64bw1IrNiRtaZnLHM3qQMPb0WHGLQJC0daTub5NEkUeeUC1F7KrkTF2K dyBcyZeHHSg3vAlfFHv4pQJ296KDgWhHQgxbIlOWMQ5hLlBryVRdxwnKNSzEBBQYhxsU qqJPydcFVC71bjwjCLaySaOIotX9Ctx1ulav8cLO/ldnfN8WykZcJsWTkJyBAbFkSV5D 5niF6fNpJd20jG2q22DflEHlVistC1bKyjwHgYwWgas5n6LvUJidl+N3iQ2Uxm2sB+8d 7B5A== X-Gm-Message-State: ALoCoQnawZBTmIV1QDgbv4H+h7EJ6CNTdT3TLq37qDKSruYCB4Z6xQKdT74G0bK/PyB5sFRfLBEf X-Received: by 10.66.122.40 with SMTP id lp8mr13784112pab.82.1387612449194; Fri, 20 Dec 2013 23:54:09 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id vh3sm19355562pbc.8.2013.12.20.23.54.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Dec 2013 23:54:08 -0800 (PST) From: Sachin Kamat To: linux-pwm@vger.kernel.org Cc: thierry.reding@gmail.com, sachin.kamat@linaro.org Subject: [PATCH 1/1] pwm: pxa: Use of_match_ptr helper Date: Sat, 21 Dec 2013 13:20:50 +0530 Message-Id: <1387612250-7704-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Use the helper instead of defining NULL for CONFIG_OF disabled case. Signed-off-by: Sachin Kamat --- drivers/pwm/pwm-pxa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 3dc7c10bb7a0..5d25e4217542 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -140,13 +141,12 @@ static struct of_device_id pwm_of_match[] = { { } }; MODULE_DEVICE_TABLE(of, pwm_of_match); -#else -#define pwm_of_match NULL #endif static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev) { - const struct of_device_id *id = of_match_device(pwm_of_match, dev); + const struct of_device_id *id; + id = of_match_device(of_match_ptr(pwm_of_match), dev); return id ? id->data : NULL; } @@ -228,7 +228,7 @@ static struct platform_driver pwm_driver = { .driver = { .name = "pxa25x-pwm", .owner = THIS_MODULE, - .of_match_table = pwm_of_match, + .of_match_table = of_match_ptr(pwm_of_match), }, .probe = pwm_probe, .remove = pwm_remove,