diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:22:10 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 15:05:01 -0800 |
| commit | 349affa1cec548820ba417523000f303527e0c04 (patch) | |
| tree | 21945a74ab236cf2f5e3feaf79fc7cfabb1eff78 /drivers/staging/crystalhd | |
| parent | c42ef5d21fc16e44361893eca333344022ede328 (diff) | |
staging: crystalhd: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/crystalhd')
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_cmds.c | 2 | ||||
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 6 | ||||
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_misc.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c index 8b71131732d8..294f9922c2e7 100644 --- a/drivers/staging/crystalhd/crystalhd_cmds.c +++ b/drivers/staging/crystalhd/crystalhd_cmds.c @@ -951,7 +951,7 @@ enum BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_ * * Called at the time of driver load. */ -enum BC_STATUS __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, +enum BC_STATUS crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, struct crystalhd_adp *adp) { int i = 0; diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index a216dae14eea..de2b0266596b 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -353,7 +353,7 @@ static const struct file_operations chd_dec_fops = { .llseek = noop_llseek, }; -static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp) +static int chd_dec_init_chdev(struct crystalhd_adp *adp) { struct crystalhd_ioctl_data *temp; struct device *dev; @@ -443,7 +443,7 @@ static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp) crystalhd_delete_elem_pool(adp); } -static int __devinit chd_pci_reserve_mem(struct crystalhd_adp *pinfo) +static int chd_pci_reserve_mem(struct crystalhd_adp *pinfo) { int rc; unsigned long bar2 = pci_resource_start(pinfo->pdev, 2); @@ -537,7 +537,7 @@ static void __devexit chd_dec_pci_remove(struct pci_dev *pdev) g_adp_info = NULL; } -static int __devinit chd_dec_pci_probe(struct pci_dev *pdev, +static int chd_dec_pci_probe(struct pci_dev *pdev, const struct pci_device_id *entry) { struct crystalhd_adp *pinfo; diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c index b3a637814a16..a5f109c632dc 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.c +++ b/drivers/staging/crystalhd/crystalhd_misc.c @@ -960,7 +960,7 @@ void crystalhd_destroy_dio_pool(struct crystalhd_adp *adp) * Create general purpose list element pool to hold pending, * and active requests. */ -int __devinit crystalhd_create_elem_pool(struct crystalhd_adp *adp, +int crystalhd_create_elem_pool(struct crystalhd_adp *adp, uint32_t pool_size) { uint32_t i; |