Message ID | 20160916094338.23698-1-colin.king@canonical.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 09/16/2016 02:43 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > A couple of dev_err messages span two lines and the literal > string is missing a white space between words. Add the white > space and join the two lines into one. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: FLorian Fainelli <f.fainelli@gmail.com>
From: Colin King <colin.king@canonical.com> Date: Fri, 16 Sep 2016 10:43:38 +0100 > From: Colin Ian King <colin.king@canonical.com> > > A couple of dev_err messages span two lines and the literal > string is missing a white space between words. Add the white > space and join the two lines into one. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Applied to net-next, thanks.
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index cb29ee2..5ef5d72 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c @@ -1062,14 +1062,12 @@ static int r6040_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* this should always be supported */ err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (err) { - dev_err(&pdev->dev, "32-bit PCI DMA addresses" - "not supported by the card\n"); + dev_err(&pdev->dev, "32-bit PCI DMA addresses not supported by the card\n"); goto err_out_disable_dev; } err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); if (err) { - dev_err(&pdev->dev, "32-bit PCI DMA addresses" - "not supported by the card\n"); + dev_err(&pdev->dev, "32-bit PCI DMA addresses not supported by the card\n"); goto err_out_disable_dev; }