aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm/nicstar.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-01-24 15:49:18 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-01-24 15:49:18 -0500
commita32f7d1ad3744914273c6907204c2ab3b5d496a0 (patch)
tree1c5ae321ee85665707177547c07810ff7e09e1ab /drivers/atm/nicstar.c
parent6b9e50c463efc5c361496ae6a895cc966ff8025b (diff)
parent68d6f84ba0c47e658beff3a4bf0c43acee4b4690 (diff)
Merge branch 'v4l_for_linus' into staging/for_v3.9
* v4l_for_linus: (464 commits) [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures [media] uvcvideo: Cleanup leftovers of partial revert [media] uvcvideo: Return -EACCES when trying to set a read-only control Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struct cred drm/ttm: fix fence locking in ttm_buffer_object_transfer ARM: clps711x: Fix bad merge of clockevents setup ARM: highbank: save and restore L2 cache and GIC on suspend ARM: highbank: add a power request clear ARM: highbank: fix secondary boot and hotplug ARM: highbank: fix typos with hignbank in power request functions ARM: dts: fix highbank cpu mpidr values ARM: dts: add device_type prop to cpu nodes on Calxeda platforms drm/prime: drop reference on imported dma-buf come from gem xen/netfront: improve truesize tracking ARM: mx5: Fix MX53 flexcan2 clock ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array sctp: fix Kconfig bug in default cookie hmac selection EDAC: Cleanup device deregistering path ... Conflicts: drivers/media/pci/dm1105/dm1105.c drivers/media/platform/soc_camera/mx2_camera.c
Diffstat (limited to 'drivers/atm/nicstar.c')
-rw-r--r--drivers/atm/nicstar.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 1c70c45fa044..ed1d2b7f923b 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -121,8 +121,8 @@
121static u32 ns_read_sram(ns_dev * card, u32 sram_address); 121static u32 ns_read_sram(ns_dev * card, u32 sram_address);
122static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value, 122static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value,
123 int count); 123 int count);
124static int __devinit ns_init_card(int i, struct pci_dev *pcidev); 124static int ns_init_card(int i, struct pci_dev *pcidev);
125static void __devinit ns_init_card_error(ns_dev * card, int error); 125static void ns_init_card_error(ns_dev * card, int error);
126static scq_info *get_scq(ns_dev *card, int size, u32 scd); 126static scq_info *get_scq(ns_dev *card, int size, u32 scd);
127static void free_scq(ns_dev *card, scq_info * scq, struct atm_vcc *vcc); 127static void free_scq(ns_dev *card, scq_info * scq, struct atm_vcc *vcc);
128static void push_rxbufs(ns_dev *, struct sk_buff *); 128static void push_rxbufs(ns_dev *, struct sk_buff *);
@@ -180,8 +180,8 @@ MODULE_LICENSE("GPL");
180 180
181/* Functions */ 181/* Functions */
182 182
183static int __devinit nicstar_init_one(struct pci_dev *pcidev, 183static int nicstar_init_one(struct pci_dev *pcidev,
184 const struct pci_device_id *ent) 184 const struct pci_device_id *ent)
185{ 185{
186 static int index = -1; 186 static int index = -1;
187 unsigned int error; 187 unsigned int error;
@@ -200,7 +200,7 @@ err_out:
200 return -ENODEV; 200 return -ENODEV;
201} 201}
202 202
203static void __devexit nicstar_remove_one(struct pci_dev *pcidev) 203static void nicstar_remove_one(struct pci_dev *pcidev)
204{ 204{
205 int i, j; 205 int i, j;
206 ns_dev *card = pci_get_drvdata(pcidev); 206 ns_dev *card = pci_get_drvdata(pcidev);
@@ -262,7 +262,7 @@ static void __devexit nicstar_remove_one(struct pci_dev *pcidev)
262 kfree(card); 262 kfree(card);
263} 263}
264 264
265static struct pci_device_id nicstar_pci_tbl[] __devinitdata = { 265static struct pci_device_id nicstar_pci_tbl[] = {
266 { PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77201), 0 }, 266 { PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77201), 0 },
267 {0,} /* terminate list */ 267 {0,} /* terminate list */
268}; 268};
@@ -273,7 +273,7 @@ static struct pci_driver nicstar_driver = {
273 .name = "nicstar", 273 .name = "nicstar",
274 .id_table = nicstar_pci_tbl, 274 .id_table = nicstar_pci_tbl,
275 .probe = nicstar_init_one, 275 .probe = nicstar_init_one,
276 .remove = __devexit_p(nicstar_remove_one), 276 .remove = nicstar_remove_one,
277}; 277};
278 278
279static int __init nicstar_init(void) 279static int __init nicstar_init(void)
@@ -351,7 +351,7 @@ static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value,
351 spin_unlock_irqrestore(&card->res_lock, flags); 351 spin_unlock_irqrestore(&card->res_lock, flags);
352} 352}
353 353
354static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 354static int ns_init_card(int i, struct pci_dev *pcidev)
355{ 355{
356 int j; 356 int j;
357 struct ns_dev *card = NULL; 357 struct ns_dev *card = NULL;
@@ -821,7 +821,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
821 return error; 821 return error;
822} 822}
823 823
824static void __devinit ns_init_card_error(ns_dev * card, int error) 824static void ns_init_card_error(ns_dev *card, int error)
825{ 825{
826 if (error >= 17) { 826 if (error >= 17) {
827 writel(0x00000000, card->membase + CFG); 827 writel(0x00000000, card->membase + CFG);