From patchwork Sat Oct 3 23:22:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Laskar X-Patchwork-Id: 7322741 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 284829F302 for ; Sat, 3 Oct 2015 23:32:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 295E22076B for ; Sat, 3 Oct 2015 23:32:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04A7520768 for ; Sat, 3 Oct 2015 23:32:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751013AbbJCXcV (ORCPT ); Sat, 3 Oct 2015 19:32:21 -0400 Received: from 195-154-87-184.rev.poneytelecom.eu ([195.154.87.184]:42060 "EHLO gaby.io" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750854AbbJCXcU (ORCPT ); Sat, 3 Oct 2015 19:32:20 -0400 X-Greylist: delayed 565 seconds by postgrey-1.27 at vger.kernel.org; Sat, 03 Oct 2015 19:32:20 EDT Received: from guiness.lse.epita.fr (lse.epita.fr [163.5.55.17]) by gaby.io (Postfix) with ESMTPSA id DBD90D8014D; Sun, 4 Oct 2015 01:22:52 +0200 (CEST) From: Gabriel Laskar To: Adaptec OEM Raid Solutions , "James E.J. Bottomley" , "David S. Miller" , Hans Verkuil , "Michael S. Tsirkin" , Greg Kroah-Hartman , Mauro Carvalho Chehab , Masahiro Yamada , stephen hemminger , Nicolas Dichtel , linux-scsi@vger.kernel.org (open list:DPT_I2O SCSI RAID DRIVER), linux-kernel@vger.kernel.org (open list), linux-api@vger.kernel.org (open list:ABI/API) Cc: Gabriel Laskar , Arnd Bergmann Subject: [PATCH v2] scsi: dpt: remove i2o header in uapi Date: Sun, 4 Oct 2015 01:22:50 +0200 Message-Id: <1443914571-19312-1-git-send-email-gabriel@lse.epita.fr> X-Mailer: git-send-email 2.6.0 In-Reply-To: <1443712510-6714-1-git-send-email-gabriel@lse.epita.fr> References: <1443712510-6714-1-git-send-email-gabriel@lse.epita.fr> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The i2o subsystem was removed by commit 4a72a7af462d ("staging: remove i2o subsystem") but the header was still used by drivers/scsi/dpt_i2o.c driver. This patch moves the structures used from the header into dpti_i2o.h. CC: Arnd Bergmann CC: Greg Kroah-Hartman Signed-off-by: Gabriel Laskar Acked-by: Greg Kroah-Hartman Acked-by: Arnd Bergmann --- drivers/scsi/dpt/dpti_i2o.h | 134 +++++++++++++- include/uapi/linux/Kbuild | 1 - include/uapi/linux/i2o-dev.h | 421 ------------------------------------------- 3 files changed, 132 insertions(+), 424 deletions(-) delete mode 100644 include/uapi/linux/i2o-dev.h diff --git a/include/uapi/linux/i2o-dev.h b/include/uapi/linux/i2o-dev.h deleted file mode 100644 index a8093bf..0000000 diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h index bd9e31e..50515d3 100644 --- a/drivers/scsi/dpt/dpti_i2o.h +++ b/drivers/scsi/dpt/dpti_i2o.h @@ -19,8 +19,6 @@ #ifdef __KERNEL__ /* This file to be included by kernel only */ -#include - #include #include @@ -41,6 +39,137 @@ #define I2O_MAX_MANAGERS 4 +#define I2O_BUS_LOCAL 0 +#define I2O_BUS_ISA 1 +#define I2O_BUS_EISA 2 +/* was I2O_BUS_MCA 3 */ +#define I2O_BUS_PCI 4 +#define I2O_BUS_PCMCIA 5 +#define I2O_BUS_NUBUS 6 +#define I2O_BUS_CARDBUS 7 +#define I2O_BUS_UNKNOWN 0x80 + +typedef struct _i2o_pci_bus { + __u8 PciFunctionNumber; + __u8 PciDeviceNumber; + __u8 PciBusNumber; + __u8 reserved; + __u16 PciVendorID; + __u16 PciDeviceID; +} i2o_pci_bus; + +typedef struct _i2o_local_bus { + __u16 LbBaseIOPort; + __u16 reserved; + __u32 LbBaseMemoryAddress; +} i2o_local_bus; + +typedef struct _i2o_isa_bus { + __u16 IsaBaseIOPort; + __u8 CSN; + __u8 reserved; + __u32 IsaBaseMemoryAddress; +} i2o_isa_bus; + +typedef struct _i2o_eisa_bus_info { + __u16 EisaBaseIOPort; + __u8 reserved; + __u8 EisaSlotNumber; + __u32 EisaBaseMemoryAddress; +} i2o_eisa_bus; + +typedef struct _i2o_mca_bus { + __u16 McaBaseIOPort; + __u8 reserved; + __u8 McaSlotNumber; + __u32 McaBaseMemoryAddress; +} i2o_mca_bus; + +typedef struct _i2o_other_bus { + __u16 BaseIOPort; + __u16 reserved; + __u32 BaseMemoryAddress; +} i2o_other_bus; + +typedef struct _i2o_hrt_entry { + __u32 adapter_id; + __u32 parent_tid:12; + __u32 state:4; + __u32 bus_num:8; + __u32 bus_type:8; + union { + i2o_pci_bus pci_bus; + i2o_local_bus local_bus; + i2o_isa_bus isa_bus; + i2o_eisa_bus eisa_bus; + i2o_mca_bus mca_bus; + i2o_other_bus other_bus; + } bus; +} i2o_hrt_entry; + +typedef struct _i2o_hrt { + __u16 num_entries; + __u8 entry_len; + __u8 hrt_version; + __u32 change_ind; + i2o_hrt_entry hrt_entry[1]; +} i2o_hrt; + +typedef struct _i2o_lct_entry { + __u32 entry_size:16; + __u32 tid:12; + __u32 reserved:4; + __u32 change_ind; + __u32 device_flags; + __u32 class_id:12; + __u32 version:4; + __u32 vendor_id:16; + __u32 sub_class; + __u32 user_tid:12; + __u32 parent_tid:12; + __u32 bios_info:8; + __u8 identity_tag[8]; + __u32 event_capabilities; +} i2o_lct_entry; + +typedef struct _i2o_lct { + __u32 table_size:16; + __u32 boot_tid:12; + __u32 lct_ver:4; + __u32 iop_flags; + __u32 change_ind; + i2o_lct_entry lct_entry[1]; +} i2o_lct; + +typedef struct _i2o_status_block { + __u16 org_id; + __u16 reserved; + __u16 iop_id:12; + __u16 reserved1:4; + __u16 host_unit_id; + __u16 segment_number:12; + __u16 i2o_version:4; + __u8 iop_state; + __u8 msg_type; + __u16 inbound_frame_size; + __u8 init_code; + __u8 reserved2; + __u32 max_inbound_frames; + __u32 cur_inbound_frames; + __u32 max_outbound_frames; + char product_id[24]; + __u32 expected_lct_size; + __u32 iop_capabilities; + __u32 desired_mem_size; + __u32 current_mem_size; + __u32 current_mem_base; + __u32 desired_io_size; + __u32 current_io_size; + __u32 current_io_base; + __u32 reserved3:24; + __u32 cmd_status:8; +} i2o_status_block; + /* * I2O Interface Objects */ @@ -131,6 +260,7 @@ struct i2o_sys_tbl struct i2o_sys_tbl_entry iops[0]; }; + /* * I2O classes / subclasses */ diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index f7b2db4..38f6e50 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -151,7 +151,6 @@ header-y += hyperv.h header-y += hysdn_if.h header-y += i2c-dev.h header-y += i2c.h -header-y += i2o-dev.h header-y += i8k.h header-y += icmp.h header-y += icmpv6.h