Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
61184519
Commit
61184519
authored
Nov 16, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
500b6959
49ec0f07
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
26 additions
and
23 deletions
+26
-23
drivers/net/eepro100.c
drivers/net/eepro100.c
+1
-1
drivers/pci/names.c
drivers/pci/names.c
+6
-3
drivers/pci/probe.c
drivers/pci/probe.c
+4
-5
drivers/pci/proc.c
drivers/pci/proc.c
+1
-1
drivers/pci/quirks.c
drivers/pci/quirks.c
+1
-1
drivers/pci/setup-irq.c
drivers/pci/setup-irq.c
+1
-1
drivers/pci/setup-res.c
drivers/pci/setup-res.c
+3
-3
drivers/pcmcia/cardbus.c
drivers/pcmcia/cardbus.c
+0
-1
drivers/pcmcia/yenta.c
drivers/pcmcia/yenta.c
+1
-1
drivers/usb/core/hcd-pci.c
drivers/usb/core/hcd-pci.c
+2
-2
include/linux/device.h
include/linux/device.h
+6
-3
include/linux/pci.h
include/linux/pci.h
+0
-1
No files found.
drivers/net/eepro100.c
View file @
61184519
...
...
@@ -734,7 +734,7 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
if
(
eeprom
[
3
]
&
0x0100
)
product
=
"OEM i82557/i82558 10/100 Ethernet"
;
else
product
=
pdev
->
name
;
product
=
pdev
->
dev
.
name
;
printk
(
KERN_INFO
"%s: %s, "
,
dev
->
name
,
product
);
...
...
drivers/pci/names.c
View file @
61184519
...
...
@@ -56,7 +56,7 @@ void __devinit pci_name_device(struct pci_dev *dev)
{
const
struct
pci_vendor_info
*
vendor_p
=
pci_vendor_list
;
int
i
=
VENDORS
;
char
*
name
=
dev
->
name
;
char
*
name
=
dev
->
dev
.
name
;
do
{
if
(
vendor_p
->
vendor
==
dev
->
vendor
)
...
...
@@ -80,12 +80,15 @@ void __devinit pci_name_device(struct pci_dev *dev)
}
/* Ok, found the vendor, but unknown device */
sprintf
(
name
,
"PCI device %04x:%04x (%s)"
,
dev
->
vendor
,
dev
->
device
,
vendor_p
->
name
);
sprintf
(
name
,
"PCI device %04x:%04x (%."
DEVICE_NAME_HALF
"s)"
,
dev
->
vendor
,
dev
->
device
,
vendor_p
->
name
);
return
;
/* Full match */
match_device:
{
char
*
n
=
name
+
sprintf
(
name
,
"%s %s"
,
vendor_p
->
name
,
device_p
->
name
);
char
*
n
=
name
+
sprintf
(
name
,
"%."
DEVICE_NAME_HALF
"s %."
DEVICE_NAME_HALF
"s"
,
vendor_p
->
name
,
device_p
->
name
);
int
nr
=
device_p
->
seen
+
1
;
device_p
->
seen
=
nr
;
if
(
nr
>
1
)
...
...
drivers/pci/probe.c
View file @
61184519
...
...
@@ -52,7 +52,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
for
(
pos
=
0
;
pos
<
howmany
;
pos
=
next
)
{
next
=
pos
+
1
;
res
=
&
dev
->
resource
[
pos
];
res
->
name
=
dev
->
name
;
res
->
name
=
dev
->
dev
.
name
;
reg
=
PCI_BASE_ADDRESS_0
+
(
pos
<<
2
);
pci_read_config_dword
(
dev
,
reg
,
&
l
);
pci_write_config_dword
(
dev
,
reg
,
~
0
);
...
...
@@ -112,7 +112,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
sz
=
pci_size
(
sz
,
PCI_ROM_ADDRESS_MASK
);
res
->
end
=
res
->
start
+
(
unsigned
long
)
sz
;
}
res
->
name
=
dev
->
name
;
res
->
name
=
dev
->
dev
.
name
;
}
}
...
...
@@ -129,7 +129,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
return
;
if
(
dev
->
transparent
)
{
printk
(
"Transparent bridge - %s
\n
"
,
dev
->
name
);
printk
(
"Transparent bridge - %s
\n
"
,
dev
->
dev
.
name
);
for
(
i
=
0
;
i
<
PCI_BUS_NUM_RESOURCES
;
i
++
)
child
->
resource
[
i
]
=
child
->
parent
->
resource
[
i
];
return
;
...
...
@@ -355,7 +355,7 @@ int pci_setup_device(struct pci_dev * dev)
u32
class
;
sprintf
(
dev
->
slot_name
,
"%02x:%02x.%d"
,
dev
->
bus
->
number
,
PCI_SLOT
(
dev
->
devfn
),
PCI_FUNC
(
dev
->
devfn
));
sprintf
(
dev
->
name
,
"PCI device %04x:%04x"
,
dev
->
vendor
,
dev
->
device
);
sprintf
(
dev
->
dev
.
name
,
"PCI device %04x:%04x"
,
dev
->
vendor
,
dev
->
device
);
INIT_LIST_HEAD
(
&
dev
->
pools
);
pci_read_config_dword
(
dev
,
PCI_CLASS_REVISION
,
&
class
);
...
...
@@ -447,7 +447,6 @@ struct pci_dev * __devinit pci_scan_device(struct pci_dev *temp)
pci_name_device
(
dev
);
/* now put in global tree */
strcpy
(
dev
->
dev
.
name
,
dev
->
name
);
strcpy
(
dev
->
dev
.
bus_id
,
dev
->
slot_name
);
device_register
(
&
dev
->
dev
);
...
...
drivers/pci/proc.c
View file @
61184519
...
...
@@ -511,7 +511,7 @@ static int show_dev_config(struct seq_file *m, void *v)
seq_printf
(
m
,
" %s"
,
class
);
else
seq_printf
(
m
,
" Class %04x"
,
class_rev
>>
16
);
seq_printf
(
m
,
": %s (rev %d).
\n
"
,
dev
->
name
,
class_rev
&
0xff
);
seq_printf
(
m
,
": %s (rev %d).
\n
"
,
dev
->
dev
.
name
,
class_rev
&
0xff
);
if
(
dev
->
irq
)
seq_printf
(
m
,
" IRQ %d.
\n
"
,
dev
->
irq
);
...
...
drivers/pci/quirks.c
View file @
61184519
...
...
@@ -203,7 +203,7 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, unsi
if
(
region
)
{
struct
resource
*
res
=
dev
->
resource
+
nr
;
res
->
name
=
dev
->
name
;
res
->
name
=
dev
->
dev
.
name
;
res
->
start
=
region
;
res
->
end
=
region
+
size
-
1
;
res
->
flags
=
IORESOURCE_IO
;
...
...
drivers/pci/setup-irq.c
View file @
61184519
...
...
@@ -53,7 +53,7 @@ pdev_fixup_irq(struct pci_dev *dev,
irq
=
0
;
dev
->
irq
=
irq
;
DBGC
((
KERN_ERR
"PCI fixup irq: (%s) got %d
\n
"
,
dev
->
name
,
dev
->
irq
));
DBGC
((
KERN_ERR
"PCI fixup irq: (%s) got %d
\n
"
,
dev
->
dev
.
name
,
dev
->
irq
));
/* Always tell the device, so the driver knows what is
the real IRQ to use; the device does not use it. */
...
...
drivers/pci/setup-res.c
View file @
61184519
...
...
@@ -46,11 +46,11 @@ pci_claim_resource(struct pci_dev *dev, int resource)
if
(
err
)
{
printk
(
KERN_ERR
"PCI: Address space collision on "
"region %d of device %s [%lx:%lx]
\n
"
,
resource
,
dev
->
name
,
res
->
start
,
res
->
end
);
resource
,
dev
->
dev
.
name
,
res
->
start
,
res
->
end
);
}
}
else
{
printk
(
KERN_ERR
"PCI: No parent found for region %d "
"of device %s
\n
"
,
resource
,
dev
->
name
);
"of device %s
\n
"
,
resource
,
dev
->
dev
.
name
);
}
return
err
;
...
...
@@ -155,7 +155,7 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
if
(
!
r_align
)
{
printk
(
KERN_WARNING
"PCI: Ignore bogus resource %d "
"[%lx:%lx] of %s
\n
"
,
i
,
r
->
start
,
r
->
end
,
dev
->
name
);
i
,
r
->
start
,
r
->
end
,
dev
->
dev
.
name
);
continue
;
}
r_align
=
(
i
<
PCI_BRIDGE_RESOURCES
)
?
r_align
+
1
:
r
->
start
;
...
...
drivers/pcmcia/cardbus.c
View file @
61184519
...
...
@@ -284,7 +284,6 @@ int cb_alloc(socket_info_t * s)
pci_setup_device
(
dev
);
strcpy
(
dev
->
dev
.
name
,
dev
->
name
);
strcpy
(
dev
->
dev
.
bus_id
,
dev
->
slot_name
);
/* FIXME: Do we need to enable the expansion ROM? */
...
...
drivers/pcmcia/yenta.c
View file @
61184519
...
...
@@ -585,7 +585,7 @@ static void yenta_open_bh(void * data)
/* It's OK to overwrite this now */
INIT_WORK
(
&
socket
->
tq_task
,
yenta_bh
,
socket
);
if
(
!
socket
->
cb_irq
||
request_irq
(
socket
->
cb_irq
,
yenta_interrupt
,
SA_SHIRQ
,
socket
->
dev
->
name
,
socket
))
{
if
(
!
socket
->
cb_irq
||
request_irq
(
socket
->
cb_irq
,
yenta_interrupt
,
SA_SHIRQ
,
socket
->
dev
->
dev
.
name
,
socket
))
{
/* No IRQ or request_irq failed. Poll */
socket
->
cb_irq
=
0
;
/* But zero is a valid IRQ number. */
socket
->
poll_timer
.
function
=
yenta_interrupt_wrapper
;
...
...
drivers/usb/core/hcd-pci.c
View file @
61184519
...
...
@@ -137,7 +137,7 @@ int usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id)
hcd
->
description
=
driver
->
description
;
hcd
->
pdev
=
dev
;
hcd
->
self
.
bus_name
=
dev
->
slot_name
;
hcd
->
product_desc
=
dev
->
name
;
hcd
->
product_desc
=
dev
->
dev
.
name
;
hcd
->
controller
=
&
dev
->
dev
;
if
((
retval
=
hcd_buffer_create
(
hcd
))
!=
0
)
{
...
...
@@ -146,7 +146,7 @@ int usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id)
goto
clean_2
;
}
info
(
"%s @ %s, %s"
,
hcd
->
description
,
dev
->
slot_name
,
dev
->
name
);
info
(
"%s @ %s, %s"
,
hcd
->
description
,
dev
->
slot_name
,
dev
->
dev
.
name
);
#ifndef __sparc__
sprintf
(
buf
,
"%d"
,
dev
->
irq
);
...
...
include/linux/device.h
View file @
61184519
...
...
@@ -23,14 +23,17 @@
#ifndef _DEVICE_H_
#define _DEVICE_H_
#include <linux/types.h>
#include <linux/config.h>
#include <linux/ioport.h>
#include <linux/kobject.h>
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/kobject.h>
#include <linux/spinlock.h>
#include <linux/types.h>
#include <asm/atomic.h>
#define DEVICE_NAME_SIZE 80
#define DEVICE_NAME_SIZE 50
#define DEVICE_NAME_HALF __stringify(20)
/* Less than half to accommodate slop */
#define DEVICE_ID_SIZE 32
#define BUS_ID_SIZE 16
...
...
include/linux/pci.h
View file @
61184519
...
...
@@ -371,7 +371,6 @@ struct pci_dev {
struct
resource
dma_resource
[
DEVICE_COUNT_DMA
];
struct
resource
irq_resource
[
DEVICE_COUNT_IRQ
];
char
name
[
90
];
/* device name */
char
slot_name
[
8
];
/* slot name */
int
active
;
/* ISAPnP: device is active */
int
ro
;
/* ISAPnP: read only */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment