From patchwork Mon Oct 19 18:07:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 7438401 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 72AA4BEEA4 for ; Mon, 19 Oct 2015 16:27:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B2852206EF for ; Mon, 19 Oct 2015 16:27:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1ECD206B5 for ; Mon, 19 Oct 2015 16:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752610AbbJSQ1c (ORCPT ); Mon, 19 Oct 2015 12:27:32 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:38191 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751206AbbJSQ1b (ORCPT ); Mon, 19 Oct 2015 12:27:31 -0400 Received: by wicll6 with SMTP id ll6so13918203wic.1 for ; Mon, 19 Oct 2015 09:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=E/ccSexYLPmn+1WyZDiyHp+kcy0sefSmQHxPRxb2jK8=; b=0ZWCBn5dNqVf4Jrw9akyE4ejlFkQMzwmpdjgpjcjmHXSeFs83hF2A2d2PI0DH3cCLp iyWBeyne9yL/pKUVr01ocfxKiZvyfm6Ve+gawx9/sOPY5HGz+g0NLo54SKNAWQgTkgJa hwoDrSSKv69LHZu4/0vgkPnpYZazmU9mnCUBDoJgjmqWzuMdNE9jGDTYl+ICeec5YKVH 2MtEyDK0C9kaKmB8nxXzwPVbkR969MX5uVhSI4zP10NBHdYn/HQYPk9hYcXyXob75GsP sbYedBB96zF6GcgS4ArAc75XG4h8DUjhg1OHTj5iDsXGiFdun1PNyY5FYFLAefkfEaQD Lz5w== X-Received: by 10.180.88.164 with SMTP id bh4mr20877592wib.18.1445272050351; Mon, 19 Oct 2015 09:27:30 -0700 (PDT) Received: from orange.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id q1sm41120335wjy.31.2015.10.19.09.27.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 09:27:29 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: set device_type::release instead of device::release Date: Mon, 19 Oct 2015 20:07:26 +0200 Message-Id: <1445278046-58231-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No point in providing an empty device_type::release callback and then setting device::release for each rbd_dev dynamically. Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 4917de726bdb..fa6767e9ed2a 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3986,14 +3986,12 @@ static const struct attribute_group *rbd_attr_groups[] = { NULL }; -static void rbd_sysfs_dev_release(struct device *dev) -{ -} +static void rbd_dev_release(struct device *dev); static struct device_type rbd_device_type = { .name = "rbd", .groups = rbd_attr_groups, - .release = rbd_sysfs_dev_release, + .release = rbd_dev_release, }; static struct rbd_spec *rbd_spec_get(struct rbd_spec *spec) @@ -4074,7 +4072,6 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc, rbd_dev->dev.bus = &rbd_bus_type; rbd_dev->dev.type = &rbd_device_type; rbd_dev->dev.parent = &rbd_root_dev; - rbd_dev->dev.release = rbd_dev_release; device_initialize(&rbd_dev->dev); rbd_dev->rbd_client = rbdc;