Commit a237f35f authored by Stefan Richter's avatar Stefan Richter Committed by Jody McIntyre

sbp2, ohci1394 cleanups:

sbp2: various code formatting cleanups
ohci1394: remove form feed characters
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJody McIntyre <scjody@modernduck.com>
parent e309fc6d
...@@ -3201,8 +3201,6 @@ static struct hpsb_host_driver ohci1394_driver = { ...@@ -3201,8 +3201,6 @@ static struct hpsb_host_driver ohci1394_driver = {
.hw_csr_reg = ohci_hw_csr_reg, .hw_csr_reg = ohci_hw_csr_reg,
}; };
/*********************************** /***********************************
* PCI Driver Interface functions * * PCI Driver Interface functions *
***********************************/ ***********************************/
...@@ -3606,8 +3604,6 @@ static struct pci_driver ohci1394_pci_driver = { ...@@ -3606,8 +3604,6 @@ static struct pci_driver ohci1394_pci_driver = {
.suspend = ohci1394_pci_suspend, .suspend = ohci1394_pci_suspend,
}; };
/*********************************** /***********************************
* OHCI1394 Video Interface * * OHCI1394 Video Interface *
***********************************/ ***********************************/
...@@ -3714,7 +3710,6 @@ EXPORT_SYMBOL(ohci1394_init_iso_tasklet); ...@@ -3714,7 +3710,6 @@ EXPORT_SYMBOL(ohci1394_init_iso_tasklet);
EXPORT_SYMBOL(ohci1394_register_iso_tasklet); EXPORT_SYMBOL(ohci1394_register_iso_tasklet);
EXPORT_SYMBOL(ohci1394_unregister_iso_tasklet); EXPORT_SYMBOL(ohci1394_unregister_iso_tasklet);
/*********************************** /***********************************
* General module initialization * * General module initialization *
***********************************/ ***********************************/
......
This diff is collapsed.
...@@ -119,8 +119,8 @@ struct sbp2_query_logins_response { ...@@ -119,8 +119,8 @@ struct sbp2_query_logins_response {
struct sbp2_reconnect_orb { struct sbp2_reconnect_orb {
u32 reserved1; u32 reserved1;
u32 reserved2; u32 reserved2;
u32 reserved3; u32 reserved3;
u32 reserved4; u32 reserved4;
u32 login_ID_misc; u32 login_ID_misc;
u32 reserved5; u32 reserved5;
u32 status_FIFO_hi; u32 status_FIFO_hi;
...@@ -130,8 +130,8 @@ struct sbp2_reconnect_orb { ...@@ -130,8 +130,8 @@ struct sbp2_reconnect_orb {
struct sbp2_logout_orb { struct sbp2_logout_orb {
u32 reserved1; u32 reserved1;
u32 reserved2; u32 reserved2;
u32 reserved3; u32 reserved3;
u32 reserved4; u32 reserved4;
u32 login_ID_misc; u32 login_ID_misc;
u32 reserved5; u32 reserved5;
u32 status_FIFO_hi; u32 status_FIFO_hi;
...@@ -188,7 +188,7 @@ struct sbp2_unrestricted_page_table { ...@@ -188,7 +188,7 @@ struct sbp2_unrestricted_page_table {
struct sbp2_status_block { struct sbp2_status_block {
u32 ORB_offset_hi_misc; u32 ORB_offset_hi_misc;
u32 ORB_offset_lo; u32 ORB_offset_lo;
u8 command_set_dependent[24]; u8 command_set_dependent[24];
}; };
/* /*
...@@ -211,7 +211,7 @@ struct sbp2_status_block { ...@@ -211,7 +211,7 @@ struct sbp2_status_block {
* specified for write posting, where the ohci controller will * specified for write posting, where the ohci controller will
* automatically send an ack_complete when the status is written by the * automatically send an ack_complete when the status is written by the
* sbp2 device... saving a split transaction. =) * sbp2 device... saving a split transaction. =)
*/ */
#define SBP2_STATUS_FIFO_ADDRESS 0xfffe00000000ULL #define SBP2_STATUS_FIFO_ADDRESS 0xfffe00000000ULL
#define SBP2_STATUS_FIFO_ADDRESS_HI 0xfffe #define SBP2_STATUS_FIFO_ADDRESS_HI 0xfffe
#define SBP2_STATUS_FIFO_ADDRESS_LO 0x0 #define SBP2_STATUS_FIFO_ADDRESS_LO 0x0
...@@ -333,10 +333,8 @@ struct sbp2_command_info { ...@@ -333,10 +333,8 @@ struct sbp2_command_info {
#define SBP2_BREAKAGE_128K_MAX_TRANSFER 0x1 #define SBP2_BREAKAGE_128K_MAX_TRANSFER 0x1
#define SBP2_BREAKAGE_INQUIRY_HACK 0x2 #define SBP2_BREAKAGE_INQUIRY_HACK 0x2
struct sbp2scsi_host_info; struct sbp2scsi_host_info;
/* /*
* Information needed on a per scsi id basis (one for each sbp2 device) * Information needed on a per scsi id basis (one for each sbp2 device)
*/ */
...@@ -406,7 +404,6 @@ struct scsi_id_instance_data { ...@@ -406,7 +404,6 @@ struct scsi_id_instance_data {
u32 workarounds; u32 workarounds;
}; };
/* Sbp2 host data structure (one per IEEE1394 host) */ /* Sbp2 host data structure (one per IEEE1394 host) */
struct sbp2scsi_host_info { struct sbp2scsi_host_info {
struct hpsb_host *host; /* IEEE1394 host */ struct hpsb_host *host; /* IEEE1394 host */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment