Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4277281pxf; Tue, 30 Mar 2021 03:58:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy504bJqyGfWIw9SxkNF5XYklmQJLkn/7XOY2xoD5qIl/O+niS1RHnAf9vV0HSUuihI3LGk X-Received: by 2002:a05:6402:30a5:: with SMTP id df5mr33394702edb.24.1617101939631; Tue, 30 Mar 2021 03:58:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617101939; cv=none; d=google.com; s=arc-20160816; b=uOnmNs7u8QGBFLRGFni+vHihd3hOvoGxVzlOomp4I+yu2xXackGK9m7X2LAqEPpG0h 4N0OcdyB4TY+MnkkHZHoNwa9hqpis7tTD9jeJUbwFjwmzrzA4MyVhm5OvIvRK1mg5Uik DqkXfYnWc8zx89wQq3IldBV0hoKhvk29WzeNX3barzOz1oV6IukHleW77GOFg3ZFfCL+ qAMkNeKL7EttZbOlCNdAgGYdJMDODNPsIrYYaXJ7yA+0gJksCdzx+8M/rCTrV2K5+9dq A0COr6jWlELkGWSI9XLuh3yZplEbd7c03pwJSdT6cRPrpdyM4+VLXnqAjSkkPYlyrFiB 926Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=yKCtbX8o1qgUmxiwNw8frDM5Z/qhmBoGTnY4Xf/mNx4=; b=I5lJe++RpRS2J+ANgIOK3UFVwMtSZZZMjpuw4bffEJB34p2Dg1JpOQzxukM2+VW0WB A+gDJd/YsQ4XXk/PsFI9Ob+as3g2J6jlakz3sTyyrAtGAYmGv/ZOPxFuUnVuHTLI6FuJ yJ1ifjHsw9a36R9i0270ksTiF7yIUo2HORAtF2QJ9f0+triYC7n3Az03ucfrph9YTaJv 7JgcX329axU3fO8zBlpUA677QU8hqJZYvHSsq6ch33qHlvQhKHc9w/6btpA0sLonq8GM 8I1gNlAyPf9UEqDXXwhXA41SNlUuUTMtLWSYjVLh5KlgVmr78Wt/YgRlfMx1o3seAfuO 9j6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v2si15647443ejg.251.2021.03.30.03.58.36; Tue, 30 Mar 2021 03:58:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231837AbhC3K5h (ORCPT + 99 others); Tue, 30 Mar 2021 06:57:37 -0400 Received: from mail-m17637.qiye.163.com ([59.111.176.37]:20040 "EHLO mail-m17637.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231330AbhC3K5X (ORCPT ); Tue, 30 Mar 2021 06:57:23 -0400 Received: from wanjb-virtual-machine.localdomain (unknown [36.152.145.182]) by mail-m17637.qiye.163.com (Hmail) with ESMTPA id C5E9D9804A1; Tue, 30 Mar 2021 18:57:19 +0800 (CST) From: Wan Jiabing To: Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Vineeth Vijayan , Peter Oberparleiter , Julian Wiedmann , Alexandra Winter , Wan Jiabing , Mauro Carvalho Chehab , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kael_w@yeah.net Subject: [PATCH] arch: s390: Remove duplicate struct ccw1 declaration Date: Tue, 30 Mar 2021 18:56:25 +0800 Message-Id: <20210330105638.2742356-1-wanjiabing@vivo.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZTBhIQ0wfHk0eH01MVkpNSkxKS0pDT0tKQ05VEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKTFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MT46PSo4Cz8KMDc6TR8cOR48 LkgKCxJVSlVKTUpMSktKQ09LT01IVTMWGhIXVQwaFRESGhkSFRw7DRINFFUYFBZFWVdZEgtZQVlI TVVKTklVSk9OVUpDSVlXWQgBWUFJSE5CNwY+ X-HM-Tid: 0a7882c7def3d992kuwsc5e9d9804a1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org struct ccw1 is declared twice. One has been declared at 21st line. Remove the duplicate. Signed-off-by: Wan Jiabing --- arch/s390/include/asm/ccwdev.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h index 778247bb1d61..d4e90f2ba77e 100644 --- a/arch/s390/include/asm/ccwdev.h +++ b/arch/s390/include/asm/ccwdev.h @@ -152,9 +152,6 @@ extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv, * when new devices for its type pop up */ extern int ccw_driver_register (struct ccw_driver *driver); extern void ccw_driver_unregister (struct ccw_driver *driver); - -struct ccw1; - extern int ccw_device_set_options_mask(struct ccw_device *, unsigned long); extern int ccw_device_set_options(struct ccw_device *, unsigned long); extern void ccw_device_clear_options(struct ccw_device *, unsigned long); -- 2.25.1