lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] cciss: pci domain info pass 2

Browse Source 
This is pass 2 of my patch to add pci domain info to an existing ioctl.  This
time I insert the domain between dev_fn and board_id as Willy suggested and
change the var to unsigned short to ease Christoph's concerns.  Although I
thought unsigned int was the correct var type for this.  I also thought it
didn't matter where I inserted it in the structure.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Mike Miller
2005-06-27 14:36:49 -07:00
committed by Linus Torvalds
parent 3de0a70bd9
commit cd6fb584cf
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/block/cciss.c
View File

@@ -638,6 +638,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
cciss_pci_info_struct pciinfo; cciss_pci_info_struct pciinfo;
if (!arg) return -EINVAL; if (!arg) return -EINVAL;
pciinfo.domain = pci_domain_nr(host->pdev->bus);
pciinfo.bus = host->pdev->bus->number; pciinfo.bus = host->pdev->bus->number;
pciinfo.dev_fn = host->pdev->devfn; pciinfo.dev_fn = host->pdev->devfn;
pciinfo.board_id = host->board_id; pciinfo.board_id = host->board_id;

1
include/linux/cciss_ioctl.h
View File

@@ -10,6 +10,7 @@
typedef struct _cciss_pci_info_struct typedef struct _cciss_pci_info_struct
{ {
unsigned char bus; unsigned char bus;
unsigned short domain;
unsigned char dev_fn; unsigned char dev_fn;
__u32 board_id; __u32 board_id;
} cciss_pci_info_struct; } cciss_pci_info_struct;