Commit 9e7cec88 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linuxusb.bkbits.net/pci_hp-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents b73a365a 01bb3440
...@@ -81,15 +81,15 @@ static int get_latch_status (struct hotplug_slot *slot, u8 *value); ...@@ -81,15 +81,15 @@ static int get_latch_status (struct hotplug_slot *slot, u8 *value);
static int get_adapter_status (struct hotplug_slot *slot, u8 *value); static int get_adapter_status (struct hotplug_slot *slot, u8 *value);
static struct hotplug_slot_ops cpqphp_hotplug_slot_ops = { static struct hotplug_slot_ops cpqphp_hotplug_slot_ops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
set_attention_status: set_attention_status, .set_attention_status = set_attention_status,
enable_slot: process_SI, .enable_slot = process_SI,
disable_slot: process_SS, .disable_slot = process_SS,
hardware_test: hardware_test, .hardware_test = hardware_test,
get_power_status: get_power_status, .get_power_status = get_power_status,
get_attention_status: get_attention_status, .get_attention_status = get_attention_status,
get_latch_status: get_latch_status, .get_latch_status = get_latch_status,
get_adapter_status: get_adapter_status, .get_adapter_status = get_adapter_status,
}; };
...@@ -1387,14 +1387,14 @@ static void unload_cpqphpd(void) ...@@ -1387,14 +1387,14 @@ static void unload_cpqphpd(void)
static struct pci_device_id hpcd_pci_tbl[] __devinitdata = { static struct pci_device_id hpcd_pci_tbl[] __devinitdata = {
{ {
/* handle any PCI Hotplug controller */ /* handle any PCI Hotplug controller */
class: ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00), .class = ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00),
class_mask: ~0, .class_mask = ~0,
/* no matter who makes it */ /* no matter who makes it */
vendor: PCI_ANY_ID, .vendor = PCI_ANY_ID,
device: PCI_ANY_ID, .device = PCI_ANY_ID,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
}, { /* end: all zeroes */ } }, { /* end: all zeroes */ }
}; };
...@@ -1404,9 +1404,9 @@ MODULE_DEVICE_TABLE(pci, hpcd_pci_tbl); ...@@ -1404,9 +1404,9 @@ MODULE_DEVICE_TABLE(pci, hpcd_pci_tbl);
static struct pci_driver cpqhpc_driver = { static struct pci_driver cpqhpc_driver = {
name: "pci_hotplug", .name = "pci_hotplug",
id_table: hpcd_pci_tbl, .id_table = hpcd_pci_tbl,
probe: cpqhpc_probe, .probe = cpqhpc_probe,
/* remove: cpqhpc_remove_one, */ /* remove: cpqhpc_remove_one, */
}; };
......
...@@ -232,17 +232,17 @@ static int unconfigure_visit_pci_dev_phase1 (struct pci_dev_wrapped *wrapped_dev ...@@ -232,17 +232,17 @@ static int unconfigure_visit_pci_dev_phase1 (struct pci_dev_wrapped *wrapped_dev
static struct pci_visit configure_functions = { static struct pci_visit configure_functions = {
visit_pci_dev: configure_visit_pci_dev, .visit_pci_dev = configure_visit_pci_dev,
}; };
static struct pci_visit unconfigure_functions_phase1 = { static struct pci_visit unconfigure_functions_phase1 = {
post_visit_pci_dev: unconfigure_visit_pci_dev_phase1 .post_visit_pci_dev = unconfigure_visit_pci_dev_phase1
}; };
static struct pci_visit unconfigure_functions_phase2 = { static struct pci_visit unconfigure_functions_phase2 = {
post_visit_pci_bus: unconfigure_visit_pci_bus_phase2, .post_visit_pci_bus = unconfigure_visit_pci_bus_phase2,
post_visit_pci_dev: unconfigure_visit_pci_dev_phase2 .post_visit_pci_dev = unconfigure_visit_pci_dev_phase2
}; };
......
...@@ -893,12 +893,12 @@ static int ibm_unconfigure_visit_pci_dev_phase1 (struct pci_dev_wrapped *wrapped ...@@ -893,12 +893,12 @@ static int ibm_unconfigure_visit_pci_dev_phase1 (struct pci_dev_wrapped *wrapped
} }
static struct pci_visit ibm_unconfigure_functions_phase1 = { static struct pci_visit ibm_unconfigure_functions_phase1 = {
post_visit_pci_dev: ibm_unconfigure_visit_pci_dev_phase1, .post_visit_pci_dev = ibm_unconfigure_visit_pci_dev_phase1,
}; };
static struct pci_visit ibm_unconfigure_functions_phase2 = { static struct pci_visit ibm_unconfigure_functions_phase2 = {
post_visit_pci_bus: ibm_unconfigure_visit_pci_bus_phase2, .post_visit_pci_bus = ibm_unconfigure_visit_pci_bus_phase2,
post_visit_pci_dev: ibm_unconfigure_visit_pci_dev_phase2, .post_visit_pci_dev = ibm_unconfigure_visit_pci_dev_phase2,
}; };
static int ibm_unconfigure_device (struct pci_func *func) static int ibm_unconfigure_device (struct pci_func *func)
...@@ -962,7 +962,7 @@ static int configure_visit_pci_dev (struct pci_dev_wrapped *wrapped_dev, struct ...@@ -962,7 +962,7 @@ static int configure_visit_pci_dev (struct pci_dev_wrapped *wrapped_dev, struct
} }
static struct pci_visit configure_functions = { static struct pci_visit configure_functions = {
visit_pci_dev: configure_visit_pci_dev, .visit_pci_dev =configure_visit_pci_dev,
}; };
static int ibm_configure_device (struct pci_func *func) static int ibm_configure_device (struct pci_func *func)
...@@ -1494,19 +1494,19 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) ...@@ -1494,19 +1494,19 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot)
} }
struct hotplug_slot_ops ibmphp_hotplug_slot_ops = { struct hotplug_slot_ops ibmphp_hotplug_slot_ops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
set_attention_status: set_attention_status, .set_attention_status = set_attention_status,
enable_slot: enable_slot, .enable_slot = enable_slot,
disable_slot: ibmphp_disable_slot, .disable_slot = ibmphp_disable_slot,
hardware_test: NULL, .hardware_test = NULL,
get_power_status: get_power_status, .get_power_status = get_power_status,
get_attention_status: get_attention_status, .get_attention_status = get_attention_status,
get_latch_status: get_latch_status, .get_latch_status = get_latch_status,
get_adapter_status: get_adapter_present, .get_adapter_status = get_adapter_present,
/* get_max_bus_speed_status: get_max_bus_speed, /* get_max_bus_speed_status: get_max_bus_speed,
get_max_adapter_speed_status: get_max_adapter_speed, .get_max_adapter_speed_status = get_max_adapter_speed,
get_cur_bus_speed_status: get_cur_bus_speed, .get_cur_bus_speed_status = get_cur_bus_speed,
get_card_bus_names_status: get_card_bus_names, .get_card_bus_names_status = get_card_bus_names,
*/ */
}; };
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#define MY_NAME THIS_MODULE->name #define MY_NAME THIS_MODULE->name
#endif #endif
#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0) #define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
...@@ -109,6 +109,9 @@ static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int de ...@@ -109,6 +109,9 @@ static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int de
case S_IFDIR: case S_IFDIR:
inode->i_op = &pcihpfs_dir_inode_operations; inode->i_op = &pcihpfs_dir_inode_operations;
inode->i_fop = &simple_dir_operations; inode->i_fop = &simple_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
inode->i_nlink++;
break; break;
} }
} }
...@@ -227,71 +230,71 @@ static int default_open (struct inode *inode, struct file *filp) ...@@ -227,71 +230,71 @@ static int default_open (struct inode *inode, struct file *filp)
} }
static struct file_operations default_file_operations = { static struct file_operations default_file_operations = {
read: default_read_file, .read = default_read_file,
write: default_write_file, .write = default_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
/* file ops for the "power" files */ /* file ops for the "power" files */
static ssize_t power_read_file (struct file *file, char *buf, size_t count, loff_t *offset); static ssize_t power_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static ssize_t power_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos); static ssize_t power_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
static struct file_operations power_file_operations = { static struct file_operations power_file_operations = {
read: power_read_file, .read = power_read_file,
write: power_write_file, .write = power_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
/* file ops for the "attention" files */ /* file ops for the "attention" files */
static ssize_t attention_read_file (struct file *file, char *buf, size_t count, loff_t *offset); static ssize_t attention_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static ssize_t attention_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos); static ssize_t attention_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
static struct file_operations attention_file_operations = { static struct file_operations attention_file_operations = {
read: attention_read_file, .read = attention_read_file,
write: attention_write_file, .write = attention_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
/* file ops for the "latch" files */ /* file ops for the "latch" files */
static ssize_t latch_read_file (struct file *file, char *buf, size_t count, loff_t *offset); static ssize_t latch_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations latch_file_operations = { static struct file_operations latch_file_operations = {
read: latch_read_file, .read = latch_read_file,
write: default_write_file, .write = default_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
/* file ops for the "presence" files */ /* file ops for the "presence" files */
static ssize_t presence_read_file (struct file *file, char *buf, size_t count, loff_t *offset); static ssize_t presence_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations presence_file_operations = { static struct file_operations presence_file_operations = {
read: presence_read_file, .read = presence_read_file,
write: default_write_file, .write = default_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
/* file ops for the "test" files */ /* file ops for the "test" files */
static ssize_t test_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos); static ssize_t test_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
static struct file_operations test_file_operations = { static struct file_operations test_file_operations = {
read: default_read_file, .read = default_read_file,
write: test_write_file, .write = test_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
static struct inode_operations pcihpfs_dir_inode_operations = { static struct inode_operations pcihpfs_dir_inode_operations = {
create: pcihpfs_create, .create = pcihpfs_create,
lookup: simple_lookup, .lookup = simple_lookup,
unlink: pcihpfs_unlink, .unlink = pcihpfs_unlink,
mkdir: pcihpfs_mkdir, .mkdir = pcihpfs_mkdir,
rmdir: pcihpfs_rmdir, .rmdir = pcihpfs_rmdir,
mknod: pcihpfs_mknod, .mknod = pcihpfs_mknod,
}; };
static struct super_operations pcihpfs_ops = { static struct super_operations pcihpfs_ops = {
statfs: simple_statfs, .statfs = simple_statfs,
drop_inode: generic_delete_inode, .drop_inode = generic_delete_inode,
}; };
static int pcihpfs_fill_super(struct super_block *sb, void *data, int silent) static int pcihpfs_fill_super(struct super_block *sb, void *data, int silent)
...@@ -327,10 +330,10 @@ static struct super_block *pcihpfs_get_sb(struct file_system_type *fs_type, ...@@ -327,10 +330,10 @@ static struct super_block *pcihpfs_get_sb(struct file_system_type *fs_type,
} }
static struct file_system_type pcihpfs_type = { static struct file_system_type pcihpfs_type = {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "pcihpfs", .name = "pcihpfs",
get_sb: pcihpfs_get_sb, .get_sb = pcihpfs_get_sb,
kill_sb: kill_litter_super, .kill_sb = kill_litter_super,
}; };
static int get_mount (void) static int get_mount (void)
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#define MY_NAME THIS_MODULE->name #define MY_NAME THIS_MODULE->name
#endif #endif
#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0) #define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
......
...@@ -89,15 +89,15 @@ static int get_latch_status (struct hotplug_slot *slot, u8 *value); ...@@ -89,15 +89,15 @@ static int get_latch_status (struct hotplug_slot *slot, u8 *value);
static int get_adapter_status (struct hotplug_slot *slot, u8 *value); static int get_adapter_status (struct hotplug_slot *slot, u8 *value);
static struct hotplug_slot_ops skel_hotplug_slot_ops = { static struct hotplug_slot_ops skel_hotplug_slot_ops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
enable_slot: enable_slot, .enable_slot = enable_slot,
disable_slot: disable_slot, .disable_slot = disable_slot,
set_attention_status: set_attention_status, .set_attention_status = set_attention_status,
hardware_test: hardware_test, .hardware_test = hardware_test,
get_power_status: get_power_status, .get_power_status = get_power_status,
get_attention_status: get_attention_status, .get_attention_status = get_attention_status,
get_latch_status: get_latch_status, .get_latch_status = get_latch_status,
get_adapter_status: get_adapter_status, .get_adapter_status = get_adapter_status,
}; };
......
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