Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53350
b: refs/heads/master
c: bab41e9
h: refs/heads/master
v: v3
  • Loading branch information
Michael Ellerman authored and Greg Kroah-Hartman committed May 3, 2007
1 parent d3b6a95 commit d0f2b76
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 65891215e6b822c368fb3f36abf129ed48af8be0
refs/heads/master: bab41e9be75121c473b00df2ffa33af3c44066a7
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/kernel/pci_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
struct pci_dev *dev;
const char *type;

dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
dev = alloc_pci_dev();
if (!dev)
return NULL;
type = of_get_property(node, "device_type", NULL);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/agp/alpha-agp.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ alpha_core_agp_setup(void)
/*
* Build a fake pci_dev struct
*/
pdev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
pdev = alloc_pci_dev();
if (!pdev)
return -ENOMEM;
pdev->vendor = 0xffff;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/agp/parisc-agp.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ parisc_agp_setup(void __iomem *ioc_hpa, void __iomem *lba_hpa)
struct agp_bridge_data *bridge;
int error = 0;

fake_bridge_dev = kmalloc(sizeof (struct pci_dev), GFP_KERNEL);
fake_bridge_dev = alloc_pci_dev();
if (!fake_bridge_dev) {
error = -ENOMEM;
goto fail;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/pci/hotplug/fakephp.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ static void pci_rescan_bus(const struct pci_bus *bus)
{
unsigned int devfn;
struct pci_dev *dev;
dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
dev = alloc_pci_dev();
if (!dev)
return;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ pci_scan_device(struct pci_bus *bus, int devfn)
if (pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type))
return NULL;

dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
dev = alloc_pci_dev();
if (!dev)
return NULL;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/scsi/megaraid.c
Original file line number Diff line number Diff line change
Expand Up @@ -2088,7 +2088,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
static inline int
make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
{
*pdev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
*pdev = alloc_pci_dev();

if( *pdev == NULL ) return -1;

Expand Down

0 comments on commit d0f2b76

Please sign in to comment.