From patchwork Mon Jan 14 11:23:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10762225 X-Patchwork-Delegate: deller@gmx.de Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 722316C2 for ; Mon, 14 Jan 2019 11:24:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62E2D286A9 for ; Mon, 14 Jan 2019 11:24:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56C4028821; Mon, 14 Jan 2019 11:24:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0203C286A9 for ; Mon, 14 Jan 2019 11:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726574AbfANLYS (ORCPT ); Mon, 14 Jan 2019 06:24:18 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:38618 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726743AbfANLYR (ORCPT ); Mon, 14 Jan 2019 06:24:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=hxJVZs5E5cqhZZjBbmbtMAt19nHoSSZSpcr7hJeAg2Y=; b=alL/pEIWiVg0fY5r5VB7ZtHs4U Tmju0HeoyRhGfjNebbF3/HSLq1TGyH69vAmsf23chYr2JZBgnkdaCzLBIo+D+79+uskYhuxZ0ef7j hOdzgNRtH1/z5k0g4nUTordV+IvS8AoIwcpVLd9DI6tPxaI7zjxBF1nLc1ORkVlVtiOhMd+350uM3 9QGUTGJwrFrEWVph7UpANcviBdwDCNNXWojQGRRyRo7tizYOiC7KYFaohbotVSJNuoCi4I51TkDX8 qw2Nr2/6EYrp6rt5BFeTuDjvdIIElZ3PJyLNm5pq8tCYOeFGvJ+gVaMwYpc5lWs7YhYvgGWNPjiR8 3NhQZK2w==; Received: from 089144213167.atnat0022.highway.a1.net ([89.144.213.167] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gj0Lo-0006pl-5E; Mon, 14 Jan 2019 11:24:16 +0000 From: Christoph Hellwig To: "James E.J. Bottomley" , Helge Deller Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] parisc/lba_pci: use container_of in LBA_DEV Date: Mon, 14 Jan 2019 12:23:52 +0100 Message-Id: <20190114112353.30616-8-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114112353.30616-1-hch@lst.de> References: <20190114112353.30616-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the type safe container_of macros instead of a blind cast in LBA_DEV, and turn the macro into an inline function. Signed-off-by: Christoph Hellwig --- drivers/parisc/lba_pci.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 63e9bc6d18de..065d88868402 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -111,12 +111,10 @@ static u32 lba_t32; #define LBA_SKIP_PROBE(d) ((d)->flags & LBA_FLAG_SKIP_PROBE) - -/* Looks nice and keeps the compiler happy */ -#define LBA_DEV(d) ({ \ - void *__pdata = d; \ - BUG_ON(!__pdata); \ - (struct lba_device *)__pdata; }) +static inline struct lba_device *LBA_DEV(struct pci_hba_data *hba) +{ + return container_of(hba, struct lba_device, hba); +} /* ** Only allow 8 subsidiary busses per LBA