From patchwork Thu Jun 11 08:03:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Lambert X-Patchwork-Id: 6586361 X-Patchwork-Delegate: tiwai@suse.de Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F08DC9F2F4 for ; Thu, 11 Jun 2015 08:04:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DCD72060E for ; Thu, 11 Jun 2015 08:04:58 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id A1BF8205CA for ; Thu, 11 Jun 2015 08:04:56 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1A808264F23; Thu, 11 Jun 2015 10:04:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E5F092625FE; Thu, 11 Jun 2015 10:04:47 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id E8C442625FF; Thu, 11 Jun 2015 10:04:45 +0200 (CEST) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by alsa0.perex.cz (Postfix) with ESMTP id C0F41261B36 for ; Thu, 11 Jun 2015 10:04:38 +0200 (CEST) Received: by wibdq8 with SMTP id dq8so2107426wib.1 for ; Thu, 11 Jun 2015 01:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to; bh=jHZZrV63jPzVfc04RzAVWV+kfkFMCeXI82h8Fjzvq/k=; b=XU5+6vbw4e5amUiSR0D+0r6v29/GyRMeuXQSqA4oLIt5aiRpwGs2Zed3GSIZpApkQu mXXf6NEr0GrrdWZnHgzD0SPSFOFyhvuP7jXW99l7hAB4JLB4sa2QziiIEwlkqhIuu40e tkbo5PFvyvc2LwLWr5udX8Qn1hVnsnQuxu0aPDaHw/ilKxSvKthdk8MkWU8xHCRx9JTG sWSligbu6YHEFUEoFHb+iJntZn9CWYZIdQNhEqLYtIRjcr+xGJxJpu7K77NmU2wfeDz/ uVakfiJqfJpdM8Tkg+R2u8SgEsgPVMT25co8cptQuFknOwhaXOCIg8N/CmRuxBn+nWe2 CQIw== X-Received: by 10.194.200.228 with SMTP id jv4mr13812356wjc.157.1434009878478; Thu, 11 Jun 2015 01:04:38 -0700 (PDT) Received: from sloth.lip6.fr (hp-quentin.rsr.lip6.fr. [132.227.76.76]) by mx.google.com with ESMTPSA id o4sm11577717wib.5.2015.06.11.01.04.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Jun 2015 01:04:37 -0700 (PDT) From: Quentin Lambert To: Johannes Berg , Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org Date: Thu, 11 Jun 2015 10:03:38 +0200 Message-Id: <1434009818-16711-1-git-send-email-lambert.quentin@gmail.com> X-Mailer: git-send-email 2.3.2 In-Reply-To: <1432817307-28380-1-git-send-email-lambert.quentin@gmail.com> Cc: Quentin Lambert , kernel-janitors@vger.kernel.org Subject: [alsa-devel] [PATCH v2] ALSA: aoa: convert bus code to use dev_groups X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The dev_attrs field of struct bus_type is going away, use dev_groups instead. This converts the soundbus code to use the correct field. Given that all other usages of the macro define the struct attribute *xxx_attrs[] in the same file they assign the .dev_groups field, this patch merges sysfs.c into core.c. These modifications were made using Coccinelle. Signed-off-by: Quentin Lambert --- Changes since v1: - Fix the commit message to actually talk about soundbus rather than MDIO - This version attempt to fix a problem resulting from the macro ATTRIBUTE_GROUPS declaring the structure as static by merging sysfs.c into core.c. I understand that this may not be the prefered solution since Takashi suggested that adding a comment line to the previous version could be acceptable. sound/aoa/soundbus/Makefile | 2 - sound/aoa/soundbus/core.c | 44 +++++++++++++++++++++++++++++++++++++++++- sound/aoa/soundbus/soundbus.h | 2 - sound/aoa/soundbus/sysfs.c | 42 ---------------------------------------- 4 files changed, 44 insertions(+), 46 deletions(-) --- a/sound/aoa/soundbus/Makefile +++ b/sound/aoa/soundbus/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_SND_AOA_SOUNDBUS) += snd-aoa-soundbus.o -snd-aoa-soundbus-objs := core.o sysfs.o +snd-aoa-soundbus-objs := core.o obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += i2sbus/ --- a/sound/aoa/soundbus/core.c +++ b/sound/aoa/soundbus/core.c @@ -150,6 +150,48 @@ static int soundbus_device_resume(struct #endif /* CONFIG_PM */ +#define soundbus_config_of_attr(field, format_string) \ +static ssize_t \ +field##_show (struct device *dev, struct device_attribute *attr, \ + char *buf) \ +{ \ + struct soundbus_dev *mdev = to_soundbus_device (dev); \ + return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \ +} + +static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct soundbus_dev *sdev = to_soundbus_device(dev); + struct platform_device *of = &sdev->ofdev; + int length; + + if (*sdev->modalias) { + strlcpy(buf, sdev->modalias, sizeof(sdev->modalias) + 1); + strcat(buf, "\n"); + length = strlen(buf); + } else { + length = sprintf(buf, "of:N%sT%s\n", + of->dev.of_node->name, of->dev.of_node->type); + } + + return length; +} +static DEVICE_ATTR_RO(modalias); + +soundbus_config_of_attr (name, "%s\n"); +static DEVICE_ATTR_RO(name); +soundbus_config_of_attr (type, "%s\n"); +static DEVICE_ATTR_RO(type); + +struct attribute *soundbus_dev_attrs[] = { + &dev_attr_name.attr, + &dev_attr_type.attr, + &dev_attr_modalias.attr, + NULL, +}; +ATTRIBUTE_GROUPS(soundbus_dev); + static struct bus_type soundbus_bus_type = { .name = "aoa-soundbus", .probe = soundbus_probe, @@ -160,7 +202,7 @@ static struct bus_type soundbus_bus_type .suspend = soundbus_device_suspend, .resume = soundbus_device_resume, #endif - .dev_attrs = soundbus_dev_attrs, + .dev_groups = soundbus_dev_groups, }; int soundbus_add_one(struct soundbus_dev *dev) --- a/sound/aoa/soundbus/soundbus.h +++ b/sound/aoa/soundbus/soundbus.h @@ -199,6 +199,4 @@ struct soundbus_driver { extern int soundbus_register_driver(struct soundbus_driver *drv); extern void soundbus_unregister_driver(struct soundbus_driver *drv); -extern struct device_attribute soundbus_dev_attrs[]; - #endif /* __SOUNDBUS_H */ --- a/sound/aoa/soundbus/sysfs.c +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -/* FIX UP */ -#include "soundbus.h" - -#define soundbus_config_of_attr(field, format_string) \ -static ssize_t \ -field##_show (struct device *dev, struct device_attribute *attr, \ - char *buf) \ -{ \ - struct soundbus_dev *mdev = to_soundbus_device (dev); \ - return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \ -} - -static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, - char *buf) -{ - struct soundbus_dev *sdev = to_soundbus_device(dev); - struct platform_device *of = &sdev->ofdev; - int length; - - if (*sdev->modalias) { - strlcpy(buf, sdev->modalias, sizeof(sdev->modalias) + 1); - strcat(buf, "\n"); - length = strlen(buf); - } else { - length = sprintf(buf, "of:N%sT%s\n", - of->dev.of_node->name, of->dev.of_node->type); - } - - return length; -} - -soundbus_config_of_attr (name, "%s\n"); -soundbus_config_of_attr (type, "%s\n"); - -struct device_attribute soundbus_dev_attrs[] = { - __ATTR_RO(name), - __ATTR_RO(type), - __ATTR_RO(modalias), - __ATTR_NULL -};