From patchwork Sun Jan 15 13:17:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawei Li X-Patchwork-Id: 43849 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp737603wrn; Sun, 15 Jan 2023 05:26:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXtZuxzyldtACGo0cM8PEEc92iumXSOu8r2F/QCa1WoSXMyZ6PZtFxTSduCfxLYO6xyg0k2B X-Received: by 2002:a17:906:308c:b0:7c0:a6a9:64e9 with SMTP id 12-20020a170906308c00b007c0a6a964e9mr95118595ejv.36.1673789160724; Sun, 15 Jan 2023 05:26:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673789160; cv=pass; d=google.com; s=arc-20160816; b=s0EuUm+mB7RoA4mkC4GGrSz5bjhDKTueOEqzpS2/3r0Cfiw37ITlwpHVdNA9QKBGw1 ndYPZ6ucemNXYEe6Hwj2pmf4EpItKCR1GHnjajVlI+409qKU8vXyyU3kKIaiMTLyEZ8c EOlN3Zke3jQhxmK63jsry0G8KJShpwtVeKqWDemD5srLWBcKx5hiSi2IBbgcEp+sMd8R eEzWuRF6BO3EfTGXPZmO+ELsmKQieTZWQ6nTmzaj64XOWMmhwsBtXP6HuVGFr1gQ+gBs AJILQGPNhpt5bC51NL5K5QH1KeAqN8OHMyz++T9LwwXURzeN0A5dm4QKjMgWo5lzxiV4 LGRg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=yTGgcu9nbcsTzwM68ASnYaGrFz5GUfbBvv8qIlBZX58=; b=ykE00KFpyZzvKqKTdwsp2PM+XOoP4heCH6U3EGRaaBEivPTRIlBoWU2Gt9fPosOoPH q2+QdgA6ZWyeXXj12kJIuS3x3EgMd+uTY43nAe/sdT1UEYpuMS38Jauv4TE9xyHjfzou SxkZTiez5DCsV/aN6Wy9T2bKszDuOvazZZbMBaazR0VuZlrIh4DpiKTqChFXM2XSWxlV aQfiRq2hV4IoHPbreb1QdjDwAVgPy9uheF93dSJGRRHvMPv/t/p3L9Iix/0lK4eG5e8K 7ShgPI2U0iX0YpolqXvDgyeIXOhWU7RrVNlIIWBH+UhQ0H1j55dJk8JuDME4ithevx5B GxFA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@outlook.com header.s=selector1 header.b=n+vy36Is; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q14-20020a056402518e00b0049e07afe709si2755791edd.355.2023.01.15.05.25.36; Sun, 15 Jan 2023 05:26:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@outlook.com header.s=selector1 header.b=n+vy36Is; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231345AbjAONR5 (ORCPT + 99 others); Sun, 15 Jan 2023 08:17:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231229AbjAONRz (ORCPT ); Sun, 15 Jan 2023 08:17:55 -0500 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01olkn2012.outbound.protection.outlook.com [40.92.99.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDB9812599 for ; Sun, 15 Jan 2023 05:17:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lEln0j2HXMkwsRKCAIKaOoAqx/Oo1PWouIPzFkoaPTUyZmwXbPUL6iB70ZHS8k4IAcUcCzB6QLkZ6z4xEIQ8zoju97YF3xRVAu+9tq0O0sk8t9Ln3w0Y5pOpB5nYDPpZMHc0y1peM0/memREDhQxbawKrj4cTfGwkxigFRqdvRwvov5mLAPXmDrjlilBI4DwdCnUoEQ8R7RT7fkFiknpS6L5tERlFQeLa0/lQISE7dHe8Y44gFW0AaObZHQc1eTOVXLzwI1mGgVfMIM8aLh9cQ/Euy9JdYDeJHTtnu1QBKTYIDTumipF2cVTa85t0lxWay85QXbNnDL45J7XWBf54Q== 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=yTGgcu9nbcsTzwM68ASnYaGrFz5GUfbBvv8qIlBZX58=; b=m2NpFa0pBnPIgvvUbpOUjOeC2B1+nn03hyktGHJ0d/hZxC79+cNrYea/WCcD3S2RcuVczQEDNygPduLGzgm+E24RYqf6ugYFFPsUZgUSWTSz8urbHmfM5TFad4ZCuEtLNCNH7HWiQVErLIIkVtQWXkYf0+URxrkrAaon+L/Q7GRYZhCn9JRZFbVwLZAIdTqsc7BgIk90pR23OhICzSLRZb0uqYKQBDLr5DWgtLT7s0vDta1EP1jJKW9zy/3ppG5UpyDDzUVwiJhIFTbhoSj5gB5ktdkOQ98BCoWNvexxIXSJ3WonXfDPwK3DH60DlVyT7M90U5x689X+gopgXrbORA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yTGgcu9nbcsTzwM68ASnYaGrFz5GUfbBvv8qIlBZX58=; b=n+vy36Isi3Qew2njx6W2FDT2zwWDsH0fuWZMJnXvgTYfs9vnap+Mqn+p5FRJG8yqVnXrX/jzFhwEJqUle6VVNN8C2onhNsjQDrdR5RtZkHGo0QcoJVORHqkHh0tPBD2n3NSDLDFUzBaCIhxuHJp7kptZ6OrpeGtR5z56H6rmyXoUvea/YSSWQfMpeE9HSReWDHyXzGZ9faPE2Q/vLxLwLsx+T1vV0/3U768D1giULFSxGQokMC2aV/E8MA0F3YmslDu27471uAQSPSQJlzKHl21ag+HIlP4E2Q6XZJR+e7iF1SnD3OcLD8+rl1sstk549pe+WhlQqVzI0x+gk3ofzQ== Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) by TYYP286MB1905.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:fb::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Sun, 15 Jan 2023 13:17:51 +0000 Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605]) by TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605%4]) with mapi id 15.20.6002.012; Sun, 15 Jan 2023 13:17:51 +0000 From: Dawei Li To: mpe@ellerman.id.au, npiggin@gmail.com Cc: christophe.leroy@csgroup.eu, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Dawei Li Subject: [PATCH v2] powerpc: macio: Make remove callback of macio driver void returned Date: Sun, 15 Jan 2023 21:17:23 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 X-TMN: [bUJvojJuZa16BsTSJLyHJck8bEAjCx8VshO8+z72WPo=] X-ClientProxiedBy: TYBP286CA0041.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::29) To TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) X-Microsoft-Original-Message-ID: <20230115131723.739700-1-set_pte_at@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCP286MB2323:EE_|TYYP286MB1905:EE_ X-MS-Office365-Filtering-Correlation-Id: 64abd248-982f-4e53-de42-08daf6fae749 X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3qYJJ10Bi9Rl+nmsQ8Ed8Hr5tpuwao1W7pQNTSMrRuPrD+BF2W/62kp7kf74lFg5ZF+aVAiZdTs/b/U79cMwPtVM3fw6sMC8w5WWl7mAFIHiAN91M9WAy1bc91iajhGGlLs+yiPPkFaTNDc7PN5t51qnxqk3+b6g37QntwZnD7Y1tsWmOzxGy+NV1forns1O+Wi/bm58BB5dFSM3uPlc5P5u5dKX10sbJsUCywP1wiY51V2+w6uVA6iNgVok96NqJ7xzDLE4FcTgUaoyQnWPFfxmKaJ6IiyD1k33Yg3jVpzgJ/jVm0kGC6a+nbftpU/PmyPq0Eab1VcjmkK46p2pqnYVaWZMLdu7Wke+L2nN1U6IoGI8PHWmcNiba3i6SLb5imLS9yJFRLW+d2cSK2qk496rOMec3EDMnnz75JJgc7FnzlOCHIxGU1huczsVut2YPn9g079H82AFPcIHzGROL5OZEHuruJPbKNUwMGZQdLFkbm+Dq+RkMex9KJbiCIfnDtRLaa+Tzpab0RXZNhS/vJSsy1YY8tKbsEyAzCjRSlYMaUJSaUUQ14YEm1g+Xo3GD69WVvT2M/6u1kHHrjd2GurHBoOgIG1HFl7sW3yKRbE6s4cRpG2RAUo2S99fQyzkELc487NZ1iZJrihkpU0DaJTsvVXaW39UbNhpcdQPm1UVzNDdNnr4HYT+KgzdS0y6KTehkN9L5okkpZbktb3Jrvsfel1ja9UKOPDHeqVZCclDHlimRENcZj9nUmZrQ32zx+7D1nvA2ywJkpNF4WdsfXYCzEA9UBfTF7EipM9+RaypvGXff7HxLW1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mWI3mRuk7a99L6WoiEokXNy72FC0lfZHeTmleCs0ZNl/4dFcbsTr0T4lkAyV8Kxq52vWohz6L+mZA+ulj+Lp7T+8EO2dyGbbS6oXhvTjRehYKYyzMpzka16i2iRY/0vdXzY5NZCK0ivah7VWNQ9dRq1STc/+4jSRvE5I+yRDmAf6vgWz7gomdWzc8NjA8pLgSxqa008BR5wtFsqlHm41BId/SVnvBKZaq95TXQd1Z4A7jD551sFBCXP7GnTAImxTOm399VPOHtK3DvcY0f+4lmE6PZFUTsYmN8u+LKQt8hJLgpDIoW0JVUPdFUxG+WR2aUEJPOZekReVj/VgugnZX+HxuKBPssw7vaREobE8sNPnDHCJZoyEZVZupsT59h8aSzS+NGlcbL17kfpg5S9IBm+mU7lvWioFWs7lBI0QMgc5MWqFtgBdlStEAKJGpB0aFNJ+CE/lMEVT1/+/L5cWBmFYiknSg31bVGb4JvpJ/8+rmvTw9yzRSQKOVwlMbgWMbQlcsyst2W+3mD5ZEJbdXn9IQLgQZzox5p+JH7eNYtfiVOmP65fsJnPoIDbnj1KbonMeKjbzkODuTn/Syl6sryQLkgOii+xSCWY8xolGnMe12QsLBcM07vDZkbfYNiKgF833ODTBorqs+9Eshl6+Og== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uG8PZtE8TRpJZ9+OmD6wIge9j/OOge4riYajz9PMAo17kLur4LC06/oliYWTOMUs2V9j4vrKkaDeDEWv4SW52nydv4SiPopOkQ1U6qCzMzbcZkZ46ZFNviDkDkFPjAXqkJ/RlIpk/auzqpuXN3TA8NcYo2Lb5q/rniIclGuE8eRnAT317YYniE71Tc7buHoaBkywDov+6Rm1PDCgaaUK4mgc4IyyH6Ydtdb+2Y8v5UkZ9FsxdqR0XM0Fs8ybLaRjKvireLvcsofzr8DCAGmhcMODHcC7H6RSvNIopi4L9DsZJAfzf49Ry5p+jKKj0YVXJBa2b99FnIG3rRWedvJWG5rygVjZiW+Ypfxz4k4hYtJvmi2jztePkJeAhdGsJ0T9InktcHerdrCeEGveUn/pMD+/GiDTmd48JUTnb6knwby47yTFGNG6iPamHdqRSUQhMIbmXSrgg4jNCruRap4s81rSxLQDZ6TBftjhIw6Okr/BdD+AdCSMU71w8n4QJT1KHDyTxlQ3+pcfcOH8xr7z4rL+po/jEqlUCRaSUG/IPRXYvbrFsh9e89vI69CZIg7qac1sYeUtAn0UPJfx1KiETrgzM2BpXr2bmFIt8y3pnc1a7/3sxRhjdTzG7WIwS2ufWVkWp/EOl9fWTFseJ1d2EL13iWJGaYtboJg8GyjLAh2V7G3K3txd8u0AoidAFo9YvT+JSGs52xKWXiQxwbrsn/AYb9q+GwrFgsqgyAry3HV1KGWgbLZJeZy3mHFoipodfJ4GTt9td1vPyH2MK0+5hyMyRAqyVGrsqZo/JDwkozu8rL8mJhDxzdFNMcf/znKQI3xaOy1maz/+LTus3CugFYHXEcMqjHzJdYCHc3IH8cxm2fadoDhFbzV8KQS2+ASQik7jpKilCF647ew5pauqm3gbN8FP708EYyVKm19m5+xDI4TNX6ilvrxCkOzX+1kfzTiFHcgzupKkgiumpzk5s7g8bQxnCpQJoDs4uFAh43UAJd6xYdR1MimFnWmZdaDuQa42l1dQ6jtO3x3CZHQziWLKluQXxfoRCpVuoTSdtwR/Gjb/oWFfdivmL1QRqCa57di1u6L2EMhnqQwxKzPZ6sm/h+kMJ/4LUQsb7ctBmnPEvsn5qVOm7K1sgDlQ8yJW8cWL80114Id3LqjrzmKu7i/njTH+lK/6+rnQWtHT15/xVownqVfZwCfq4kMCX8Tsub15L//L7c/yrHDkzji1R6c807FZPFdcrTSJipvnSKTlbWX/r8YNlzPBPB+oeZTu4u0/kvVvt4Ff/P6rIzc5/v+/m8hTH4fXI4bWhPYBPh8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64abd248-982f-4e53-de42-08daf6fae749 X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2023 13:17:51.1324 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYP286MB1905 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755095142909636454?= X-GMAIL-MSGID: =?utf-8?q?1755095142909636454?= Commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for macio bus based drivers. Signed-off-by: Dawei Li --- v1 -> v2 - Revert unneeded changes. - Rebased on latest powerpc/next. v1 - https://lore.kernel.org/all/TYCP286MB2323FCDC7ECD87F8D97CB74BCA189@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM/ --- arch/powerpc/include/asm/macio.h | 2 +- drivers/ata/pata_macio.c | 4 +--- drivers/macintosh/rack-meter.c | 4 +--- drivers/net/ethernet/apple/bmac.c | 4 +--- drivers/net/ethernet/apple/mace.c | 4 +--- drivers/net/wireless/intersil/orinoco/airport.c | 4 +--- drivers/scsi/mac53c94.c | 5 +---- drivers/scsi/mesh.c | 5 +---- drivers/tty/serial/pmac_zilog.c | 7 ++----- sound/aoa/soundbus/i2sbus/core.c | 4 +--- 10 files changed, 11 insertions(+), 32 deletions(-) diff --git a/arch/powerpc/include/asm/macio.h b/arch/powerpc/include/asm/macio.h index ff5fd82d9ff0..cb9c386dacf8 100644 --- a/arch/powerpc/include/asm/macio.h +++ b/arch/powerpc/include/asm/macio.h @@ -125,7 +125,7 @@ static inline struct pci_dev *macio_get_pci_dev(struct macio_dev *mdev) struct macio_driver { int (*probe)(struct macio_dev* dev, const struct of_device_id *match); - int (*remove)(struct macio_dev* dev); + void (*remove)(struct macio_dev *dev); int (*suspend)(struct macio_dev* dev, pm_message_t state); int (*resume)(struct macio_dev* dev); diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 9ccaac9e2bc3..653106716a4b 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c @@ -1187,7 +1187,7 @@ static int pata_macio_attach(struct macio_dev *mdev, return rc; } -static int pata_macio_detach(struct macio_dev *mdev) +static void pata_macio_detach(struct macio_dev *mdev) { struct ata_host *host = macio_get_drvdata(mdev); struct pata_macio_priv *priv = host->private_data; @@ -1202,8 +1202,6 @@ static int pata_macio_detach(struct macio_dev *mdev) ata_host_detach(host); unlock_media_bay(priv->mdev->media_bay); - - return 0; } #ifdef CONFIG_PM_SLEEP diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index c28893e41a8b..f2f83c4f3af5 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c @@ -523,7 +523,7 @@ static int rackmeter_probe(struct macio_dev* mdev, return rc; } -static int rackmeter_remove(struct macio_dev* mdev) +static void rackmeter_remove(struct macio_dev *mdev) { struct rackmeter *rm = dev_get_drvdata(&mdev->ofdev.dev); @@ -558,8 +558,6 @@ static int rackmeter_remove(struct macio_dev* mdev) /* Get rid of me */ kfree(rm); - - return 0; } static int rackmeter_shutdown(struct macio_dev* mdev) diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c index 9e653e2925f7..292b1f9cd9e7 100644 --- a/drivers/net/ethernet/apple/bmac.c +++ b/drivers/net/ethernet/apple/bmac.c @@ -1591,7 +1591,7 @@ bmac_proc_info(char *buffer, char **start, off_t offset, int length) } #endif -static int bmac_remove(struct macio_dev *mdev) +static void bmac_remove(struct macio_dev *mdev) { struct net_device *dev = macio_get_drvdata(mdev); struct bmac_data *bp = netdev_priv(dev); @@ -1609,8 +1609,6 @@ static int bmac_remove(struct macio_dev *mdev) macio_release_resources(mdev); free_netdev(dev); - - return 0; } static const struct of_device_id bmac_match[] = diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c index fd1b008b7208..e6350971c707 100644 --- a/drivers/net/ethernet/apple/mace.c +++ b/drivers/net/ethernet/apple/mace.c @@ -272,7 +272,7 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match) return rc; } -static int mace_remove(struct macio_dev *mdev) +static void mace_remove(struct macio_dev *mdev) { struct net_device *dev = macio_get_drvdata(mdev); struct mace_data *mp; @@ -296,8 +296,6 @@ static int mace_remove(struct macio_dev *mdev) free_netdev(dev); macio_release_resources(mdev); - - return 0; } static void dbdma_reset(volatile struct dbdma_regs __iomem *dma) diff --git a/drivers/net/wireless/intersil/orinoco/airport.c b/drivers/net/wireless/intersil/orinoco/airport.c index a890bfa0d5cc..276a06cdd1f5 100644 --- a/drivers/net/wireless/intersil/orinoco/airport.c +++ b/drivers/net/wireless/intersil/orinoco/airport.c @@ -85,7 +85,7 @@ airport_resume(struct macio_dev *mdev) return err; } -static int +static void airport_detach(struct macio_dev *mdev) { struct orinoco_private *priv = dev_get_drvdata(&mdev->ofdev.dev); @@ -111,8 +111,6 @@ airport_detach(struct macio_dev *mdev) macio_set_drvdata(mdev, NULL); free_orinocodev(priv); - - return 0; } static int airport_hard_reset(struct orinoco_private *priv) diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index f75928f7773e..42648ca9b8ed 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c @@ -508,7 +508,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat return rc; } -static int mac53c94_remove(struct macio_dev *mdev) +static void mac53c94_remove(struct macio_dev *mdev) { struct fsc_state *fp = (struct fsc_state *)macio_get_drvdata(mdev); struct Scsi_Host *host = fp->host; @@ -526,11 +526,8 @@ static int mac53c94_remove(struct macio_dev *mdev) scsi_host_put(host); macio_release_resources(mdev); - - return 0; } - static struct of_device_id mac53c94_match[] = { { diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index 84b541a57b7b..cd2575b88c85 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -1986,7 +1986,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) return -ENODEV; } -static int mesh_remove(struct macio_dev *mdev) +static void mesh_remove(struct macio_dev *mdev) { struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); struct Scsi_Host *mesh_host = ms->host; @@ -2013,11 +2013,8 @@ static int mesh_remove(struct macio_dev *mdev) macio_release_resources(mdev); scsi_host_put(mesh_host); - - return 0; } - static struct of_device_id mesh_match[] = { { diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index 13668ffdb1e7..d4640479c338 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -1507,12 +1507,12 @@ static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match) * That one should not be called, macio isn't really a hotswap device, * we don't expect one of those serial ports to go away... */ -static int pmz_detach(struct macio_dev *mdev) +static void pmz_detach(struct macio_dev *mdev) { struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev); if (!uap) - return -ENODEV; + return; uart_remove_one_port(&pmz_uart_reg, &uap->port); @@ -1523,11 +1523,8 @@ static int pmz_detach(struct macio_dev *mdev) dev_set_drvdata(&mdev->ofdev.dev, NULL); uap->dev = NULL; uap->port.dev = NULL; - - return 0; } - static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state) { struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev); diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 51ed2f34b276..35f39727994d 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -364,15 +364,13 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) return 0; } -static int i2sbus_remove(struct macio_dev* dev) +static void i2sbus_remove(struct macio_dev *dev) { struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); struct i2sbus_dev *i2sdev, *tmp; list_for_each_entry_safe(i2sdev, tmp, &control->list, item) soundbus_remove_one(&i2sdev->sound); - - return 0; } #ifdef CONFIG_PM