diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2026-02-25 13:23:04 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2026-02-25 13:23:04 +0200 |
| commit | f09812b85fa6f41058bcc46e70ac406bf9b0493a (patch) | |
| tree | 3c9b679b33a85434ea937b6e74d3be3b6f9629ff /drivers/ipack | |
| parent | 24e2e6581d602f75174010b32bf3e96ec39465ab (diff) | |
| parent | 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f (diff) | |
Merge drm/drm-next into drm-intel-next
Sync with v7.0-rc1 which contains a few treewide changes affecting i915.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/ipack')
| -rw-r--r-- | drivers/ipack/carriers/tpci200.c | 11 | ||||
| -rw-r--r-- | drivers/ipack/devices/ipoctal.c | 2 | ||||
| -rw-r--r-- | drivers/ipack/ipack.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c index cbfdadecb23b..05dcb6675cd6 100644 --- a/drivers/ipack/carriers/tpci200.c +++ b/drivers/ipack/carriers/tpci200.c @@ -209,7 +209,7 @@ static int tpci200_request_irq(struct ipack_device *dev, goto out_unlock; } - slot_irq = kzalloc(sizeof(struct slot_irq), GFP_KERNEL); + slot_irq = kzalloc_obj(struct slot_irq); if (slot_irq == NULL) { dev_err(&dev->dev, "Slot [%d:%d] unable to allocate memory for IRQ !\n", @@ -461,8 +461,7 @@ static int tpci200_install(struct tpci200_board *tpci200) { int res; - tpci200->slots = kcalloc(TPCI200_NB_SLOT, sizeof(struct tpci200_slot), - GFP_KERNEL); + tpci200->slots = kzalloc_objs(struct tpci200_slot, TPCI200_NB_SLOT); if (tpci200->slots == NULL) return -ENOMEM; @@ -487,7 +486,7 @@ static int tpci200_create_device(struct tpci200_board *tpci200, int i) int ret; enum ipack_space space; struct ipack_device *dev = - kzalloc(sizeof(struct ipack_device), GFP_KERNEL); + kzalloc_obj(struct ipack_device); if (!dev) return -ENOMEM; dev->slot = i; @@ -521,11 +520,11 @@ static int tpci200_pci_probe(struct pci_dev *pdev, struct tpci200_board *tpci200; u32 reg32; - tpci200 = kzalloc(sizeof(struct tpci200_board), GFP_KERNEL); + tpci200 = kzalloc_obj(struct tpci200_board); if (!tpci200) return -ENOMEM; - tpci200->info = kzalloc(sizeof(struct tpci200_infos), GFP_KERNEL); + tpci200->info = kzalloc_obj(struct tpci200_infos); if (!tpci200->info) { ret = -ENOMEM; goto err_tpci200; diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c index ba2e9e52d72b..1bbefc6de708 100644 --- a/drivers/ipack/devices/ipoctal.c +++ b/drivers/ipack/devices/ipoctal.c @@ -688,7 +688,7 @@ static int ipoctal_probe(struct ipack_device *dev) int res; struct ipoctal *ipoctal; - ipoctal = kzalloc(sizeof(struct ipoctal), GFP_KERNEL); + ipoctal = kzalloc_obj(struct ipoctal); if (ipoctal == NULL) return -ENOMEM; diff --git a/drivers/ipack/ipack.c b/drivers/ipack/ipack.c index 57d232c909f9..28214f862ab1 100644 --- a/drivers/ipack/ipack.c +++ b/drivers/ipack/ipack.c @@ -203,7 +203,7 @@ struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots, int bus_nr; struct ipack_bus_device *bus; - bus = kzalloc(sizeof(*bus), GFP_KERNEL); + bus = kzalloc_obj(*bus); if (!bus) return NULL; |