summaryrefslogtreecommitdiffstats
path: root/drivers/rapidio
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2016-08-02 17:06:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-02 19:35:32 -0400
commitea87b8e1f72896d9852f534f77aeec5eaf377b32 (patch)
tree0c5c0fd0bdc810daa91c1aa8f1b2cc5840a46289 /drivers/rapidio
parentb6e8d4aa1110306378af0f3472a6b85a1f039a16 (diff)
rapidio: remove unnecessary 0x prefixes before %pa extension uses
Patch series "RapidIO subsystem updates". This set of patches contains RapidIO subsystem fixes and updates that have been made since kernel v4.6. The most significant update brings changes related to the latest revision of RapidIO specification (rev.3.x) and introduction of next generation of RapidIO switches by IDT (RXS1632 and RXS2448). This patch (of 13): This is RapidIO part of the original patch submitted by Joe Perches. (see: https://lkml.org/lkml/2016/3/5/19) Since commit 3cab1e711297 ("lib/vsprintf: refactor duplicate code to special_hex_number()") %pa uses have been output with a 0x prefix. These 0x prefixes in the formats are unnecessary. Link: http://lkml.kernel.org/r/1469125134-16523-2-git-send-email-alexandre.bounine@idt.com Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com> Cc: Barry Wood <barry.wood@idt.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rapidio')
-rw-r--r--drivers/rapidio/devices/rio_mport_cdev.c4
-rw-r--r--drivers/rapidio/devices/tsi721.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index e165b7ce29d7..de0c692587dd 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -2242,7 +2242,7 @@ static void mport_mm_open(struct vm_area_struct *vma)
2242{ 2242{
2243 struct rio_mport_mapping *map = vma->vm_private_data; 2243 struct rio_mport_mapping *map = vma->vm_private_data;
2244 2244
2245rmcd_debug(MMAP, "0x%pad", &map->phys_addr); 2245 rmcd_debug(MMAP, "%pad", &map->phys_addr);
2246 kref_get(&map->ref); 2246 kref_get(&map->ref);
2247} 2247}
2248 2248
@@ -2250,7 +2250,7 @@ static void mport_mm_close(struct vm_area_struct *vma)
2250{ 2250{
2251 struct rio_mport_mapping *map = vma->vm_private_data; 2251 struct rio_mport_mapping *map = vma->vm_private_data;
2252 2252
2253rmcd_debug(MMAP, "0x%pad", &map->phys_addr); 2253 rmcd_debug(MMAP, "%pad", &map->phys_addr);
2254 mutex_lock(&map->md->buf_mutex); 2254 mutex_lock(&map->md->buf_mutex);
2255 kref_put(&map->ref, mport_release_mapping); 2255 kref_put(&map->ref, mport_release_mapping);
2256 mutex_unlock(&map->md->buf_mutex); 2256 mutex_unlock(&map->md->buf_mutex);
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index b5b455614f8a..4c20e9927a7e 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -1101,7 +1101,7 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
1101 ibw_start = lstart & ~(ibw_size - 1); 1101 ibw_start = lstart & ~(ibw_size - 1);
1102 1102
1103 tsi_debug(IBW, &priv->pdev->dev, 1103 tsi_debug(IBW, &priv->pdev->dev,
1104 "Direct (RIO_0x%llx -> PCIe_0x%pad), size=0x%x, ibw_start = 0x%llx", 1104 "Direct (RIO_0x%llx -> PCIe_%pad), size=0x%x, ibw_start = 0x%llx",
1105 rstart, &lstart, size, ibw_start); 1105 rstart, &lstart, size, ibw_start);
1106 1106
1107 while ((lstart + size) > (ibw_start + ibw_size)) { 1107 while ((lstart + size) > (ibw_start + ibw_size)) {
@@ -1120,7 +1120,7 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
1120 1120
1121 } else { 1121 } else {
1122 tsi_debug(IBW, &priv->pdev->dev, 1122 tsi_debug(IBW, &priv->pdev->dev,
1123 "Translated (RIO_0x%llx -> PCIe_0x%pad), size=0x%x", 1123 "Translated (RIO_0x%llx -> PCIe_%pad), size=0x%x",
1124 rstart, &lstart, size); 1124 rstart, &lstart, size);
1125 1125
1126 if (!is_power_of_2(size) || size < 0x1000 || 1126 if (!is_power_of_2(size) || size < 0x1000 ||
@@ -1215,7 +1215,7 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
1215 priv->ibwin_cnt--; 1215 priv->ibwin_cnt--;
1216 1216
1217 tsi_debug(IBW, &priv->pdev->dev, 1217 tsi_debug(IBW, &priv->pdev->dev,
1218 "Configured IBWIN%d (RIO_0x%llx -> PCIe_0x%pad), size=0x%llx", 1218 "Configured IBWIN%d (RIO_0x%llx -> PCIe_%pad), size=0x%llx",
1219 i, ibw_start, &loc_start, ibw_size); 1219 i, ibw_start, &loc_start, ibw_size);
1220 1220
1221 return 0; 1221 return 0;
@@ -1237,7 +1237,7 @@ static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport,
1237 int i; 1237 int i;
1238 1238
1239 tsi_debug(IBW, &priv->pdev->dev, 1239 tsi_debug(IBW, &priv->pdev->dev,
1240 "Unmap IBW mapped to PCIe_0x%pad", &lstart); 1240 "Unmap IBW mapped to PCIe_%pad", &lstart);
1241 1241
1242 /* Search for matching active inbound translation window */ 1242 /* Search for matching active inbound translation window */
1243 for (i = 0; i < TSI721_IBWIN_NUM; i++) { 1243 for (i = 0; i < TSI721_IBWIN_NUM; i++) {