From patchwork Mon Jan 13 13:48:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 309845 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 920552C0086 for ; Tue, 14 Jan 2014 00:49:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751649AbaAMNtJ (ORCPT ); Mon, 13 Jan 2014 08:49:09 -0500 Received: from mga09.intel.com ([134.134.136.24]:9824 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476AbaAMNsx (ORCPT ); Mon, 13 Jan 2014 08:48:53 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 13 Jan 2014 05:44:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,653,1384329600"; d="scan'208";a="465833610" Received: from unknown (HELO rzhang1-mobl4.ccr.corp.intel.com) ([10.255.21.146]) by orsmga002.jf.intel.com with ESMTP; 13 Jan 2014 05:48:37 -0800 From: Zhang Rui To: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org Cc: rjw@rjwysocki.net, grant.likely@secretlab.ca, jarkko.nikula@linux.intel.com, mika.westerberg@linux.intel.com, Zhang Rui Subject: [PATCH 4/4] OF: introduce OF style 'modalias' support for platform bus. Date: Mon, 13 Jan 2014 21:48:36 +0800 Message-Id: <1389620916-3923-1-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Fix a problem that, the platform bus supports the OF style modalias in .uevent() call, but not in its device' "modalias" sysfs attribute. Signed-off-by: Zhang Rui --- drivers/base/platform.c | 4 ++++ drivers/of/device.c | 3 +++ include/linux/of_device.h | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 2f4aea2..bc78848 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -679,6 +679,10 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a, struct platform_device *pdev = to_platform_device(dev); int len; + len = of_device_get_modalias(dev, buf, PAGE_SIZE -1); + if (len != -ENODEV) + return len; + len = acpi_device_modalias(dev, buf, PAGE_SIZE -1); if (len != -ENODEV) return len; diff --git a/drivers/of/device.c b/drivers/of/device.c index f685e55..dafb973 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -85,6 +85,9 @@ ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len) int cplen, i; ssize_t tsize, csize, repend; + if ((!dev) || (!dev->of_node)) + return -ENODEV; + /* Name & Type */ csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name, dev->of_node->type); diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 82ce324..8d7dd67 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -64,6 +64,12 @@ static inline int of_driver_match_device(struct device *dev, static inline void of_device_uevent(struct device *dev, struct kobj_uevent_env *env) { } +static inline int of_device_get_modalias(struct device *dev, + char *str, ssize_t len) +{ + return -ENODEV; +} + static inline int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env) {