diff options
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/gmidi.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/goku_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/inode.c | 6 | ||||
-rw-r--r-- | drivers/usb/gadget/net2280.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/zero.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c index 64554acad63f..31351826f2ba 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c | |||
@@ -1236,7 +1236,7 @@ autoconf_fail: | |||
1236 | 1236 | ||
1237 | 1237 | ||
1238 | /* ok, we made sense of the hardware ... */ | 1238 | /* ok, we made sense of the hardware ... */ |
1239 | dev = kzalloc(sizeof(*dev), SLAB_KERNEL); | 1239 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
1240 | if (!dev) { | 1240 | if (!dev) { |
1241 | return -ENOMEM; | 1241 | return -ENOMEM; |
1242 | } | 1242 | } |
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index a3076da3f4eb..805a9826842d 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c | |||
@@ -1864,7 +1864,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1864 | } | 1864 | } |
1865 | 1865 | ||
1866 | /* alloc, and start init */ | 1866 | /* alloc, and start init */ |
1867 | dev = kmalloc (sizeof *dev, SLAB_KERNEL); | 1867 | dev = kmalloc (sizeof *dev, GFP_KERNEL); |
1868 | if (dev == NULL){ | 1868 | if (dev == NULL){ |
1869 | pr_debug("enomem %s\n", pci_name(pdev)); | 1869 | pr_debug("enomem %s\n", pci_name(pdev)); |
1870 | retval = -ENOMEM; | 1870 | retval = -ENOMEM; |
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index 86924f9cdd7e..3fb1044a4db0 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
@@ -412,7 +412,7 @@ ep_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr) | |||
412 | /* FIXME readahead for O_NONBLOCK and poll(); careful with ZLPs */ | 412 | /* FIXME readahead for O_NONBLOCK and poll(); careful with ZLPs */ |
413 | 413 | ||
414 | value = -ENOMEM; | 414 | value = -ENOMEM; |
415 | kbuf = kmalloc (len, SLAB_KERNEL); | 415 | kbuf = kmalloc (len, GFP_KERNEL); |
416 | if (unlikely (!kbuf)) | 416 | if (unlikely (!kbuf)) |
417 | goto free1; | 417 | goto free1; |
418 | 418 | ||
@@ -456,7 +456,7 @@ ep_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) | |||
456 | /* FIXME writebehind for O_NONBLOCK and poll(), qlen = 1 */ | 456 | /* FIXME writebehind for O_NONBLOCK and poll(), qlen = 1 */ |
457 | 457 | ||
458 | value = -ENOMEM; | 458 | value = -ENOMEM; |
459 | kbuf = kmalloc (len, SLAB_KERNEL); | 459 | kbuf = kmalloc (len, GFP_KERNEL); |
460 | if (!kbuf) | 460 | if (!kbuf) |
461 | goto free1; | 461 | goto free1; |
462 | if (copy_from_user (kbuf, buf, len)) { | 462 | if (copy_from_user (kbuf, buf, len)) { |
@@ -1898,7 +1898,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) | |||
1898 | buf += 4; | 1898 | buf += 4; |
1899 | length -= 4; | 1899 | length -= 4; |
1900 | 1900 | ||
1901 | kbuf = kmalloc (length, SLAB_KERNEL); | 1901 | kbuf = kmalloc (length, GFP_KERNEL); |
1902 | if (!kbuf) | 1902 | if (!kbuf) |
1903 | return -ENOMEM; | 1903 | return -ENOMEM; |
1904 | if (copy_from_user (kbuf, buf, length)) { | 1904 | if (copy_from_user (kbuf, buf, length)) { |
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 0b590831582c..3024c679e38e 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
@@ -2861,7 +2861,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) | |||
2861 | } | 2861 | } |
2862 | 2862 | ||
2863 | /* alloc, and start init */ | 2863 | /* alloc, and start init */ |
2864 | dev = kzalloc (sizeof *dev, SLAB_KERNEL); | 2864 | dev = kzalloc (sizeof *dev, GFP_KERNEL); |
2865 | if (dev == NULL){ | 2865 | if (dev == NULL){ |
2866 | retval = -ENOMEM; | 2866 | retval = -ENOMEM; |
2867 | goto done; | 2867 | goto done; |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 48a09fd89d18..030d87c28c2f 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -2581,7 +2581,7 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv) | |||
2581 | /* UDC_PULLUP_EN gates the chip clock */ | 2581 | /* UDC_PULLUP_EN gates the chip clock */ |
2582 | // OTG_SYSCON_1_REG |= DEV_IDLE_EN; | 2582 | // OTG_SYSCON_1_REG |= DEV_IDLE_EN; |
2583 | 2583 | ||
2584 | udc = kzalloc(sizeof(*udc), SLAB_KERNEL); | 2584 | udc = kzalloc(sizeof(*udc), GFP_KERNEL); |
2585 | if (!udc) | 2585 | if (!udc) |
2586 | return -ENOMEM; | 2586 | return -ENOMEM; |
2587 | 2587 | ||
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 0f809dd68492..40710ea1b490 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c | |||
@@ -1190,7 +1190,7 @@ autoconf_fail: | |||
1190 | 1190 | ||
1191 | 1191 | ||
1192 | /* ok, we made sense of the hardware ... */ | 1192 | /* ok, we made sense of the hardware ... */ |
1193 | dev = kzalloc(sizeof(*dev), SLAB_KERNEL); | 1193 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
1194 | if (!dev) | 1194 | if (!dev) |
1195 | return -ENOMEM; | 1195 | return -ENOMEM; |
1196 | spin_lock_init (&dev->lock); | 1196 | spin_lock_init (&dev->lock); |