hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] Altix: more ioc3 cleanups and locking fixes 

Some "inline" removing that Andrew suggested, removed some locking on
add/remove at this level - we'll let the callees decide.

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pat Gefre 2006-02-28 16:59:09 -08:00 committed by Linus Torvalds
parent 9cff3372bf
commit 15b370c95c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/sn/ioc3.c
View File

@ -62,7 +62,7 @@ static int nic_reset(struct ioc3_driver_data *idd)
return presence; return presence;
} }
static inline int nic_read_bit(struct ioc3_driver_data *idd) static int nic_read_bit(struct ioc3_driver_data *idd)
{ {
int result; int result;
unsigned long flags; unsigned long flags;
@ -77,7 +77,7 @@ static inline int nic_read_bit(struct ioc3_driver_data *idd)
return result; return result;
} }
static inline void nic_write_bit(struct ioc3_driver_data *idd, int bit) static void nic_write_bit(struct ioc3_driver_data *idd, int bit)
{ {
if (bit) if (bit)
writel(mcr_pack(6, 110), &idd->vma->mcr); writel(mcr_pack(6, 110), &idd->vma->mcr);
@ -371,8 +371,7 @@ static void probe_nic(struct ioc3_driver_data *idd)
/* Interrupts */ /* Interrupts */
static inline void static void write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which)
write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which)
{ {
unsigned long flags; unsigned long flags;
@ -735,14 +734,12 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
} }
/* Add this IOC3 to all submodules */ /* Add this IOC3 to all submodules */
read_lock(&ioc3_submodules_lock);
for(id=0;id<IOC3_MAX_SUBMODULES;id++) for(id=0;id<IOC3_MAX_SUBMODULES;id++)
if(ioc3_submodules[id] && ioc3_submodules[id]->probe) { if(ioc3_submodules[id] && ioc3_submodules[id]->probe) {
idd->active[id] = 1; idd->active[id] = 1;
idd->active[id] = !ioc3_submodules[id]->probe idd->active[id] = !ioc3_submodules[id]->probe
(ioc3_submodules[id], idd); (ioc3_submodules[id], idd);
} }
read_unlock(&ioc3_submodules_lock);
printk(KERN_INFO "IOC3 Master Driver loaded for %s\n", pci_name(pdev)); printk(KERN_INFO "IOC3 Master Driver loaded for %s\n", pci_name(pdev));
@ -767,7 +764,6 @@ static void ioc3_remove(struct pci_dev *pdev)
idd = pci_get_drvdata(pdev); idd = pci_get_drvdata(pdev);
/* Remove this IOC3 from all submodules */ /* Remove this IOC3 from all submodules */
read_lock(&ioc3_submodules_lock);
for(id=0;id<IOC3_MAX_SUBMODULES;id++) for(id=0;id<IOC3_MAX_SUBMODULES;id++)
if(idd->active[id]) { if(idd->active[id]) {
if(ioc3_submodules[id] && ioc3_submodules[id]->remove) if(ioc3_submodules[id] && ioc3_submodules[id]->remove)
@ -781,7 +777,6 @@ static void ioc3_remove(struct pci_dev *pdev)
pci_name(pdev)); pci_name(pdev));
idd->active[id] = 0; idd->active[id] = 0;
} }
read_unlock(&ioc3_submodules_lock);
/* Clear and disable all IRQs */ /* Clear and disable all IRQs */
write_ireg(idd, ~0, IOC3_W_IEC); write_ireg(idd, ~0, IOC3_W_IEC);