From patchwork Mon Nov 15 20:32:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Achatz X-Patchwork-Id: 326312 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAFKXhWf020998 for ; Mon, 15 Nov 2010 20:33:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758231Ab0KOUcv (ORCPT ); Mon, 15 Nov 2010 15:32:51 -0500 Received: from mail-in-03.arcor-online.net ([151.189.21.43]:54393 "EHLO mail-in-03.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758229Ab0KOUct (ORCPT ); Mon, 15 Nov 2010 15:32:49 -0500 Received: from mail-in-13-z2.arcor-online.net (mail-in-13-z2.arcor-online.net [151.189.8.30]) by mx.arcor.de (Postfix) with ESMTP id 0C6C2D83BA; Mon, 15 Nov 2010 21:32:48 +0100 (CET) Received: from mail-in-02.arcor-online.net (mail-in-02.arcor-online.net [151.189.21.42]) by mail-in-13-z2.arcor-online.net (Postfix) with ESMTP id F2A9CE1BEA; Mon, 15 Nov 2010 21:32:47 +0100 (CET) Received: from [192.168.0.7] (dslb-088-067-009-161.pools.arcor-ip.net [88.67.9.161]) (Authenticated sender: screamingfist@arcor.de) by mail-in-02.arcor-online.net (Postfix) with ESMTPSA id 5AAA830205; Mon, 15 Nov 2010 21:32:47 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-02.arcor-online.net 5AAA830205 Subject: [PATCH 1/3] HID: fixed typos from last commits regarding sysfs bin attr groups From: Stefan Achatz Reply-To: erazor_de@users.sourceforge.net To: Jiri Kosina , Greg Kroah-Hartman , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 15 Nov 2010 21:32:45 +0100 Message-ID: <1289853165.2188.45.camel@neuromancer> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 (2.30.3-1.fc13) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 15 Nov 2010 20:33:44 +0000 (UTC) diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index ccb5724..799dc80 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c @@ -695,7 +695,7 @@ exit_1: static void kone_remove_sysfs_attributes(struct usb_interface *intf) { - sysfs_remove_group(&intf->dev.kobj, &kone_bin_attribute_group); + sysfs_remove_bin_group(&intf->dev.kobj, &kone_bin_attribute_group); sysfs_remove_group(&intf->dev.kobj, &kone_attribute_group); } diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c index 841baed..7e60e9c 100644 --- a/fs/sysfs/group.c +++ b/fs/sysfs/group.c @@ -167,7 +167,7 @@ void sysfs_remove_bin_group(struct kobject * kobj, } EXPORT_SYMBOL_GPL(sysfs_remove_bin_group); -int internal_merge_group(struct kobject *kobj, +static int internal_merge_group(struct kobject *kobj, const struct attribute_group *grp, int type) { struct sysfs_dirent *dir_sd;