tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3

Also some min -> mint_t conversion.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Stephen Rothwell and committed by
Benjamin Herrenschmidt a9dad6e5 26db11af

+19 -19
+8 -8
drivers/ps3/ps3-lpm.c
··· 732 732 case 8: 733 733 return pm_translate_signal_group_number_on_island8(subgroup); 734 734 default: 735 - dev_dbg(sbd_core(), "%s:%u: island not found: %lu\n", __func__, 735 + dev_dbg(sbd_core(), "%s:%u: island not found: %llu\n", __func__, 736 736 __LINE__, group); 737 737 BUG(); 738 738 break; ··· 765 765 signal_select, attr1, attr2, attr3); 766 766 if (ret) 767 767 dev_err(sbd_core(), 768 - "%s:%u: error:%d 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n", 768 + "%s:%u: error:%d 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx\n", 769 769 __func__, __LINE__, ret, lv1_signal_group, bus_select, 770 770 signal_select, attr1, attr2, attr3); 771 771 ··· 908 908 909 909 lpm_priv->tb_count = tmp; 910 910 911 - dev_dbg(sbd_core(), "%s:%u: tb_count %lu (%lxh)\n", __func__, __LINE__, 911 + dev_dbg(sbd_core(), "%s:%u: tb_count %llu (%llxh)\n", __func__, __LINE__, 912 912 lpm_priv->tb_count, lpm_priv->tb_count); 913 913 } 914 914 EXPORT_SYMBOL_GPL(ps3_disable_pm); ··· 938 938 if (offset >= lpm_priv->tb_count) 939 939 return 0; 940 940 941 - count = min(count, lpm_priv->tb_count - offset); 941 + count = min_t(u64, count, lpm_priv->tb_count - offset); 942 942 943 943 while (*bytes_copied < count) { 944 944 const unsigned long request = count - *bytes_copied; ··· 993 993 if (offset >= lpm_priv->tb_count) 994 994 return 0; 995 995 996 - count = min(count, lpm_priv->tb_count - offset); 996 + count = min_t(u64, count, lpm_priv->tb_count - offset); 997 997 998 998 while (*bytes_copied < count) { 999 999 const unsigned long request = count - *bytes_copied; ··· 1013 1013 result = copy_to_user(buf, lpm_priv->tb_cache, tmp); 1014 1014 1015 1015 if (result) { 1016 - dev_dbg(sbd_core(), "%s:%u: 0x%lx bytes at 0x%p\n", 1016 + dev_dbg(sbd_core(), "%s:%u: 0x%llx bytes at 0x%p\n", 1017 1017 __func__, __LINE__, tmp, buf); 1018 1018 dev_err(sbd_core(), "%s:%u: copy_to_user failed: %d\n", 1019 1019 __func__, __LINE__, result); ··· 1148 1148 lpm_priv->shadow.group_control = PS3_LPM_SHADOW_REG_INIT; 1149 1149 lpm_priv->shadow.debug_bus_control = PS3_LPM_SHADOW_REG_INIT; 1150 1150 1151 - dev_dbg(sbd_core(), "%s:%u: lpm_id 0x%lx, outlet_id 0x%lx, " 1152 - "tb_size 0x%lx\n", __func__, __LINE__, lpm_priv->lpm_id, 1151 + dev_dbg(sbd_core(), "%s:%u: lpm_id 0x%llx, outlet_id 0x%llx, " 1152 + "tb_size 0x%llx\n", __func__, __LINE__, lpm_priv->lpm_id, 1153 1153 lpm_priv->outlet_id, tb_size); 1154 1154 1155 1155 return 0;
+4 -4
drivers/ps3/ps3-vuart.c
··· 114 114 static void __maybe_unused _dump_ports_bmp( 115 115 const struct ports_bmp *bmp, const char *func, int line) 116 116 { 117 - pr_debug("%s:%d: ports_bmp: %016lxh\n", func, line, bmp->status); 117 + pr_debug("%s:%d: ports_bmp: %016llxh\n", func, line, bmp->status); 118 118 } 119 119 120 120 #define dump_port_params(_b) _dump_port_params(_b, __func__, __LINE__) ··· 250 250 dev_dbg(&dev->core, "%s:%d: rx_bytes failed: %s\n", 251 251 __func__, __LINE__, ps3_result(result)); 252 252 253 - dev_dbg(&dev->core, "%s:%d: %lxh\n", __func__, __LINE__, 253 + dev_dbg(&dev->core, "%s:%d: %llxh\n", __func__, __LINE__, 254 254 *bytes_waiting); 255 255 return result; 256 256 } ··· 297 297 298 298 *status = tmp & priv->interrupt_mask; 299 299 300 - dev_dbg(&dev->core, "%s:%d: m %lxh, s %lxh, m&s %lxh\n", 300 + dev_dbg(&dev->core, "%s:%d: m %llxh, s %llxh, m&s %lxh\n", 301 301 __func__, __LINE__, priv->interrupt_mask, tmp, *status); 302 302 303 303 return result; ··· 594 594 list_add_tail(&lb->link, &priv->rx_list.head); 595 595 priv->rx_list.bytes_held += bytes; 596 596 597 - dev_dbg(&dev->core, "%s:%d: buf_%lu: queued %lxh bytes\n", 597 + dev_dbg(&dev->core, "%s:%d: buf_%lu: queued %llxh bytes\n", 598 598 __func__, __LINE__, lb->dbg_number, bytes); 599 599 600 600 *bytes_queued = bytes;
+7 -7
drivers/ps3/ps3stor_lib.c
··· 70 70 __func__, __LINE__, n); 71 71 dev->region_idx = __ffs(dev->accessible_regions); 72 72 dev_info(&dev->sbd.core, 73 - "First accessible region has index %u start %lu size %lu\n", 73 + "First accessible region has index %u start %llu size %llu\n", 74 74 dev->region_idx, dev->regions[dev->region_idx].start, 75 75 dev->regions[dev->region_idx].size); 76 76 ··· 220 220 const char *op = write ? "write" : "read"; 221 221 int res; 222 222 223 - dev_dbg(&dev->sbd.core, "%s:%u: %s %lu sectors starting at %lu\n", 223 + dev_dbg(&dev->sbd.core, "%s:%u: %s %llu sectors starting at %llu\n", 224 224 __func__, __LINE__, op, sectors, start_sector); 225 225 226 226 init_completion(&dev->done); ··· 238 238 239 239 wait_for_completion(&dev->done); 240 240 if (dev->lv1_status) { 241 - dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%lx\n", __func__, 241 + dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%llx\n", __func__, 242 242 __LINE__, op, dev->lv1_status); 243 243 return dev->lv1_status; 244 244 } ··· 268 268 { 269 269 int res; 270 270 271 - dev_dbg(&dev->sbd.core, "%s:%u: send device command 0x%lx\n", __func__, 271 + dev_dbg(&dev->sbd.core, "%s:%u: send device command 0x%llx\n", __func__, 272 272 __LINE__, cmd); 273 273 274 274 init_completion(&dev->done); ··· 277 277 arg2, arg3, arg4, &dev->tag); 278 278 if (res) { 279 279 dev_err(&dev->sbd.core, 280 - "%s:%u: send_device_command 0x%lx failed %d\n", 280 + "%s:%u: send_device_command 0x%llx failed %d\n", 281 281 __func__, __LINE__, cmd, res); 282 282 return -1; 283 283 } 284 284 285 285 wait_for_completion(&dev->done); 286 286 if (dev->lv1_status) { 287 - dev_dbg(&dev->sbd.core, "%s:%u: command 0x%lx failed 0x%lx\n", 287 + dev_dbg(&dev->sbd.core, "%s:%u: command 0x%llx failed 0x%llx\n", 288 288 __func__, __LINE__, cmd, dev->lv1_status); 289 289 return dev->lv1_status; 290 290 } 291 291 292 - dev_dbg(&dev->sbd.core, "%s:%u: command 0x%lx completed\n", __func__, 292 + dev_dbg(&dev->sbd.core, "%s:%u: command 0x%llx completed\n", __func__, 293 293 __LINE__, cmd); 294 294 295 295 return 0;