From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A488C433F5 for ; Wed, 5 Oct 2022 05:06:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230158AbiJEFGH (ORCPT ); Wed, 5 Oct 2022 01:06:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229943AbiJEFFn (ORCPT ); Wed, 5 Oct 2022 01:05:43 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2044.outbound.protection.outlook.com [40.107.94.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A08B74DE6 for ; Tue, 4 Oct 2022 22:04:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CAP5d9ZCw3nkL55O2yQBbFGXC4nQ6ccSeuhSeTEgd7gRGswOmVcki6wy6qtCx09fUs+6SDz78bgb8wIEEioCKIeMZxGLomDUh+aNreGalE9Agm69BNr0uosDK76QkX06dEkqRr8jLPo8x0Gt6aPlsHw5vUsQf/eTTQL+NHVBz49WpcEBhyQw8bvA7zeD+VFjUn2VWh79XQiTyvjQjGjTY3jXWrzoHDOALAdDZZ0odDoUmny7cQzEff6ACwNxpDx24mtW87b2AyutNoW8+UseSpbPSv2idyXX2ilaxOzxNi0a+q/2fBjnkotLMiUCAPHjWXA7cbpC1S+PA3XfFSzUQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rhfj6A9/vtjkP/6TGk0NS4U+K7ntKmNBdm23oSRWgjY=; b=bPaB6JiH7pPAuejeJVVpDX/q/PYbgUwG4OCaZjK1JNDNVnH8Pkb8gosa1WNvx7lZG1+/WtLcm58pkn/Itrx5OUPj1hCcizahb4ImlNpGqxP8CJwFzc+ixfWC+SFtljjBNQYL3ABOGUOisgpRui1lskj2LZnLF+/QDMF/l0t8OVugPbag00z/2MfUfvftc8p3Cvig4xqxQqau4jqKENQJPL0NQkomyYU6J0g9bKJ6XL4lXyLtACfClKh+4UeL5P3IDkenL9FBp5mu4H+rCqfrqkKYkSSc4730YMqvqRH0Iw1obwZEn9TYMBbKuFbgW0iQtAwyU7p5zmRFf3VT3DdGZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=linux-m68k.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rhfj6A9/vtjkP/6TGk0NS4U+K7ntKmNBdm23oSRWgjY=; b=FPGXCq7z7AfCLOPolxaci3uTrq0yTBIuSsyn9eicS8CrDOk8lEQQiu8MesrOtHNpvNMUwvh57r/7c08jtKTCiHN/7kCNf4PglpybP23FOVZjb0yReduyMBbFk7l6OGaLMu6CZCtfnhlc5ug6MJPku1lPFs5Hh3n82AmZMuU8PSoHlibdZZLSpyXaq0C+ouSN0tHmmG8/w5mE9yAaTGzkQbxp1T8KwdboUsON+3DXRE+d9JDwpy1LX85SzRl6pVW43p9PbLBDK6+LwxLuXxXUe/gwPHDCtRnTN+afGxkyZuRH2idOlzGrKE+YLb0ky9X6o3Mu6kSOkDakrX0PvUL7NQ== Received: from MW2PR16CA0016.namprd16.prod.outlook.com (2603:10b6:907::29) by DS0PR12MB7702.namprd12.prod.outlook.com (2603:10b6:8:130::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Wed, 5 Oct 2022 05:04:05 +0000 Received: from CO1NAM11FT085.eop-nam11.prod.protection.outlook.com (2603:10b6:907:0:cafe::1b) by MW2PR16CA0016.outlook.office365.com (2603:10b6:907::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.24 via Frontend Transport; Wed, 5 Oct 2022 05:04:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT085.mail.protection.outlook.com (10.13.174.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10 via Frontend Transport; Wed, 5 Oct 2022 05:04:04 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Tue, 4 Oct 2022 22:03:49 -0700 Received: from dev.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Tue, 4 Oct 2022 22:03:47 -0700 From: Chaitanya Kulkarni To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH 16/18] swim3: use init disk helper Date: Tue, 4 Oct 2022 22:00:25 -0700 Message-ID: <20221005050027.39591-17-kch@nvidia.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20221005050027.39591-1-kch@nvidia.com> References: <20221005050027.39591-1-kch@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT085:EE_|DS0PR12MB7702:EE_ X-MS-Office365-Filtering-Correlation-Id: 97ad017d-57dc-424c-cd56-08daa68f0663 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZSmKvNAkH4UcI0t3D7dOAW8edzC3hayVgBXM3yLBJ3T/6mQlKibMmVUUlw1DHjGmDqZWLu0k2u0VPZsz4Xu26ffB477AVipmlMUkafiCiNbpgF8rmtEvwon2D/3PRbAK2M0/ZvfFMgaMmbXkJvCAylQRBQvsKCF//t06MAwepSokksYH22Sm1Zap6CjAgfP2k0bLsEFcoX+oDBluhZdpZTWf3UfgHhisI56qs8b/PQ0jhMDM+UaCCnCON6yFTB/YEXpYffGsdhvkSX7lkH2p8kIFFErrZXlFPPBgfMLYZkZbY5WF2HVabLwLh/EmIyslbdksEmb49QXmwleTrnh3Ng2dpp4noym0WnziLupNbY8zUqU7GpC+qppSsLSfmJKYKhIjq+zkXAPUg+0l0SpSO35b+RcqXFwnmOXCkEwLehiYeR6zr8dxlo2CCRSHrgSOFDbPqL+PLFF87YJN2PCgnzKM+jiHkT+ADD1yYRBq2LJD0fcLswg8ahTwuNYUudERHEQUrx9IltT2dghrnoGA3eJQ4ak/+fwTKVyOzkG44SjM+B84Q2cdYPQ8Q+OgRN0C9qZF3b9T1hXkChnzLCMiPe4LbGAtfWSQh0Hi0NcmLNtFp/OIkYCSYQsaQVfM+LbPvEETGs0KiHioNlJEUqTr+XFKADQE6fK/44C2PwAc+HEN3zWEFBsuycKEMMaUTYWE06dNJ01rmPAIqN7zA5dVRnMrcNO4igLZykfRZB59PrjpshGmJc7zttBC0dk2fwIFLOpz+jlxc2FVgA0w19OtivXE1cSRfeIJB1eqOikPhC0= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(346002)(396003)(376002)(451199015)(36840700001)(46966006)(40470700004)(82310400005)(36756003)(4326008)(8676002)(40480700001)(47076005)(426003)(36860700001)(82740400003)(336012)(2906002)(5660300002)(70586007)(8936002)(70206006)(54906003)(41300700001)(7416002)(110136005)(316002)(16526019)(1076003)(186003)(7636003)(356005)(2616005)(26005)(83380400001)(478600001)(6666004)(40460700003)(7696005)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2022 05:04:04.2990 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97ad017d-57dc-424c-cd56-08daa68f0663 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT085.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7702 Precedence: bulk List-ID: X-Mailing-List: linux-m68k@vger.kernel.org Add and use the helper to initialize the common fields of struct gendisk such as major, first_minor, minors, disk_name, private_data, and ops. This initialization is spread all over the block drivers. This avoids code repetation of inialization code of gendisk in current block drivers and any future ones. Signed-off-by: Chaitanya Kulkarni --- drivers/block/swim3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index da811a7da03f..3c1b92b464d1 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -1221,15 +1221,11 @@ static int swim3_attach(struct macio_dev *mdev, if (rc) goto out_cleanup_disk; - disk->major = FLOPPY_MAJOR; - disk->first_minor = floppy_count; - disk->minors = 1; - disk->fops = &floppy_fops; - disk->private_data = fs; disk->events = DISK_EVENT_MEDIA_CHANGE; disk->flags |= GENHD_FL_REMOVABLE | GENHD_FL_NO_PART; sprintf(disk->disk_name, "fd%d", floppy_count); - set_capacity(disk, 2880); + init_disk(swd->unit[drive].disk, FLOPPY_MAJOR, floppy_count, 1, 2880, + &fs, &floopy_dops); rc = add_disk(disk); if (rc) goto out_cleanup_disk; -- 2.29.0