Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27baee3d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: dwc3: replace %p with %pK"

parents abc46fb4 7db95aed

drivers/net/usb/catc.c

+1 −1
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id 
		f5u011_rxmode(catc, catc->rxmode);

	}

	dev_dbg(dev, "Init done.\n");

	printk(KERN_INFO "%s: %s USB Ethernet at usb-%s-%s, %pM.\n",

	printk(KERN_INFO "%s: %s USB Ethernet at usb-%s-%s, %pKM.\n",

	       netdev->name, (catc->is_f5u011) ? "Belkin F5U011" : "CATC EL1210A NetMate",

	       usbdev->bus->bus_name, usbdev->devpath, netdev->dev_addr);

	usb_set_intfdata(intf, catc);

drivers/net/usb/cdc_ether.c

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf) 
						info->u->bSlaveInterface0);

			if (!info->control || !info->data) {

				dev_dbg(&intf->dev,

					"master #%u/%p slave #%u/%p\n",

					"master #%u/%pK slave #%u/%pK\n",

					info->u->bMasterInterface0,

					info->control,

					info->u->bSlaveInterface0,
@@ -317,7 +317,7 @@ next_desc: 
		info->data = usb_ifnum_to_if(dev->udev, 1);

		if (!info->control || !info->data || info->control != intf) {

			dev_dbg(&intf->dev,

				"rndis: master #0/%p slave #1/%p\n",

				"rndis: master #0/%pK slave #1/%pK\n",

				info->control,

				info->data);

			goto bad_desc;

drivers/net/usb/cdc_mbim.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ next_ndp: 
		/* sanity checking */

		if (((offset + len) > skb_in->len) || (len > ctx->rx_max)) {

			netif_dbg(dev, rx_err, dev->net,

				  "invalid frame detected (ignored) offset[%u]=%u, length=%u, skb=%p\n",

				  "invalid frame detected (ignored) offset[%u]=%u, length=%u, skb=%pK\n",

				  x, offset, len, skb_in);

			if (!x)

				goto err_ndp;

drivers/net/usb/cdc_ncm.c

+2 −2
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ advance: 
			dev_dbg(&intf->dev, "failed to get mac address\n");

			goto error2;

		}

		dev_info(&intf->dev, "MAC-Address: %pM\n", dev->net->dev_addr);

		dev_info(&intf->dev, "MAC-Address: %pKM\n", dev->net->dev_addr);

	}



	/* finish setting up the device specific data */
@@ -1391,7 +1391,7 @@ next_ndp: 
		if (((offset + len) > skb_in->len) ||

				(len > ctx->rx_max) || (len < ETH_HLEN)) {

			netif_dbg(dev, rx_err, dev->net,

				  "invalid frame detected (ignored) offset[%u]=%u, length=%u, skb=%p\n",

				  "invalid frame detected (ignored) offset[%u]=%u, length=%u, skb=%pK\n",

				  x, offset, len, skb_in);

			if (!x)

				goto err_ndp;

drivers/net/usb/dm9601.c

+2 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int dm9601_set_mac_address(struct net_device *net, void *p) 
	struct usbnet *dev = netdev_priv(net);



	if (!is_valid_ether_addr(addr->sa_data)) {

		dev_err(&net->dev, "not setting invalid mac address %pM\n",

		dev_err(&net->dev, "not setting invalid mac address %pKM\n",

								addr->sa_data);

		return -EINVAL;

	}
@@ -394,7 +394,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) 
		memcpy(dev->net->dev_addr, mac, ETH_ALEN);

	else {

		printk(KERN_WARNING

			"dm9601: No valid MAC address in EEPROM, using %pM\n",

			"dm9601: No valid MAC address in EEPROM, using %pKM\n",

			dev->net->dev_addr);

		__dm9601_set_mac_address(dev);

	}