Skip to content

L
linux
Commit 8d85fce7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Drivers: block: remove __dev* attributes. 

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Mike Miller <mike.miller@hp.com>
Cc: Chirag Kantharia <chirag.kantharia@hp.com>
Cc: Geoff Levand <geoff@infradead.org>
Cc: Jim Paris <jim@jtan.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Keith Busch <keith.busch@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: NeilBrown <neilb@suse.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Tao Guo <Tao.Guo@emc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f58a01d
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 100 deletions
drivers/block/cciss.c
View file @ 8d85fce7
...@@ -181,8 +181,8 @@ static void cciss_geometry_inquiry(ctlr_info_t *h, int logvol, ...@@ -181,8 +181,8 @@ static void cciss_geometry_inquiry(ctlr_info_t *h, int logvol,
sector_t total_size, sector_t total_size,
unsigned int block_size, InquiryData_struct *inq_buff, unsigned int block_size, InquiryData_struct *inq_buff,
drive_info_struct *drv); drive_info_struct *drv);
static void __devinit cciss_interrupt_mode(ctlr_info_t *); static void cciss_interrupt_mode(ctlr_info_t *);
static int __devinit cciss_enter_simple_mode(struct ctlr_info *h); static int cciss_enter_simple_mode(struct ctlr_info *h);
static void start_io(ctlr_info_t *h); static void start_io(ctlr_info_t *h);
static int sendcmd_withirq(ctlr_info_t *h, __u8 cmd, void *buff, size_t size, static int sendcmd_withirq(ctlr_info_t *h, __u8 cmd, void *buff, size_t size,
__u8 page_code, unsigned char scsi3addr[], __u8 page_code, unsigned char scsi3addr[],
...@@ -199,14 +199,13 @@ static void cciss_device_release(struct device *dev); ...@@ -199,14 +199,13 @@ static void cciss_device_release(struct device *dev);
static void cciss_free_gendisk(ctlr_info_t *h, int drv_index); static void cciss_free_gendisk(ctlr_info_t *h, int drv_index);
static void cciss_free_drive_info(ctlr_info_t *h, int drv_index); static void cciss_free_drive_info(ctlr_info_t *h, int drv_index);
static inline u32 next_command(ctlr_info_t *h); static inline u32 next_command(ctlr_info_t *h);
static int __devinit cciss_find_cfg_addrs(struct pci_dev *pdev, static int cciss_find_cfg_addrs(struct pci_dev *pdev, void __iomem *vaddr,
void __iomem *vaddr, u32 *cfg_base_addr, u64 *cfg_base_addr_index, u32 *cfg_base_addr, u64 *cfg_base_addr_index,
u64 *cfg_offset); u64 *cfg_offset);
static int __devinit cciss_pci_find_memory_BAR(struct pci_dev *pdev, static int cciss_pci_find_memory_BAR(struct pci_dev *pdev,
unsigned long *memory_bar); unsigned long *memory_bar);
static inline u32 cciss_tag_discard_error_bits(ctlr_info_t *h, u32 tag); static inline u32 cciss_tag_discard_error_bits(ctlr_info_t *h, u32 tag);
static __devinit int write_driver_ver_to_cfgtable( static int write_driver_ver_to_cfgtable(CfgTable_struct __iomem *cfgtable);
CfgTable_struct __iomem *cfgtable);
/* performant mode helper functions */ /* performant mode helper functions */
static void calc_bucket_map(int *bucket, int num_buckets, int nsgs, static void calc_bucket_map(int *bucket, int num_buckets, int nsgs,
...@@ -550,7 +549,7 @@ static const struct file_operations cciss_proc_fops = { ...@@ -550,7 +549,7 @@ static const struct file_operations cciss_proc_fops = {
.write = cciss_proc_write, .write = cciss_proc_write,
}; };
static void __devinit cciss_procinit(ctlr_info_t *h) static void cciss_procinit(ctlr_info_t *h)
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
...@@ -2663,8 +2662,8 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff, ...@@ -2663,8 +2662,8 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff,
return status; return status;
} }
static int __devinit cciss_send_reset(ctlr_info_t *h, unsigned char *scsi3addr, static int cciss_send_reset(ctlr_info_t *h, unsigned char *scsi3addr,
u8 reset_type) u8 reset_type)
{ {
CommandList_struct *c; CommandList_struct *c;
int return_status; int return_status;
...@@ -3919,7 +3918,7 @@ static void calc_bucket_map(int bucket[], int num_buckets, ...@@ -3919,7 +3918,7 @@ static void calc_bucket_map(int bucket[], int num_buckets,
} }
} }
static void __devinit cciss_wait_for_mode_change_ack(ctlr_info_t *h) static void cciss_wait_for_mode_change_ack(ctlr_info_t *h)
{ {
int i; int i;
...@@ -3933,8 +3932,7 @@ static void __devinit cciss_wait_for_mode_change_ack(ctlr_info_t *h) ...@@ -3933,8 +3932,7 @@ static void __devinit cciss_wait_for_mode_change_ack(ctlr_info_t *h)
} }
} }
static __devinit void cciss_enter_performant_mode(ctlr_info_t *h, static void cciss_enter_performant_mode(ctlr_info_t *h, u32 use_short_tags)
u32 use_short_tags)
{ {
/* This is a bit complicated. There are 8 registers on /* This is a bit complicated. There are 8 registers on
* the controller which we write to to tell it 8 different * the controller which we write to to tell it 8 different
...@@ -4000,7 +3998,7 @@ static __devinit void cciss_enter_performant_mode(ctlr_info_t *h, ...@@ -4000,7 +3998,7 @@ static __devinit void cciss_enter_performant_mode(ctlr_info_t *h,
" performant mode\n"); " performant mode\n");
} }
static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h) static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
{ {
__u32 trans_support; __u32 trans_support;
...@@ -4062,7 +4060,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h) ...@@ -4062,7 +4060,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
* controllers that are capable. If not, we use IO-APIC mode. * controllers that are capable. If not, we use IO-APIC mode.
*/ */
static void __devinit cciss_interrupt_mode(ctlr_info_t *h) static void cciss_interrupt_mode(ctlr_info_t *h)
{ {
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
int err; int err;
...@@ -4108,7 +4106,7 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *h) ...@@ -4108,7 +4106,7 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *h)
return; return;
} }
static int __devinit cciss_lookup_board_id(struct pci_dev *pdev, u32 *board_id) static int cciss_lookup_board_id(struct pci_dev *pdev, u32 *board_id)
{ {
int i; int i;
u32 subsystem_vendor_id, subsystem_device_id; u32 subsystem_vendor_id, subsystem_device_id;
...@@ -4134,8 +4132,8 @@ static inline bool cciss_board_disabled(ctlr_info_t *h) ...@@ -4134,8 +4132,8 @@ static inline bool cciss_board_disabled(ctlr_info_t *h)
return ((command & PCI_COMMAND_MEMORY) == 0); return ((command & PCI_COMMAND_MEMORY) == 0);
} }
static int __devinit cciss_pci_find_memory_BAR(struct pci_dev *pdev, static int cciss_pci_find_memory_BAR(struct pci_dev *pdev,
unsigned long *memory_bar) unsigned long *memory_bar)
{ {
int i; int i;
...@@ -4151,8 +4149,8 @@ static int __devinit cciss_pci_find_memory_BAR(struct pci_dev *pdev, ...@@ -4151,8 +4149,8 @@ static int __devinit cciss_pci_find_memory_BAR(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
static int __devinit cciss_wait_for_board_state(struct pci_dev *pdev, static int cciss_wait_for_board_state(struct pci_dev *pdev,
void __iomem *vaddr, int wait_for_ready) void __iomem *vaddr, int wait_for_ready)
#define BOARD_READY 1 #define BOARD_READY 1
#define BOARD_NOT_READY 0 #define BOARD_NOT_READY 0
{ {
...@@ -4179,9 +4177,9 @@ static int __devinit cciss_wait_for_board_state(struct pci_dev *pdev, ...@@ -4179,9 +4177,9 @@ static int __devinit cciss_wait_for_board_state(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
static int __devinit cciss_find_cfg_addrs(struct pci_dev *pdev, static int cciss_find_cfg_addrs(struct pci_dev *pdev, void __iomem *vaddr,
void __iomem *vaddr, u32 *cfg_base_addr, u64 *cfg_base_addr_index, u32 *cfg_base_addr, u64 *cfg_base_addr_index,
u64 *cfg_offset) u64 *cfg_offset)
{ {
*cfg_base_addr = readl(vaddr + SA5_CTCFG_OFFSET); *cfg_base_addr = readl(vaddr + SA5_CTCFG_OFFSET);
*cfg_offset = readl(vaddr + SA5_CTMEM_OFFSET); *cfg_offset = readl(vaddr + SA5_CTMEM_OFFSET);
...@@ -4195,7 +4193,7 @@ static int __devinit cciss_find_cfg_addrs(struct pci_dev *pdev, ...@@ -4195,7 +4193,7 @@ static int __devinit cciss_find_cfg_addrs(struct pci_dev *pdev,
return 0; return 0;
} }
static int __devinit cciss_find_cfgtables(ctlr_info_t *h) static int cciss_find_cfgtables(ctlr_info_t *h)
{ {
u64 cfg_offset; u64 cfg_offset;
u32 cfg_base_addr; u32 cfg_base_addr;
...@@ -4224,7 +4222,7 @@ static int __devinit cciss_find_cfgtables(ctlr_info_t *h) ...@@ -4224,7 +4222,7 @@ static int __devinit cciss_find_cfgtables(ctlr_info_t *h)
return 0; return 0;
} }
static void __devinit cciss_get_max_perf_mode_cmds(struct ctlr_info *h) static void cciss_get_max_perf_mode_cmds(struct ctlr_info *h)
{ {
h->max_commands = readl(&(h->cfgtable->MaxPerformantModeCommands)); h->max_commands = readl(&(h->cfgtable->MaxPerformantModeCommands));
...@@ -4245,7 +4243,7 @@ static void __devinit cciss_get_max_perf_mode_cmds(struct ctlr_info *h) ...@@ -4245,7 +4243,7 @@ static void __devinit cciss_get_max_perf_mode_cmds(struct ctlr_info *h)
* max commands, max SG elements without chaining, and with chaining, * max commands, max SG elements without chaining, and with chaining,
* SG chain block size, etc. * SG chain block size, etc.
*/ */
static void __devinit cciss_find_board_params(ctlr_info_t *h) static void cciss_find_board_params(ctlr_info_t *h)
{ {
cciss_get_max_perf_mode_cmds(h); cciss_get_max_perf_mode_cmds(h);
h->nr_cmds = h->max_commands - 4 - cciss_tape_cmds; h->nr_cmds = h->max_commands - 4 - cciss_tape_cmds;
...@@ -4304,7 +4302,7 @@ static inline void cciss_p600_dma_prefetch_quirk(ctlr_info_t *h) ...@@ -4304,7 +4302,7 @@ static inline void cciss_p600_dma_prefetch_quirk(ctlr_info_t *h)
pci_write_config_dword(h->pdev, PCI_COMMAND_PARITY, dma_refetch); pci_write_config_dword(h->pdev, PCI_COMMAND_PARITY, dma_refetch);
} }
static int __devinit cciss_pci_init(ctlr_info_t *h) static int cciss_pci_init(ctlr_info_t *h)
{ {
int prod_index, err; int prod_index, err;
...@@ -4424,7 +4422,8 @@ static void free_hba(ctlr_info_t *h) ...@@ -4424,7 +4422,8 @@ static void free_hba(ctlr_info_t *h)
} }
/* Send a message CDB to the firmware. */ /* Send a message CDB to the firmware. */
static __devinit int cciss_message(struct pci_dev *pdev, unsigned char opcode, unsigned char type) static int cciss_message(struct pci_dev *pdev, unsigned char opcode,
unsigned char type)
{ {
typedef struct { typedef struct {
CommandListHeader_struct CommandHeader; CommandListHeader_struct CommandHeader;
...@@ -4571,14 +4570,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev, ...@@ -4571,14 +4570,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev,
return 0; return 0;
} }
static __devinit void init_driver_version(char *driver_version, int len) static void init_driver_version(char *driver_version, int len)
{ {
memset(driver_version, 0, len); memset(driver_version, 0, len);
strncpy(driver_version, "cciss " DRIVER_NAME, len - 1); strncpy(driver_version, "cciss " DRIVER_NAME, len - 1);
} }
static __devinit int write_driver_ver_to_cfgtable( static int write_driver_ver_to_cfgtable(CfgTable_struct __iomem *cfgtable)
CfgTable_struct __iomem *cfgtable)
{ {
char *driver_version; char *driver_version;
int i, size = sizeof(cfgtable->driver_version); int i, size = sizeof(cfgtable->driver_version);
...@@ -4594,8 +4592,8 @@ static __devinit int write_driver_ver_to_cfgtable( ...@@ -4594,8 +4592,8 @@ static __devinit int write_driver_ver_to_cfgtable(
return 0; return 0;
} }
static __devinit void read_driver_ver_from_cfgtable( static void read_driver_ver_from_cfgtable(CfgTable_struct __iomem *cfgtable,
CfgTable_struct __iomem *cfgtable, unsigned char *driver_ver) unsigned char *driver_ver)
{ {
int i; int i;
...@@ -4603,8 +4601,7 @@ static __devinit void read_driver_ver_from_cfgtable( ...@@ -4603,8 +4601,7 @@ static __devinit void read_driver_ver_from_cfgtable(
driver_ver[i] = readb(&cfgtable->driver_version[i]); driver_ver[i] = readb(&cfgtable->driver_version[i]);
} }
static __devinit int controller_reset_failed( static int controller_reset_failed(CfgTable_struct __iomem *cfgtable)
CfgTable_struct __iomem *cfgtable)
{ {
char *driver_ver, *old_driver_ver; char *driver_ver, *old_driver_ver;
...@@ -4627,7 +4624,7 @@ static __devinit int controller_reset_failed( ...@@ -4627,7 +4624,7 @@ static __devinit int controller_reset_failed(
/* This does a hard reset of the controller using PCI power management /* This does a hard reset of the controller using PCI power management
* states or using the doorbell register. */ * states or using the doorbell register. */
static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev) static int cciss_kdump_hard_reset_controller(struct pci_dev *pdev)
{ {
u64 cfg_offset; u64 cfg_offset;
u32 cfg_base_addr; u32 cfg_base_addr;
...@@ -4772,7 +4769,7 @@ static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev) ...@@ -4772,7 +4769,7 @@ static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev)
return rc; return rc;
} }
static __devinit int cciss_init_reset_devices(struct pci_dev *pdev) static int cciss_init_reset_devices(struct pci_dev *pdev)
{ {
int rc, i; int rc, i;
...@@ -4806,7 +4803,7 @@ static __devinit int cciss_init_reset_devices(struct pci_dev *pdev) ...@@ -4806,7 +4803,7 @@ static __devinit int cciss_init_reset_devices(struct pci_dev *pdev)
return 0; return 0;
} }
static __devinit int cciss_allocate_cmd_pool(ctlr_info_t *h) static int cciss_allocate_cmd_pool(ctlr_info_t *h)
{ {
h->cmd_pool_bits = kmalloc(BITS_TO_LONGS(h->nr_cmds) * h->cmd_pool_bits = kmalloc(BITS_TO_LONGS(h->nr_cmds) *
sizeof(unsigned long), GFP_KERNEL); sizeof(unsigned long), GFP_KERNEL);
...@@ -4825,7 +4822,7 @@ static __devinit int cciss_allocate_cmd_pool(ctlr_info_t *h) ...@@ -4825,7 +4822,7 @@ static __devinit int cciss_allocate_cmd_pool(ctlr_info_t *h)
return 0; return 0;
} }
static __devinit int cciss_allocate_scatterlists(ctlr_info_t *h) static int cciss_allocate_scatterlists(ctlr_info_t *h)
{ {
int i; int i;
...@@ -4893,7 +4890,7 @@ static int cciss_request_irq(ctlr_info_t *h, ...@@ -4893,7 +4890,7 @@ static int cciss_request_irq(ctlr_info_t *h,
return -1; return -1;
} }
static int __devinit cciss_kdump_soft_reset(ctlr_info_t *h) static int cciss_kdump_soft_reset(ctlr_info_t *h)
{ {
if (cciss_send_reset(h, CTLR_LUNID, CCISS_RESET_TYPE_CONTROLLER)) { if (cciss_send_reset(h, CTLR_LUNID, CCISS_RESET_TYPE_CONTROLLER)) {
dev_warn(&h->pdev->dev, "Resetting array controller failed.\n"); dev_warn(&h->pdev->dev, "Resetting array controller failed.\n");
...@@ -4952,8 +4949,7 @@ static void cciss_undo_allocations_after_kdump_soft_reset(ctlr_info_t *h) ...@@ -4952,8 +4949,7 @@ static void cciss_undo_allocations_after_kdump_soft_reset(ctlr_info_t *h)
* stealing all these major device numbers. * stealing all these major device numbers.
* returns the number of block devices registered. * returns the number of block devices registered.
*/ */
static int __devinit cciss_init_one(struct pci_dev *pdev, static int cciss_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
int i; int i;
int j = 0; int j = 0;
...@@ -5207,7 +5203,7 @@ static void cciss_shutdown(struct pci_dev *pdev) ...@@ -5207,7 +5203,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
free_irq(h->intr[h->intr_mode], h); free_irq(h->intr[h->intr_mode], h);
} }
static int __devinit cciss_enter_simple_mode(struct ctlr_info *h) static int cciss_enter_simple_mode(struct ctlr_info *h)
{ {
u32 trans_support; u32 trans_support;
...@@ -5229,7 +5225,7 @@ static int __devinit cciss_enter_simple_mode(struct ctlr_info *h) ...@@ -5229,7 +5225,7 @@ static int __devinit cciss_enter_simple_mode(struct ctlr_info *h)
} }
static void __devexit cciss_remove_one(struct pci_dev *pdev) static void cciss_remove_one(struct pci_dev *pdev)
{ {
ctlr_info_t *h; ctlr_info_t *h;
int i, j; int i, j;
...@@ -5308,7 +5304,7 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev) ...@@ -5308,7 +5304,7 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
static struct pci_driver cciss_pci_driver = { static struct pci_driver cciss_pci_driver = {
.name = "cciss", .name = "cciss",
.probe = cciss_init_one, .probe = cciss_init_one,
.remove = __devexit_p(cciss_remove_one), .remove = cciss_remove_one,
.id_table = cciss_pci_device_id, /* id_table */ .id_table = cciss_pci_device_id, /* id_table */
.shutdown = cciss_shutdown, .shutdown = cciss_shutdown,
}; };
......
drivers/block/cpqarray.c
View file @ 8d85fce7
...@@ -320,7 +320,7 @@ static void release_io_mem(ctlr_info_t *c) ...@@ -320,7 +320,7 @@ static void release_io_mem(ctlr_info_t *c)
c->io_mem_length = 0; c->io_mem_length = 0;
} }
static void __devexit cpqarray_remove_one(int i) static void cpqarray_remove_one(int i)
{ {
int j; int j;
char buff[4]; char buff[4];
...@@ -352,7 +352,7 @@ static void __devexit cpqarray_remove_one(int i) ...@@ -352,7 +352,7 @@ static void __devexit cpqarray_remove_one(int i)
free_hba(i); free_hba(i);
} }
static void __devexit cpqarray_remove_one_pci (struct pci_dev *pdev) static void cpqarray_remove_one_pci(struct pci_dev *pdev)
{ {
int i; int i;
ctlr_info_t *tmp_ptr; ctlr_info_t *tmp_ptr;
...@@ -377,7 +377,7 @@ static void __devexit cpqarray_remove_one_pci (struct pci_dev *pdev) ...@@ -377,7 +377,7 @@ static void __devexit cpqarray_remove_one_pci (struct pci_dev *pdev)
/* removing an instance that was not removed automatically.. /* removing an instance that was not removed automatically..
* must be an eisa card. * must be an eisa card.
*/ */
static void __devexit cpqarray_remove_one_eisa (int i) static void cpqarray_remove_one_eisa(int i)
{ {
if (hba[i] == NULL) { if (hba[i] == NULL) {
printk(KERN_ERR "cpqarray: controller %d appears to have" printk(KERN_ERR "cpqarray: controller %d appears to have"
...@@ -388,7 +388,7 @@ static void __devexit cpqarray_remove_one_eisa (int i) ...@@ -388,7 +388,7 @@ static void __devexit cpqarray_remove_one_eisa (int i)
} }
/* pdev is NULL for eisa */ /* pdev is NULL for eisa */
static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev) static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
{ {
struct request_queue *q; struct request_queue *q;
int j; int j;
...@@ -505,8 +505,8 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev) ...@@ -505,8 +505,8 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
return -1; return -1;
} }
static int __devinit cpqarray_init_one( struct pci_dev *pdev, static int cpqarray_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int i; int i;
...@@ -536,7 +536,7 @@ static int __devinit cpqarray_init_one( struct pci_dev *pdev, ...@@ -536,7 +536,7 @@ static int __devinit cpqarray_init_one( struct pci_dev *pdev,
static struct pci_driver cpqarray_pci_driver = { static struct pci_driver cpqarray_pci_driver = {
.name = "cpqarray", .name = "cpqarray",
.probe = cpqarray_init_one, .probe = cpqarray_init_one,
.remove = __devexit_p(cpqarray_remove_one_pci), .remove = cpqarray_remove_one_pci,
.id_table = cpqarray_pci_device_id, .id_table = cpqarray_pci_device_id,
}; };
...@@ -742,7 +742,7 @@ __setup("smart2=", cpqarray_setup); ...@@ -742,7 +742,7 @@ __setup("smart2=", cpqarray_setup);
/* /*
* Find an EISA controller's signature. Set up an hba if we find it. * Find an EISA controller's signature. Set up an hba if we find it.
*/ */
static int __devinit cpqarray_eisa_detect(void) static int cpqarray_eisa_detect(void)
{ {
int i=0, j; int i=0, j;
__u32 board_id; __u32 board_id;
......
drivers/block/nvme.c
View file @ 8d85fce7
...@@ -975,8 +975,8 @@ static int queue_request_irq(struct nvme_dev *dev, struct nvme_queue *nvmeq, ...@@ -975,8 +975,8 @@ static int queue_request_irq(struct nvme_dev *dev, struct nvme_queue *nvmeq,
IRQF_DISABLED | IRQF_SHARED, name, nvmeq); IRQF_DISABLED | IRQF_SHARED, name, nvmeq);
} }
static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev, static struct nvme_queue *nvme_create_queue(struct nvme_dev *dev, int qid,
int qid, int cq_size, int vector) int cq_size, int vector)
{ {
int result; int result;
struct nvme_queue *nvmeq = nvme_alloc_queue(dev, qid, cq_size, vector); struct nvme_queue *nvmeq = nvme_alloc_queue(dev, qid, cq_size, vector);
...@@ -1011,7 +1011,7 @@ static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev, ...@@ -1011,7 +1011,7 @@ static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,
return ERR_PTR(result); return ERR_PTR(result);
} }
static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev) static int nvme_configure_admin_queue(struct nvme_dev *dev)
{ {
int result = 0; int result = 0;
u32 aqa; u32 aqa;
...@@ -1408,7 +1408,7 @@ static int set_queue_count(struct nvme_dev *dev, int count) ...@@ -1408,7 +1408,7 @@ static int set_queue_count(struct nvme_dev *dev, int count)
return min(result & 0xffff, result >> 16) + 1; return min(result & 0xffff, result >> 16) + 1;
} }
static int __devinit nvme_setup_io_queues(struct nvme_dev *dev) static int nvme_setup_io_queues(struct nvme_dev *dev)
{ {
int result, cpu, i, nr_io_queues, db_bar_size, q_depth; int result, cpu, i, nr_io_queues, db_bar_size, q_depth;
...@@ -1481,7 +1481,7 @@ static void nvme_free_queues(struct nvme_dev *dev) ...@@ -1481,7 +1481,7 @@ static void nvme_free_queues(struct nvme_dev *dev)
nvme_free_queue(dev, i); nvme_free_queue(dev, i);
} }
static int __devinit nvme_dev_add(struct nvme_dev *dev) static int nvme_dev_add(struct nvme_dev *dev)
{ {
int res, nn, i; int res, nn, i;
struct nvme_ns *ns, *next; struct nvme_ns *ns, *next;
...@@ -1619,8 +1619,7 @@ static void nvme_release_instance(struct nvme_dev *dev) ...@@ -1619,8 +1619,7 @@ static void nvme_release_instance(struct nvme_dev *dev)
spin_unlock(&dev_list_lock); spin_unlock(&dev_list_lock);
} }
static int __devinit nvme_probe(struct pci_dev *pdev, static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int bars, result = -ENOMEM; int bars, result = -ENOMEM;
struct nvme_dev *dev; struct nvme_dev *dev;
...@@ -1702,7 +1701,7 @@ static int __devinit nvme_probe(struct pci_dev *pdev, ...@@ -1702,7 +1701,7 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
return result; return result;
} }
static void __devexit nvme_remove(struct pci_dev *pdev) static void nvme_remove(struct pci_dev *pdev)
{ {
struct nvme_dev *dev = pci_get_drvdata(pdev); struct nvme_dev *dev = pci_get_drvdata(pdev);
nvme_dev_remove(dev); nvme_dev_remove(dev);
...@@ -1747,7 +1746,7 @@ static struct pci_driver nvme_driver = { ...@@ -1747,7 +1746,7 @@ static struct pci_driver nvme_driver = {
.name = "nvme", .name = "nvme",
.id_table = nvme_id_table, .id_table = nvme_id_table,
.probe = nvme_probe, .probe = nvme_probe,
.remove = __devexit_p(nvme_remove), .remove = nvme_remove,
.suspend = nvme_suspend, .suspend = nvme_suspend,
.resume = nvme_resume, .resume = nvme_resume,
.err_handler = &nvme_err_handler, .err_handler = &nvme_err_handler,
......
drivers/block/ps3disk.c
View file @ 8d85fce7
...@@ -401,7 +401,7 @@ static unsigned long ps3disk_mask; ...@@ -401,7 +401,7 @@ static unsigned long ps3disk_mask;
static DEFINE_MUTEX(ps3disk_mask_mutex); static DEFINE_MUTEX(ps3disk_mask_mutex);
static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) static int ps3disk_probe(struct ps3_system_bus_device *_dev)
{ {
struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core); struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
struct ps3disk_private *priv; struct ps3disk_private *priv;
......
drivers/block/ps3vram.c
View file @ 8d85fce7
...@@ -536,7 +536,7 @@ static const struct file_operations ps3vram_proc_fops = { ...@@ -536,7 +536,7 @@ static const struct file_operations ps3vram_proc_fops = {
.release = single_release, .release = single_release,
}; };
static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev) static void ps3vram_proc_init(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
...@@ -618,7 +618,7 @@ static void ps3vram_make_request(struct request_queue *q, struct bio *bio) ...@@ -618,7 +618,7 @@ static void ps3vram_make_request(struct request_queue *q, struct bio *bio)
} while (bio); } while (bio);
} }
static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) static int ps3vram_probe(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv; struct ps3vram_priv *priv;
int error, status; int error, status;
......
drivers/block/sunvdc.c
View file @ 8d85fce7
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define DRV_MODULE_VERSION "1.0" #define DRV_MODULE_VERSION "1.0"
#define DRV_MODULE_RELDATE "June 25, 2007" #define DRV_MODULE_RELDATE "June 25, 2007"
static char version[] __devinitdata = static char version[] =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
MODULE_DESCRIPTION("Sun LDOM virtual disk client driver"); MODULE_DESCRIPTION("Sun LDOM virtual disk client driver");
...@@ -592,7 +592,7 @@ static int generic_request(struct vdc_port *port, u8 op, void *buf, int len) ...@@ -592,7 +592,7 @@ static int generic_request(struct vdc_port *port, u8 op, void *buf, int len)
return err; return err;
} }
static int __devinit vdc_alloc_tx_ring(struct vdc_port *port) static int vdc_alloc_tx_ring(struct vdc_port *port)
{ {
struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_TX_RING]; struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_TX_RING];
unsigned long len, entry_size; unsigned long len, entry_size;
...@@ -725,7 +725,7 @@ static struct vio_driver_ops vdc_vio_ops = { ...@@ -725,7 +725,7 @@ static struct vio_driver_ops vdc_vio_ops = {
.handshake_complete = vdc_handshake_complete, .handshake_complete = vdc_handshake_complete,
}; };
static void __devinit print_version(void) static void print_version(void)
{ {
static int version_printed; static int version_printed;
...@@ -733,8 +733,7 @@ static void __devinit print_version(void) ...@@ -733,8 +733,7 @@ static void __devinit print_version(void)
printk(KERN_INFO "%s", version); printk(KERN_INFO "%s", version);
} }
static int __devinit vdc_port_probe(struct vio_dev *vdev, static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
const struct vio_device_id *id)
{ {
struct mdesc_handle *hp; struct mdesc_handle *hp;
struct vdc_port *port; struct vdc_port *port;
......
drivers/block/swim.c
View file @ 8d85fce7
...@@ -788,8 +788,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data) ...@@ -788,8 +788,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
return get_disk(swd->unit[drive].disk); return get_disk(swd->unit[drive].disk);
} }
static int __devinit swim_add_floppy(struct swim_priv *swd, static int swim_add_floppy(struct swim_priv *swd, enum drive_location location)
enum drive_location location)
{ {
struct floppy_state *fs = &swd->unit[swd->floppy_count]; struct floppy_state *fs = &swd->unit[swd->floppy_count];
struct swim __iomem *base = swd->base; struct swim __iomem *base = swd->base;
...@@ -812,7 +811,7 @@ static int __devinit swim_add_floppy(struct swim_priv *swd, ...@@ -812,7 +811,7 @@ static int __devinit swim_add_floppy(struct swim_priv *swd,
return 0; return 0;
} }
static int __devinit swim_floppy_init(struct swim_priv *swd) static int swim_floppy_init(struct swim_priv *swd)
{ {
int err; int err;
int drive; int drive;
...@@ -875,7 +874,7 @@ static int __devinit swim_floppy_init(struct swim_priv *swd) ...@@ -875,7 +874,7 @@ static int __devinit swim_floppy_init(struct swim_priv *swd)
return err; return err;
} }
static int __devinit swim_probe(struct platform_device *dev) static int swim_probe(struct platform_device *dev)
{ {
struct resource *res; struct resource *res;
struct swim __iomem *swim_base; struct swim __iomem *swim_base;
...@@ -936,7 +935,7 @@ static int __devinit swim_probe(struct platform_device *dev) ...@@ -936,7 +935,7 @@ static int __devinit swim_probe(struct platform_device *dev)
return ret; return ret;
} }
static int __devexit swim_remove(struct platform_device *dev) static int swim_remove(struct platform_device *dev)
{ {
struct swim_priv *swd = platform_get_drvdata(dev); struct swim_priv *swd = platform_get_drvdata(dev);
int drive; int drive;
...@@ -972,7 +971,7 @@ static int __devexit swim_remove(struct platform_device *dev) ...@@ -972,7 +971,7 @@ static int __devexit swim_remove(struct platform_device *dev)
static struct platform_driver swim_driver = { static struct platform_driver swim_driver = {
.probe = swim_probe, .probe = swim_probe,
.remove = __devexit_p(swim_remove), .remove = swim_remove,
.driver = { .driver = {
.name = CARDNAME, .name = CARDNAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/block/swim3.c
View file @ 8d85fce7
...@@ -1194,7 +1194,8 @@ static int swim3_add_device(struct macio_dev *mdev, int index) ...@@ -1194,7 +1194,8 @@ static int swim3_add_device(struct macio_dev *mdev, int index)
return rc; return rc;
} }
static int __devinit swim3_attach(struct macio_dev *mdev, const struct of_device_id *match) static int swim3_attach(struct macio_dev *mdev,
const struct of_device_id *match)
{ {
struct gendisk *disk; struct gendisk *disk;
int index, rc; int index, rc;
......
drivers/block/umem.c
View file @ 8d85fce7
...@@ -789,8 +789,7 @@ static const struct block_device_operations mm_fops = { ...@@ -789,8 +789,7 @@ static const struct block_device_operations mm_fops = {
.revalidate_disk = mm_revalidate, .revalidate_disk = mm_revalidate,
}; };
static int __devinit mm_pci_probe(struct pci_dev *dev, static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int ret = -ENODEV; int ret = -ENODEV;
struct cardinfo *card = &cards[num_cards]; struct cardinfo *card = &cards[num_cards];
......
drivers/block/virtio_blk.c
View file @ 8d85fce7
...@@ -696,7 +696,7 @@ static const struct device_attribute dev_attr_cache_type_rw = ...@@ -696,7 +696,7 @@ static const struct device_attribute dev_attr_cache_type_rw =
__ATTR(cache_type, S_IRUGO|S_IWUSR, __ATTR(cache_type, S_IRUGO|S_IWUSR,
virtblk_cache_type_show, virtblk_cache_type_store); virtblk_cache_type_show, virtblk_cache_type_store);
static int __devinit virtblk_probe(struct virtio_device *vdev) static int virtblk_probe(struct virtio_device *vdev)
{ {
struct virtio_blk *vblk; struct virtio_blk *vblk;
struct request_queue *q; struct request_queue *q;
...@@ -885,7 +885,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) ...@@ -885,7 +885,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
return err; return err;
} }
static void __devexit virtblk_remove(struct virtio_device *vdev) static void virtblk_remove(struct virtio_device *vdev)
{ {
struct virtio_blk *vblk = vdev->priv; struct virtio_blk *vblk = vdev->priv;
int index = vblk->index; int index = vblk->index;
...@@ -961,19 +961,14 @@ static unsigned int features[] = { ...@@ -961,19 +961,14 @@ static unsigned int features[] = {
VIRTIO_BLK_F_WCE, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_CONFIG_WCE VIRTIO_BLK_F_WCE, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_CONFIG_WCE
}; };
/* static struct virtio_driver virtio_blk = {
* virtio_blk causes spurious section mismatch warning by
* simultaneously referring to a __devinit and a __devexit function.
* Use __refdata to avoid this warning.
*/
static struct virtio_driver __refdata virtio_blk = {
.feature_table = features, .feature_table = features,
.feature_table_size = ARRAY_SIZE(features), .feature_table_size = ARRAY_SIZE(features),
.driver.name = KBUILD_MODNAME, .driver.name = KBUILD_MODNAME,
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,
.id_table = id_table, .id_table = id_table,
.probe = virtblk_probe, .probe = virtblk_probe,
.remove = __devexit_p(virtblk_remove), .remove = virtblk_remove,
.config_changed = virtblk_config_changed, .config_changed = virtblk_config_changed,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.freeze = virtblk_freeze, .freeze = virtblk_freeze,
......
drivers/block/xsysace.c
View file @ 8d85fce7
...@@ -961,7 +961,7 @@ static const struct block_device_operations ace_fops = { ...@@ -961,7 +961,7 @@ static const struct block_device_operations ace_fops = {
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* SystemACE device setup/teardown code * SystemACE device setup/teardown code
*/ */
static int __devinit ace_setup(struct ace_device *ace) static int ace_setup(struct ace_device *ace)
{ {
u16 version; u16 version;
u16 val; u16 val;
...@@ -1074,7 +1074,7 @@ static int __devinit ace_setup(struct ace_device *ace) ...@@ -1074,7 +1074,7 @@ static int __devinit ace_setup(struct ace_device *ace)
return -ENOMEM; return -ENOMEM;
} }
static void __devexit ace_teardown(struct ace_device *ace) static void ace_teardown(struct ace_device *ace)
{ {
if (ace->gd) { if (ace->gd) {
del_gendisk(ace->gd); del_gendisk(ace->gd);
...@@ -1092,9 +1092,8 @@ static void __devexit ace_teardown(struct ace_device *ace) ...@@ -1092,9 +1092,8 @@ static void __devexit ace_teardown(struct ace_device *ace)
iounmap(ace->baseaddr); iounmap(ace->baseaddr);
} }
static int __devinit static int ace_alloc(struct device *dev, int id, resource_size_t physaddr,
ace_alloc(struct device *dev, int id, resource_size_t physaddr, int irq, int bus_width)
int irq, int bus_width)
{ {
struct ace_device *ace; struct ace_device *ace;
int rc; int rc;
...@@ -1135,7 +1134,7 @@ ace_alloc(struct device *dev, int id, resource_size_t physaddr, ...@@ -1135,7 +1134,7 @@ ace_alloc(struct device *dev, int id, resource_size_t physaddr,
return rc; return rc;
} }
static void __devexit ace_free(struct device *dev) static void ace_free(struct device *dev)
{ {
struct ace_device *ace = dev_get_drvdata(dev); struct ace_device *ace = dev_get_drvdata(dev);
dev_dbg(dev, "ace_free(%p)\n", dev); dev_dbg(dev, "ace_free(%p)\n", dev);
...@@ -1151,7 +1150,7 @@ static void __devexit ace_free(struct device *dev) ...@@ -1151,7 +1150,7 @@ static void __devexit ace_free(struct device *dev)
* Platform Bus Support * Platform Bus Support
*/ */
static int __devinit ace_probe(struct platform_device *dev) static int ace_probe(struct platform_device *dev)
{ {
resource_size_t physaddr = 0; resource_size_t physaddr = 0;
int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */ int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */
...@@ -1182,7 +1181,7 @@ static int __devinit ace_probe(struct platform_device *dev) ...@@ -1182,7 +1181,7 @@ static int __devinit ace_probe(struct platform_device *dev)
/* /*
* Platform bus remove() method * Platform bus remove() method
*/ */
static int __devexit ace_remove(struct platform_device *dev) static int ace_remove(struct platform_device *dev)
{ {
ace_free(&dev->dev); ace_free(&dev->dev);
return 0; return 0;
...@@ -1190,7 +1189,7 @@ static int __devexit ace_remove(struct platform_device *dev) ...@@ -1190,7 +1189,7 @@ static int __devexit ace_remove(struct platform_device *dev)
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
/* Match table for of_platform binding */ /* Match table for of_platform binding */
static const struct of_device_id ace_of_match[] __devinitconst = { static const struct of_device_id ace_of_match[] = {
{ .compatible = "xlnx,opb-sysace-1.00.b", }, { .compatible = "xlnx,opb-sysace-1.00.b", },
{ .compatible = "xlnx,opb-sysace-1.00.c", }, { .compatible = "xlnx,opb-sysace-1.00.c", },
{ .compatible = "xlnx,xps-sysace-1.00.a", }, { .compatible = "xlnx,xps-sysace-1.00.a", },
...@@ -1204,7 +1203,7 @@ MODULE_DEVICE_TABLE(of, ace_of_match); ...@@ -1204,7 +1203,7 @@ MODULE_DEVICE_TABLE(of, ace_of_match);
static struct platform_driver ace_platform_driver = { static struct platform_driver ace_platform_driver = {
.probe = ace_probe, .probe = ace_probe,
.remove = __devexit_p(ace_remove), .remove = ace_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "xsysace", .name = "xsysace",
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7