aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mvsas
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 16:08:55 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:01 -0500
commit6f039790510fd630ff348efe8c4802dbaa041fba (patch)
treebf99ab35c78f689a40f3057537209be5f7ca88d6 /drivers/scsi/mvsas
parent48c68c4f1b542444f175a9e136febcecf3e704d8 (diff)
Drivers: scsi: 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: Adam Radford <linuxraid@lsi.com> Cc: "James E.J. Bottomley" <JBottomley@parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/mvsas')
-rw-r--r--drivers/scsi/mvsas/mv_64xx.c8
-rw-r--r--drivers/scsi/mvsas/mv_94xx.c7
-rw-r--r--drivers/scsi/mvsas/mv_chips.h2
-rw-r--r--drivers/scsi/mvsas/mv_init.c19
-rw-r--r--drivers/scsi/mvsas/mv_sas.c4
-rw-r--r--drivers/scsi/mvsas/mv_sas.h4
6 files changed, 21 insertions, 23 deletions
diff --git a/drivers/scsi/mvsas/mv_64xx.c b/drivers/scsi/mvsas/mv_64xx.c
index 8ba47229049f..8bb06995adfb 100644
--- a/drivers/scsi/mvsas/mv_64xx.c
+++ b/drivers/scsi/mvsas/mv_64xx.c
@@ -41,7 +41,7 @@ static void mvs_64xx_detect_porttype(struct mvs_info *mvi, int i)
41 phy->phy_type |= PORT_TYPE_SATA; 41 phy->phy_type |= PORT_TYPE_SATA;
42} 42}
43 43
44static void __devinit mvs_64xx_enable_xmt(struct mvs_info *mvi, int phy_id) 44static void mvs_64xx_enable_xmt(struct mvs_info *mvi, int phy_id)
45{ 45{
46 void __iomem *regs = mvi->regs; 46 void __iomem *regs = mvi->regs;
47 u32 tmp; 47 u32 tmp;
@@ -54,7 +54,7 @@ static void __devinit mvs_64xx_enable_xmt(struct mvs_info *mvi, int phy_id)
54 mw32(MVS_PCS, tmp); 54 mw32(MVS_PCS, tmp);
55} 55}
56 56
57static void __devinit mvs_64xx_phy_hacks(struct mvs_info *mvi) 57static void mvs_64xx_phy_hacks(struct mvs_info *mvi)
58{ 58{
59 void __iomem *regs = mvi->regs; 59 void __iomem *regs = mvi->regs;
60 int i; 60 int i;
@@ -156,7 +156,7 @@ void mvs_64xx_clear_srs_irq(struct mvs_info *mvi, u8 reg_set, u8 clear_all)
156 } 156 }
157} 157}
158 158
159static int __devinit mvs_64xx_chip_reset(struct mvs_info *mvi) 159static int mvs_64xx_chip_reset(struct mvs_info *mvi)
160{ 160{
161 void __iomem *regs = mvi->regs; 161 void __iomem *regs = mvi->regs;
162 u32 tmp; 162 u32 tmp;
@@ -250,7 +250,7 @@ static void mvs_64xx_phy_enable(struct mvs_info *mvi, u32 phy_id)
250 } 250 }
251} 251}
252 252
253static int __devinit mvs_64xx_init(struct mvs_info *mvi) 253static int mvs_64xx_init(struct mvs_info *mvi)
254{ 254{
255 void __iomem *regs = mvi->regs; 255 void __iomem *regs = mvi->regs;
256 int i; 256 int i;
diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c
index 7e423e5ad5e1..1e4479f3331a 100644
--- a/drivers/scsi/mvsas/mv_94xx.c
+++ b/drivers/scsi/mvsas/mv_94xx.c
@@ -216,8 +216,7 @@ void set_phy_rate(struct mvs_info *mvi, int phy_id, u8 rate)
216 mvs_write_port_vsr_data(mvi, phy_id, phy_cfg.v); 216 mvs_write_port_vsr_data(mvi, phy_id, phy_cfg.v);
217} 217}
218 218
219static void __devinit 219static void mvs_94xx_config_reg_from_hba(struct mvs_info *mvi, int phy_id)
220mvs_94xx_config_reg_from_hba(struct mvs_info *mvi, int phy_id)
221{ 220{
222 u32 temp; 221 u32 temp;
223 temp = (u32)(*(u32 *)&mvi->hba_info_param.phy_tuning[phy_id]); 222 temp = (u32)(*(u32 *)&mvi->hba_info_param.phy_tuning[phy_id]);
@@ -258,7 +257,7 @@ mvs_94xx_config_reg_from_hba(struct mvs_info *mvi, int phy_id)
258 mvi->hba_info_param.phy_rate[phy_id]); 257 mvi->hba_info_param.phy_rate[phy_id]);
259} 258}
260 259
261static void __devinit mvs_94xx_enable_xmt(struct mvs_info *mvi, int phy_id) 260static void mvs_94xx_enable_xmt(struct mvs_info *mvi, int phy_id)
262{ 261{
263 void __iomem *regs = mvi->regs; 262 void __iomem *regs = mvi->regs;
264 u32 tmp; 263 u32 tmp;
@@ -331,7 +330,7 @@ static void mvs_94xx_phy_enable(struct mvs_info *mvi, u32 phy_id)
331 mvs_write_port_vsr_data(mvi, phy_id, tmp & 0xfd7fffff); 330 mvs_write_port_vsr_data(mvi, phy_id, tmp & 0xfd7fffff);
332} 331}
333 332
334static int __devinit mvs_94xx_init(struct mvs_info *mvi) 333static int mvs_94xx_init(struct mvs_info *mvi)
335{ 334{
336 void __iomem *regs = mvi->regs; 335 void __iomem *regs = mvi->regs;
337 int i; 336 int i;
diff --git a/drivers/scsi/mvsas/mv_chips.h b/drivers/scsi/mvsas/mv_chips.h
index bcc408042cee..8c4479ab49e8 100644
--- a/drivers/scsi/mvsas/mv_chips.h
+++ b/drivers/scsi/mvsas/mv_chips.h
@@ -160,7 +160,7 @@ static inline void mvs_write_port_irq_mask(struct mvs_info *mvi,
160 MVS_P4_INT_MASK, port, val); 160 MVS_P4_INT_MASK, port, val);
161} 161}
162 162
163static inline void __devinit mvs_phy_hacks(struct mvs_info *mvi) 163static inline void mvs_phy_hacks(struct mvs_info *mvi)
164{ 164{
165 u32 tmp; 165 u32 tmp;
166 166
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index cc59dff3810b..ce90d0546cdd 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -96,7 +96,7 @@ static struct sas_domain_function_template mvs_transport_ops = {
96 96
97}; 97};
98 98
99static void __devinit mvs_phy_init(struct mvs_info *mvi, int phy_id) 99static void mvs_phy_init(struct mvs_info *mvi, int phy_id)
100{ 100{
101 struct mvs_phy *phy = &mvi->phy[phy_id]; 101 struct mvs_phy *phy = &mvi->phy[phy_id];
102 struct asd_sas_phy *sas_phy = &phy->sas_phy; 102 struct asd_sas_phy *sas_phy = &phy->sas_phy;
@@ -235,7 +235,7 @@ static irqreturn_t mvs_interrupt(int irq, void *opaque)
235 return IRQ_HANDLED; 235 return IRQ_HANDLED;
236} 236}
237 237
238static int __devinit mvs_alloc(struct mvs_info *mvi, struct Scsi_Host *shost) 238static int mvs_alloc(struct mvs_info *mvi, struct Scsi_Host *shost)
239{ 239{
240 int i = 0, slot_nr; 240 int i = 0, slot_nr;
241 char pool_name[32]; 241 char pool_name[32];
@@ -373,7 +373,7 @@ void mvs_iounmap(void __iomem *regs)
373 iounmap(regs); 373 iounmap(regs);
374} 374}
375 375
376static struct mvs_info *__devinit mvs_pci_alloc(struct pci_dev *pdev, 376static struct mvs_info *mvs_pci_alloc(struct pci_dev *pdev,
377 const struct pci_device_id *ent, 377 const struct pci_device_id *ent,
378 struct Scsi_Host *shost, unsigned int id) 378 struct Scsi_Host *shost, unsigned int id)
379{ 379{
@@ -444,7 +444,7 @@ static int pci_go_64(struct pci_dev *pdev)
444 return rc; 444 return rc;
445} 445}
446 446
447static int __devinit mvs_prep_sas_ha_init(struct Scsi_Host *shost, 447static int mvs_prep_sas_ha_init(struct Scsi_Host *shost,
448 const struct mvs_chip_info *chip_info) 448 const struct mvs_chip_info *chip_info)
449{ 449{
450 int phy_nr, port_nr; unsigned short core_nr; 450 int phy_nr, port_nr; unsigned short core_nr;
@@ -486,7 +486,7 @@ exit_free:
486 486
487} 487}
488 488
489static void __devinit mvs_post_sas_ha_init(struct Scsi_Host *shost, 489static void mvs_post_sas_ha_init(struct Scsi_Host *shost,
490 const struct mvs_chip_info *chip_info) 490 const struct mvs_chip_info *chip_info)
491{ 491{
492 int can_queue, i = 0, j = 0; 492 int can_queue, i = 0, j = 0;
@@ -537,8 +537,7 @@ static void mvs_init_sas_add(struct mvs_info *mvi)
537 memcpy(mvi->sas_addr, &mvi->phy[0].dev_sas_addr, SAS_ADDR_SIZE); 537 memcpy(mvi->sas_addr, &mvi->phy[0].dev_sas_addr, SAS_ADDR_SIZE);
538} 538}
539 539
540static int __devinit mvs_pci_init(struct pci_dev *pdev, 540static int mvs_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent)
541 const struct pci_device_id *ent)
542{ 541{
543 unsigned int rc, nhost = 0; 542 unsigned int rc, nhost = 0;
544 struct mvs_info *mvi; 543 struct mvs_info *mvi;
@@ -645,7 +644,7 @@ err_out_enable:
645 return rc; 644 return rc;
646} 645}
647 646
648static void __devexit mvs_pci_remove(struct pci_dev *pdev) 647static void mvs_pci_remove(struct pci_dev *pdev)
649{ 648{
650 unsigned short core_nr, i = 0; 649 unsigned short core_nr, i = 0;
651 struct sas_ha_struct *sha = pci_get_drvdata(pdev); 650 struct sas_ha_struct *sha = pci_get_drvdata(pdev);
@@ -677,7 +676,7 @@ static void __devexit mvs_pci_remove(struct pci_dev *pdev)
677 return; 676 return;
678} 677}
679 678
680static struct pci_device_id __devinitdata mvs_pci_table[] = { 679static struct pci_device_id mvs_pci_table[] = {
681 { PCI_VDEVICE(MARVELL, 0x6320), chip_6320 }, 680 { PCI_VDEVICE(MARVELL, 0x6320), chip_6320 },
682 { PCI_VDEVICE(MARVELL, 0x6340), chip_6440 }, 681 { PCI_VDEVICE(MARVELL, 0x6340), chip_6440 },
683 { 682 {
@@ -748,7 +747,7 @@ static struct pci_driver mvs_pci_driver = {
748 .name = DRV_NAME, 747 .name = DRV_NAME,
749 .id_table = mvs_pci_table, 748 .id_table = mvs_pci_table,
750 .probe = mvs_pci_init, 749 .probe = mvs_pci_init,
751 .remove = __devexit_p(mvs_pci_remove), 750 .remove = mvs_pci_remove,
752}; 751};
753 752
754static ssize_t 753static ssize_t
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index a3776d6ced60..078c63913b55 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -220,8 +220,8 @@ int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
220 return rc; 220 return rc;
221} 221}
222 222
223void __devinit mvs_set_sas_addr(struct mvs_info *mvi, int port_id, 223void mvs_set_sas_addr(struct mvs_info *mvi, int port_id, u32 off_lo,
224 u32 off_lo, u32 off_hi, u64 sas_addr) 224 u32 off_hi, u64 sas_addr)
225{ 225{
226 u32 lo = (u32)sas_addr; 226 u32 lo = (u32)sas_addr;
227 u32 hi = (u32)(sas_addr>>32); 227 u32 hi = (u32)(sas_addr>>32);
diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h
index da249553858c..2ae77a0394b2 100644
--- a/drivers/scsi/mvsas/mv_sas.h
+++ b/drivers/scsi/mvsas/mv_sas.h
@@ -456,8 +456,8 @@ int mvs_ioremap(struct mvs_info *mvi, int bar, int bar_ex);
456void mvs_phys_reset(struct mvs_info *mvi, u32 phy_mask, int hard); 456void mvs_phys_reset(struct mvs_info *mvi, u32 phy_mask, int hard);
457int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, 457int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
458 void *funcdata); 458 void *funcdata);
459void __devinit mvs_set_sas_addr(struct mvs_info *mvi, int port_id, 459void mvs_set_sas_addr(struct mvs_info *mvi, int port_id, u32 off_lo,
460 u32 off_lo, u32 off_hi, u64 sas_addr); 460 u32 off_hi, u64 sas_addr);
461void mvs_scan_start(struct Scsi_Host *shost); 461void mvs_scan_start(struct Scsi_Host *shost);
462int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time); 462int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);
463int mvs_queue_command(struct sas_task *task, const int num, 463int mvs_queue_command(struct sas_task *task, const int num,