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
919ca63f
Commit
919ca63f
authored
Aug 15, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linux-dj.bkbits.net/cpufreq
into home.osdl.org:/home/torvalds/v2.5/linux
parents
d1be4e5f
17318f76
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
49 additions
and
77 deletions
+49
-77
arch/ppc/syslib/of_device.c
arch/ppc/syslib/of_device.c
+0
-2
drivers/ieee1394/nodemgr.c
drivers/ieee1394/nodemgr.c
+0
-34
drivers/ieee1394/pcilynx.c
drivers/ieee1394/pcilynx.c
+1
-3
drivers/macintosh/macio_asic.c
drivers/macintosh/macio_asic.c
+0
-3
drivers/scsi/ide-scsi.c
drivers/scsi/ide-scsi.c
+0
-1
include/linux/pci_ids.h
include/linux/pci_ids.h
+48
-34
No files found.
arch/ppc/syslib/of_device.c
View file @
919ca63f
...
...
@@ -227,8 +227,6 @@ of_platform_device_create(struct device_node *np, const char *bus_id)
dev
->
dev
.
parent
=
NULL
;
dev
->
dev
.
bus
=
&
of_platform_bus_type
;
/* XXX Make something better here ? */
snprintf
(
dev
->
dev
.
name
,
DEVICE_NAME_SIZE
,
"Platform device %s"
,
np
->
name
);
reg
=
(
u32
*
)
get_property
(
np
,
"reg"
,
NULL
);
strlcpy
(
dev
->
dev
.
bus_id
,
bus_id
,
BUS_ID_SIZE
);
...
...
drivers/ieee1394/nodemgr.c
View file @
919ca63f
...
...
@@ -460,21 +460,6 @@ static void nodemgr_remove_node_uds(struct node_entry *ne)
}
static
void
nodemgr_update_ud_names
(
struct
host_info
*
hi
,
struct
node_entry
*
ne
)
{
struct
list_head
*
lh
;
list_for_each
(
lh
,
&
ne
->
device
.
children
)
{
struct
unit_directory
*
ud
;
ud
=
container_of
(
list_to_dev
(
lh
),
struct
unit_directory
,
device
);
snprintf
(
ud
->
device
.
name
,
DEVICE_NAME_SIZE
,
"IEEE-1394 unit directory "
NODE_BUS_FMT
"-%u"
,
NODE_BUS_ARGS
(
hi
->
host
,
ne
->
nodeid
),
ud
->
id
);
}
}
static
void
nodemgr_remove_ne
(
struct
node_entry
*
ne
)
{
struct
device
*
dev
=
&
ne
->
device
;
...
...
@@ -720,9 +705,6 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, quadlet_t busoption
ne
->
device
.
parent
=
&
host
->
device
;
snprintf
(
ne
->
device
.
bus_id
,
BUS_ID_SIZE
,
"%016Lx"
,
(
unsigned
long
long
)(
ne
->
guid
));
snprintf
(
ne
->
device
.
name
,
DEVICE_NAME_SIZE
,
"IEEE-1394 device "
NODE_BUS_FMT
,
NODE_BUS_ARGS
(
host
,
ne
->
nodeid
));
device_register
(
&
ne
->
device
);
...
...
@@ -732,8 +714,6 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, quadlet_t busoption
nodemgr_process_config_rom
(
hi
,
ne
,
busoptions
);
nodemgr_update_ud_names
(
hi
,
ne
);
HPSB_DEBUG
(
"%s added: ID:BUS["
NODE_BUS_FMT
"] GUID[%016Lx]"
,
(
host
->
node_id
==
nodeid
)
?
"Host"
:
"Node"
,
NODE_BUS_ARGS
(
host
,
nodeid
),
(
unsigned
long
long
)
guid
);
...
...
@@ -1312,18 +1292,11 @@ static void nodemgr_update_node(struct node_entry *ne, quadlet_t busoptions,
struct
host_info
*
hi
,
nodeid_t
nodeid
,
unsigned
int
generation
)
{
int
update_ud_names
=
0
;
if
(
ne
->
nodeid
!=
nodeid
)
{
snprintf
(
ne
->
device
.
name
,
DEVICE_NAME_SIZE
,
"IEEE-1394 device "
NODE_BUS_FMT
,
NODE_BUS_ARGS
(
hi
->
host
,
ne
->
nodeid
));
HPSB_DEBUG
(
"Node changed: "
NODE_BUS_FMT
" -> "
NODE_BUS_FMT
,
NODE_BUS_ARGS
(
ne
->
host
,
ne
->
nodeid
),
NODE_BUS_ARGS
(
ne
->
host
,
nodeid
));
ne
->
nodeid
=
nodeid
;
update_ud_names
++
;
}
if
(
ne
->
busopt
.
generation
!=
((
busoptions
>>
4
)
&
0xf
))
{
...
...
@@ -1333,13 +1306,8 @@ static void nodemgr_update_node(struct node_entry *ne, quadlet_t busoptions,
/* This will re-register our unitdir's */
nodemgr_process_config_rom
(
hi
,
ne
,
busoptions
);
update_ud_names
++
;
}
if
(
update_ud_names
)
nodemgr_update_ud_names
(
hi
,
ne
);
/* Since that's done, we can declare this record current */
ne
->
generation
=
generation
;
...
...
@@ -1772,8 +1740,6 @@ static void nodemgr_add_host(struct hpsb_host *host)
sizeof
(
host
->
device
));
host
->
device
.
parent
=
&
host
->
pdev
->
dev
;
snprintf
(
host
->
device
.
bus_id
,
BUS_ID_SIZE
,
"fw-host%d"
,
host
->
id
);
snprintf
(
host
->
device
.
name
,
DEVICE_NAME_SIZE
,
"IEEE-1394 Host %s-%d"
,
host
->
driver
->
name
,
host
->
id
);
sprintf
(
hi
->
daemon_name
,
"knodemgrd_%d"
,
host
->
id
);
...
...
drivers/ieee1394/pcilynx.c
View file @
919ca63f
...
...
@@ -144,9 +144,7 @@ static struct i2c_adapter bit_ops = {
.
id
=
0xAA
,
//FIXME: probably we should get an id in i2c-id.h
.
client_register
=
bit_reg
,
.
client_unregister
=
bit_unreg
,
.
dev
=
{
.
name
=
"PCILynx I2C"
,
},
.
name
=
"PCILynx I2C"
,
};
...
...
drivers/macintosh/macio_asic.c
View file @
919ca63f
...
...
@@ -141,9 +141,6 @@ macio_add_one_device(struct macio_chip *chip, struct device *parent,
dev
->
ofdev
.
dev
.
parent
=
parent
;
dev
->
ofdev
.
dev
.
bus
=
&
macio_bus_type
;
/* XXX Make something better here ? */
snprintf
(
dev
->
ofdev
.
dev
.
name
,
DEVICE_NAME_SIZE
,
"MacIO device %s"
,
np
->
name
);
/* MacIO itself has a different reg, we use it's PCI base */
if
(
np
==
chip
->
of_node
)
{
sprintf
(
dev
->
ofdev
.
dev
.
bus_id
,
"%1d.%08lx:%.8s"
,
chip
->
lbus
.
index
,
...
...
drivers/scsi/ide-scsi.c
View file @
919ca63f
...
...
@@ -948,7 +948,6 @@ static Scsi_Host_Template idescsi_template = {
};
static
struct
device
idescsi_primary
=
{
.
name
=
"Ide-scsi Parent"
,
.
bus_id
=
"ide-scsi"
,
};
static
struct
bus_type
idescsi_emu_bus
=
{
...
...
include/linux/pci_ids.h
View file @
919ca63f
...
...
@@ -209,9 +209,29 @@
#define PCI_DEVICE_ID_ATI_215_LR 0x4c52
#define PCI_DEVICE_ID_ATI_215_LS 0x4c53
#define PCI_DEVICE_ID_ATI_264_LT 0x4c54
/* Radeon M4 */
#define PCI_DEVICE_ID_ATI_RADEON_LE 0x4d45
#define PCI_DEVICE_ID_ATI_RADEON_LF 0x4d46
/* Mach64 VT */
#define PCI_DEVICE_ID_ATI_264VT 0x5654
#define PCI_DEVICE_ID_ATI_264VU 0x5655
#define PCI_DEVICE_ID_ATI_264VV 0x5656
/* Rage128 GL */
#define PCI_DEVICE_ID_ATI_RAGE128_RE 0x5245
#define PCI_DEVICE_ID_ATI_RAGE128_RF 0x5246
#define PCI_DEVICE_ID_ATI_RAGE128_RG 0x534b
#define PCI_DEVICE_ID_ATI_RAGE128_RH 0x534c
#define PCI_DEVICE_ID_ATI_RAGE128_RI 0x534d
/* Rage128 VR */
#define PCI_DEVICE_ID_ATI_RAGE128_RK 0x524b
#define PCI_DEVICE_ID_ATI_RAGE128_RL 0x524c
#define PCI_DEVICE_ID_ATI_RAGE128_RM 0x5345
#define PCI_DEVICE_ID_ATI_RAGE128_RN 0x5346
#define PCI_DEVICE_ID_ATI_RAGE128_RO 0x5347
/* Rage128 M3 */
#define PCI_DEVICE_ID_ATI_RAGE128_LE 0x4c45
#define PCI_DEVICE_ID_ATI_RAGE128_LF 0x4c46
/* Rage128 Pro Ultra */
#define PCI_DEVICE_ID_ATI_RAGE128_U1 0x5446
#define PCI_DEVICE_ID_ATI_RAGE128_U2 0x544C
#define PCI_DEVICE_ID_ATI_RAGE128_U3 0x5452
/* Rage128 Pro GL */
#define PCI_DEVICE_ID_ATI_Rage128_PA 0x5041
#define PCI_DEVICE_ID_ATI_Rage128_PB 0x5042
...
...
@@ -239,75 +259,69 @@
#define PCI_DEVICE_ID_ATI_RAGE128_PV 0x5056
#define PCI_DEVICE_ID_ATI_RAGE128_PW 0x5057
#define PCI_DEVICE_ID_ATI_RAGE128_PX 0x5058
/* Rage128 M4 */
#define PCI_DEVICE_ID_ATI_RADEON_LE 0x4d45
#define PCI_DEVICE_ID_ATI_RADEON_LF 0x4d46
/* Radeon R100 */
#define PCI_DEVICE_ID_ATI_RADEON_QD 0x5144
#define PCI_DEVICE_ID_ATI_RADEON_QE 0x5145
#define PCI_DEVICE_ID_ATI_RADEON_QF 0x5146
#define PCI_DEVICE_ID_ATI_RADEON_QG 0x5147
/* Radeon RV100 (VE) */
#define PCI_DEVICE_ID_ATI_RADEON_QY 0x5159
#define PCI_DEVICE_ID_ATI_RADEON_QZ 0x515a
/* Radeon R200 (8500) */
#define PCI_DEVICE_ID_ATI_RADEON_QL 0x514c
#define PCI_DEVICE_ID_ATI_RADEON_QN 0x514e
#define PCI_DEVICE_ID_ATI_RADEON_QO 0x514f
#define PCI_DEVICE_ID_ATI_RADEON_Ql 0x516c
#define PCI_DEVICE_ID_ATI_RADEON_BB 0x4242
/* Radeon R200 (9100) */
#define PCI_DEVICE_ID_ATI_RADEON_QM 0x514d
/* Radeon RV200 (7500) */
#define PCI_DEVICE_ID_ATI_RADEON_QW 0x5157
#define PCI_DEVICE_ID_ATI_RADEON_QX 0x5158
/* Radeon NV-100 */
#define PCI_DEVICE_ID_ATI_RADEON_N1 0x5159
#define PCI_DEVICE_ID_ATI_RADEON_N2 0x515a
/* Radeon RV100 (VE) */
#define PCI_DEVICE_ID_ATI_RADEON_QY 0x5159
#define PCI_DEVICE_ID_ATI_RADEON_QZ 0x515a
/* Radeon RV250 (9000) */
#define PCI_DEVICE_ID_ATI_RADEON_Id 0x4964
#define PCI_DEVICE_ID_ATI_RADEON_Ie 0x4965
#define PCI_DEVICE_ID_ATI_RADEON_If 0x4966
#define PCI_DEVICE_ID_ATI_RADEON_Ig 0x4967
#define PCI_DEVICE_ID_ATI_RADEON_QM 0x514d
/* Radeon RV280 (9200) */
#define PCI_DEVICE_ID_ATI_RADEON_Y_ 0x5960
/* Radeon R300 (9500) */
#define PCI_DEVICE_ID_ATI_RADEON_AD 0x4144
/* Radeon R300 (9700) */
#define PCI_DEVICE_ID_ATI_RADEON_ND 0x4e44
#define PCI_DEVICE_ID_ATI_RADEON_NE 0x4e45
#define PCI_DEVICE_ID_ATI_RADEON_NF 0x4e46
#define PCI_DEVICE_ID_ATI_RADEON_NG 0x4e47
#define PCI_DEVICE_ID_ATI_RADEON_AE 0x4145
#define PCI_DEVICE_ID_ATI_RADEON_AF 0x4146
/* Radeon R350 (9800) */
#define PCI_DEVICE_ID_ATI_RADEON_NH 0x4e48
#define PCI_DEVICE_ID_ATI_RADEON_NI 0x4e49
/* Radeon RV350 (9600) */
#define PCI_DEVICE_ID_ATI_RADEON_AP 0x4150
#define PCI_DEVICE_ID_ATI_RADEON_AR 0x4152
/* Radeon M6 */
#define PCI_DEVICE_ID_ATI_RADEON_LY 0x4c59
#define PCI_DEVICE_ID_ATI_RADEON_LZ 0x4c5a
/* Radeon M7 */
#define PCI_DEVICE_ID_ATI_RADEON_LW 0x4c57
#define PCI_DEVICE_ID_ATI_RADEON_LX 0x4c58
#define PCI_DEVICE_ID_ATI_RADEON_Ld 0x4964
#define PCI_DEVICE_ID_ATI_RADEON_Le 0x4965
#define PCI_DEVICE_ID_ATI_RADEON_Lf 0x4966
#define PCI_DEVICE_ID_ATI_RADEON_Lg 0x4967
/* Radeon M9 */
#define PCI_DEVICE_ID_ATI_RADEON_Ld 0x4c64
#define PCI_DEVICE_ID_ATI_RADEON_Le 0x4c65
#define PCI_DEVICE_ID_ATI_RADEON_Lf 0x4c66
#define PCI_DEVICE_ID_ATI_RADEON_Lg 0x4c67
/* Radeon */
#define PCI_DEVICE_ID_ATI_RADEON_RA 0x5144
#define PCI_DEVICE_ID_ATI_RADEON_RB 0x5145
#define PCI_DEVICE_ID_ATI_RADEON_RC 0x5146
#define PCI_DEVICE_ID_ATI_RADEON_RD 0x5147
/* Rage128 GL */
#define PCI_DEVICE_ID_ATI_RAGE128_RE 0x5245
#define PCI_DEVICE_ID_ATI_RAGE128_RF 0x5246
#define PCI_DEVICE_ID_ATI_RAGE128_RG 0x534b
#define PCI_DEVICE_ID_ATI_RAGE128_RH 0x534c
#define PCI_DEVICE_ID_ATI_RAGE128_RI 0x534d
/* Rage128 VR */
#define PCI_DEVICE_ID_ATI_RAGE128_RK 0x524b
#define PCI_DEVICE_ID_ATI_RAGE128_RL 0x524c
#define PCI_DEVICE_ID_ATI_RAGE128_RM 0x5345
#define PCI_DEVICE_ID_ATI_RAGE128_RN 0x5346
#define PCI_DEVICE_ID_ATI_RAGE128_RO 0x5347
/* Rage128 M3 */
#define PCI_DEVICE_ID_ATI_RAGE128_LE 0x4c45
#define PCI_DEVICE_ID_ATI_RAGE128_LF 0x4c46
/* Rage128 Pro Ultra */
#define PCI_DEVICE_ID_ATI_RAGE128_U1 0x5446
#define PCI_DEVICE_ID_ATI_RAGE128_U2 0x544C
#define PCI_DEVICE_ID_ATI_RAGE128_U3 0x5452
/* Mach64 VT */
#define PCI_DEVICE_ID_ATI_264VT 0x5654
#define PCI_DEVICE_ID_ATI_264VU 0x5655
#define PCI_DEVICE_ID_ATI_264VV 0x5656
/* RadeonIGP */
#define PCI_DEVICE_ID_ATI_RS100 0xcab0
#define PCI_DEVICE_ID_ATI_RS200 0xcab2
...
...
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