treewide: Remove pr_<level> uses with KERN_<level>
Subsystems (17)
cover treewide: Remove pr_<level> uses with KERN_<level>
Most of these are pr_debug(KERN_<foo>.
pr_<level>(KERN_<level> is unnecessary.
Joe Perches (11):
arch/arm: Remove pr_<level> uses of KERN_<level> arch/avr32: Remove pr_<level> uses of KERN_<level> arch/microblaze: Remove pr_<level> uses of KERN_<level> arch/mips: Remove pr_<level> uses of KERN_<level> arch/powerpc: Remove pr_<level> uses of KERN_<level> arch/x86: Remove pr_<level> uses of KERN_<level> drivers/infiniband: Remove pr_<level> uses of KERN_<level> drivers/net/skfp: Remove pr_<level> uses of KERN_<level> drivers/staging/msm: Remove pr_<level> uses of KERN_<level> drivers/usb/gadget: Remove pr_<level> uses of KERN_<level>
sound: Remove pr_<level> uses of KERN_<level>
arch/arm/mach-pxa/cpufreq-pxa2xx.c | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 4 +- arch/microblaze/kernel/exceptions.c | 16 ++---- arch/mips/kernel/irq-gic.c | 2 +- arch/mips/pci/pci-rc32434.c | 2 +- arch/powerpc/kvm/emulate.c | 4 +- arch/powerpc/sysdev/pmi.c | 2 +- arch/x86/kernel/apb_timer.c | 4 +- drivers/infiniband/hw/amso1100/c2_intr.c | 4 +- drivers/net/skfp/skfddi.c | 84 +++++++++++++++--------------- drivers/staging/msm/staging-devices.c | 2 +- drivers/usb/gadget/r8a66597-udc.c | 2 +- sound/ppc/snd_ps3.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 3 +- 14 files changed, 64 insertions(+), 70 deletions(-)
Signature · 1 line
1.7.3.rc1
PATCH 1/11 arch/arm: Remove pr_<level> uses of KERN_<level>
--- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
arch/arm/mach-pxa/cpufreq-pxa2xx.c +1 -2
@@ -312,8 +312,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, freqs.cpu = policy->cpu;if (freq_debug) -pr_debug (KERN_INFO "Changing CPU frequency to %d Mhz, " -"(SDRAM %d Mhz)\n" , +pr_debug ("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n" , freqs.new /1000 , (pxa_freq_settings[idx].div2) ? (new_freq_mem /2000 ) : (new_freq_mem /1000 ));
Signature · 1 line
1.7.3.rc1
PATCH 5/11 arch/powerpc: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- arch/powerpc/kvm/emulate.c | 4 ++-- arch/powerpc/sysdev/pmi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kvm/emulate.c +2 -2
@@ -145,7 +145,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)/* this default type might be overwritten by subcategories */ kvmppc_set_exit_type (vcpu,EMULATED_INST_EXITS ); -pr_debug (KERN_INFO "Emulating opcode %d / %d\n" ,get_op (inst),get_xop (inst)); +pr_debug ("Emulating opcode %d / %d\n" ,get_op (inst),get_xop (inst));switch (get_op (inst)) {case OP_TRAP :
@@ -275,7 +275,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) {u64 jd =get_tb () - vcpu->arch.dec_jiffies;kvmppc_set_gpr (vcpu, rt, vcpu->arch.dec - jd); -pr_debug (KERN_INFO "mfDEC: %x - %llx = %lx\n" , +pr_debug ("mfDEC: %x - %llx = %lx\n" , vcpu->arch.dec, jd,kvmppc_get_gpr (vcpu, rt));break ;
arch/powerpc/sysdev/pmi.c +1 -1
@@ -114,7 +114,7 @@ static void pmi_notify_handlers(struct work_struct *work)spin_lock (&data->handler_spinlock);list_for_each_entry (handler, &data->handler, node) { -pr_debug (KERN_INFO "pmi: notifying handler %p\n" , handler); +pr_debug ("pmi: notifying handler %p\n" , handler);if (handler->type == data->msg.type) handler->handle_pmi_message (data->msg); }
Signature · 1 line
1.7.3.rc1
PATCH 7/11 drivers/infiniband: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- drivers/infiniband/hw/amso1100/c2_intr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/amso1100/c2_intr.c +2 -2
@@ -62,8 +62,8 @@ void c2_rnic_interrupt(struct c2_dev *c2dev)static void handle_mq (struct c2_dev *c2dev,u32 mq_index) {if (c2dev->qptr_array[mq_index] ==NULL ) { -pr_debug (KERN_INFO "handle_mq: stray activity for mq_index=%d\n" , - mq_index); +pr_debug ("handle_mq: stray activity for mq_index=%d\n" , + mq_index);return ; }
Signature · 1 line
1.7.3.rc1
PATCH 8/11 drivers/net/skfp: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- drivers/net/skfp/skfddi.c | 84 ++++++++++++++++++++++---------------------- 1 files changed, 42 insertions(+), 42 deletions(-)
drivers/net/skfp/skfddi.c +42 -42
@@ -209,7 +209,7 @@ static int skfp_init_one(struct pci_dev *pdev,void __iomem *mem;int err; -pr_debug (KERN_INFO "entering skfp_init_one\n" ); +pr_debug ("entering skfp_init_one\n" );if (num_boards ==0 )printk ("%s\n" , boot_msg);
@@ -385,7 +385,7 @@ static int skfp_driver_init(struct net_device *dev)skfddi_priv *bp = &smc->os;int err = -EIO ; -pr_debug (KERN_INFO "entering skfp_driver_init\n" ); +pr_debug ("entering skfp_driver_init\n" );// set the io address in private structures bp->base_addr = dev->base_addr;
@@ -405,7 +405,7 @@ static int skfp_driver_init(struct net_device *dev)// Determine the required size of the 'shared' memory area. bp->SharedMemSize =mac_drv_check_space (); -pr_debug (KERN_INFO "Memory for HWM: %ld\n" , bp->SharedMemSize); +pr_debug ("Memory for HWM: %ld\n" , bp->SharedMemSize);if (bp->SharedMemSize >0 ) { bp->SharedMemSize +=16 ;// for descriptor alignment
@@ -429,13 +429,13 @@ static int skfp_driver_init(struct net_device *dev)card_stop (smc);// Reset adapter. -pr_debug (KERN_INFO "mac_drv_init()..\n" ); +pr_debug ("mac_drv_init()..\n" );if (mac_drv_init (smc) !=0 ) { -pr_debug (KERN_INFO "mac_drv_init() failed.\n" ); +pr_debug ("mac_drv_init() failed\n" ); goto fail; }read_address (smc,NULL ); -pr_debug (KERN_INFO "HW-Addr: %pMF\n" , smc->hw.fddi_canon_addr.a); +pr_debug ("HW-Addr: %pMF\n" , smc->hw.fddi_canon_addr.a);memcpy (dev->dev_addr, smc->hw.fddi_canon_addr.a,6 );smt_reset_defaults (smc,0 );
@@ -485,7 +485,7 @@ static int skfp_open(struct net_device *dev)struct s_smc *smc =netdev_priv (dev);int err; -pr_debug (KERN_INFO "entering skfp_open\n" ); +pr_debug ("entering skfp_open\n" );/* Register IRQ - support shared interrupts by passing device ptr */ err =request_irq (dev->irq, skfp_interrupt,IRQF_SHARED , dev->name, dev);
@@ -856,12 +856,12 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)/* Enable promiscuous mode, if necessary */ if (dev->flags &IFF_PROMISC ) {mac_drv_rx_mode (smc,RX_ENABLE_PROMISC ); -pr_debug (KERN_INFO "PROMISCUOUS MODE ENABLED\n" ); +pr_debug ("PROMISCUOUS MODE ENABLED\n" ); }/* Else, update multicast address table */ else {mac_drv_rx_mode (smc,RX_DISABLE_PROMISC ); -pr_debug (KERN_INFO "PROMISCUOUS MODE DISABLED\n" ); +pr_debug ("PROMISCUOUS MODE DISABLED\n" );// Reset all MC addresses mac_clear_multicast (smc);
@@ -869,7 +869,7 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)if (dev->flags &IFF_ALLMULTI ) {mac_drv_rx_mode (smc,RX_ENABLE_ALLMULTI ); -pr_debug (KERN_INFO "ENABLE ALL MC ADDRESSES\n" ); +pr_debug ("ENABLE ALL MC ADDRESSES\n" ); }else if (!netdev_mc_empty (dev)) {if (netdev_mc_count (dev) <=FPMAX_MULTICAST ) {/* use exact filtering */
@@ -880,18 +880,18 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev) (struct fddi_addr *)ha->addr, 1); -pr_debug (KERN_INFO "ENABLE MC ADDRESS: %pMF\n" , - ha->addr); +pr_debug ("ENABLE MC ADDRESS: %pMF\n" , + ha->addr); } }else {// more MC addresses than HW supports mac_drv_rx_mode (smc,RX_ENABLE_ALLMULTI ); -pr_debug (KERN_INFO "ENABLE ALL MC ADDRESSES\n" ); +pr_debug ("ENABLE ALL MC ADDRESSES\n" ); } }else {// no MC addresses -pr_debug (KERN_INFO "DISABLE ALL MC ADDRESSES\n" ); +pr_debug ("DISABLE ALL MC ADDRESSES\n" ); }/* Update adapter filters */
@@ -1045,7 +1045,7 @@ static netdev_tx_t skfp_send_pkt(struct sk_buff *skb,struct s_smc *smc =netdev_priv (dev);skfddi_priv *bp = &smc->os; -pr_debug (KERN_INFO "skfp_send_pkt\n" ); +pr_debug ("skfp_send_pkt\n" );/* * Verify that incoming transmit request is OK
@@ -1114,13 +1114,13 @@ static void send_queued_packets(struct s_smc *smc)int frame_status;// HWM tx frame status. -pr_debug (KERN_INFO "send queued packets\n" ); +pr_debug ("send queued packets\n" );for (;;) {// send first buffer from queue skb =skb_dequeue (&bp->SendSkbQueue);if (!skb) { -pr_debug (KERN_INFO "queue empty\n" ); +pr_debug ("queue empty\n" );return ; }// queue empty !
@@ -1232,7 +1232,7 @@ static void CheckSourceAddress(unsigned char *frame, unsigned char *hw_addr)static void ResetAdapter (struct s_smc *smc) { -pr_debug (KERN_INFO "[fddi: ResetAdapter]\n" ); +pr_debug ("[fddi: ResetAdapter]\n" );// Stop the adapter.
@@ -1278,7 +1278,7 @@ void llc_restart_tx(struct s_smc *smc) {skfddi_priv *bp = &smc->os; -pr_debug (KERN_INFO "[llc_restart_tx]\n" ); +pr_debug ("[llc_restart_tx]\n" );// Try to send queued packets spin_unlock (&bp->DriverLock);
@@ -1308,7 +1308,7 @@ void *mac_drv_get_space(struct s_smc *smc, unsigned int size) {void *virt; -pr_debug (KERN_INFO "mac_drv_get_space (%d bytes), " , size); +pr_debug ("mac_drv_get_space (%d bytes), " , size); virt = (void *) (smc->os.SharedMemAddr + smc->os.SharedMemHeap);if ((smc->os.SharedMemHeap + size) > smc->os.SharedMemSize) {
@@ -1317,9 +1317,9 @@ void *mac_drv_get_space(struct s_smc *smc, unsigned int size) } smc->os.SharedMemHeap += size;// Move heap pointer. -pr_debug (KERN_INFO "mac_drv_get_space end\n" ); -pr_debug (KERN_INFO "virt addr: %lx\n" , (ulong ) virt); -pr_debug (KERN_INFO "bus addr: %lx\n" , (ulong) +pr_debug ("mac_drv_get_space end\n" ); +pr_debug ("virt addr: %lx\n" , (ulong ) virt); +pr_debug ("bus addr: %lx\n" , (ulong) (smc->os.SharedMemDMA + ((char *) virt - (char *)smc->os.SharedMemAddr)));return (virt);
@@ -1349,7 +1349,7 @@ void *mac_drv_get_desc_mem(struct s_smc *smc, unsigned int size)char *virt; -pr_debug (KERN_INFO "mac_drv_get_desc_mem\n" ); +pr_debug ("mac_drv_get_desc_mem\n" );// Descriptor memory must be aligned on 16-byte boundary.
@@ -1493,7 +1493,7 @@ void mac_drv_tx_complete(struct s_smc *smc, volatile struct s_smt_fp_txd *txd) {struct sk_buff *skb; -pr_debug (KERN_INFO "entering mac_drv_tx_complete\n" ); +pr_debug ("entering mac_drv_tx_complete\n" );// Check if this TxD points to a skb if (!(skb = txd->txd_os.skb)) {
@@ -1513,7 +1513,7 @@ void mac_drv_tx_complete(struct s_smc *smc, volatile struct s_smt_fp_txd *txd)// free the skb dev_kfree_skb_irq (skb); -pr_debug (KERN_INFO "leaving mac_drv_tx_complete\n" ); +pr_debug ("leaving mac_drv_tx_complete\n" ); }// mac_drv_tx_complete
@@ -1580,7 +1580,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,unsigned short ri;u_int RifLength; -pr_debug (KERN_INFO "entering mac_drv_rx_complete (len=%d)\n" , len); +pr_debug ("entering mac_drv_rx_complete (len=%d)\n" , len);if (frag_count !=1 ) {// This is not allowed to happen. printk ("fddi: Multi-fragment receive!\n" );
@@ -1589,7 +1589,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd, } skb = rxd->rxd_os.skb;if (!skb) { -pr_debug (KERN_INFO "No skb in rxd\n" ); +pr_debug ("No skb in rxd\n" ); smc->os.MacStat.gen.rx_errors++; goto RequeueRxd; }
@@ -1619,7 +1619,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,else {int n;// goos: RIF removal has still to be tested -pr_debug (KERN_INFO "RIF found\n" ); +pr_debug ("RIF found\n" );// Get RIF length from Routing Control (RC) field. cp = virt +FDDI_MAC_HDR_LEN ;// Point behind MAC header.
@@ -1664,7 +1664,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,return ; RequeueRxd: -pr_debug (KERN_INFO "Rx: re-queue RXD.\n" ); +pr_debug ("Rx: re-queue RXD.\n" );mac_drv_requeue_rxd (smc, rxd, frag_count); smc->os.MacStat.gen.rx_errors++;// Count receive packets // not indicated.
@@ -1775,7 +1775,7 @@ void mac_drv_fill_rxd(struct s_smc *smc)struct sk_buff *skb;volatile struct s_smt_fp_rxd *rxd; -pr_debug (KERN_INFO "entering mac_drv_fill_rxd\n" ); +pr_debug ("entering mac_drv_fill_rxd\n" );// Walk through the list of free receive buffers, passing receive // buffers to the HWM as long as RXDs are available.
@@ -1783,7 +1783,7 @@ void mac_drv_fill_rxd(struct s_smc *smc) MaxFrameSize = smc->os.MaxFrameSize;// Check if there is any RXD left. while (HWM_GET_RX_FREE (smc) >0 ) { -pr_debug (KERN_INFO ".\n" ); +pr_debug (".\n" ); rxd =HWM_GET_CURR_RXD (smc); skb =alloc_skb (MaxFrameSize +3 ,GFP_ATOMIC );
@@ -1814,7 +1814,7 @@ void mac_drv_fill_rxd(struct s_smc *smc)hwm_rx_frag (smc, v_addr, b_addr, MaxFrameSize,FIRST_FRAG |LAST_FRAG ); } -pr_debug (KERN_INFO "leaving mac_drv_fill_rxd\n" ); +pr_debug ("leaving mac_drv_fill_rxd\n" ); }// mac_drv_fill_rxd
@@ -2034,17 +2034,17 @@ void smt_stat_counter(struct s_smc *smc, int stat) {// BOOLEAN RingIsUp ; -pr_debug (KERN_INFO "smt_stat_counter\n" ); +pr_debug ("smt_stat_counter\n" );switch (stat) {case 0 : -pr_debug (KERN_INFO "Ring operational change.\n" ); +pr_debug ("Ring operational change.\n" );break ;case 1 : -pr_debug (KERN_INFO "Receive fifo overflow.\n" ); +pr_debug ("Receive fifo overflow.\n" ); smc->os.MacStat.gen.rx_errors++;break ;default : -pr_debug (KERN_INFO "Unknown status (%d).\n" , stat); +pr_debug ("Unknown status (%d).\n" , stat);break ; } }// smt_stat_counter
@@ -2100,10 +2100,10 @@ void cfm_state_change(struct s_smc *smc, int c_state) s ="SC11_C_WRAP_S" ;break ;default : -pr_debug (KERN_INFO "cfm_state_change: unknown %d\n" , c_state); +pr_debug ("cfm_state_change: unknown %d\n" , c_state); return; } -pr_debug (KERN_INFO "cfm_state_change: %s\n" , s); +pr_debug ("cfm_state_change: %s\n" , s);#endif // DRIVERDEBUG }// cfm_state_change
@@ -2158,7 +2158,7 @@ void ecm_state_change(struct s_smc *smc, int e_state) s ="unknown" ; break; } -pr_debug (KERN_INFO "ecm_state_change: %s\n" , s); +pr_debug ("ecm_state_change: %s\n" , s);#endif //DRIVERDEBUG }// ecm_state_change
@@ -2213,7 +2213,7 @@ void rmt_state_change(struct s_smc *smc, int r_state) s ="unknown" ; break; } -pr_debug (KERN_INFO "[rmt_state_change: %s]\n" , s); +pr_debug ("[rmt_state_change: %s]\n" , s);#endif // DRIVERDEBUG }// rmt_state_change
@@ -2233,7 +2233,7 @@ void rmt_state_change(struct s_smc *smc, int r_state)************************/ void drv_reset_indication (struct s_smc *smc) { -pr_debug (KERN_INFO "entering drv_reset_indication\n" ); +pr_debug ("entering drv_reset_indication\n" ); smc->os.ResetRequested = TRUE;// Set flag.
Signature · 1 line
1.7.3.rc1
PATCH 11/11 sound: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- sound/ppc/snd_ps3.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
sound/ppc/snd_ps3.c +1 -1
@@ -579,7 +579,7 @@ static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream, rate * delay_ms / 1000) * substream->runtime->channels; - pr_debug(KERN_ERR "%s: time=%d rate=%d bytes=%ld, frames=%d, ret=%d\n", + pr_debug("%s: time=%d rate=%d bytes=%ld, frames=%d, ret=%d\n", __func__, delay_ms, rate,
sound/soc/s3c24xx/s3c-dma.c +1 -2
@@ -94,8 +94,7 @@ static void s3c_dma_enqueue(struct snd_pcm_substream *substream)if ((pos + len) > prtd->dma_end) { len = prtd->dma_end - pos; -pr_debug (KERN_DEBUG "%s: corrected dma len %ld\n" , - __func__, len); +pr_debug ("%s: corrected dma len %ld\n" , __func__, len); } ret = s3c2410_dma_enqueue(prtd->params->channel,
Signature · 1 line
1.7.3.rc1
PATCH 2/11 arch/avr32: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- arch/avr32/mach-at32ap/at32ap700x.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/avr32/mach-at32ap/at32ap700x.c +2 -2
@@ -256,8 +256,8 @@ static long pll1_set_rate(struct clk *clk, unsigned long rate, int apply)return -EINVAL ;if (clk->users >0 )return -EBUSY ; -pr_debug (KERN_INFO "clk %s: new rate %lu (actual rate %lu)\n" , - clk->name, rate, actual_rate); +pr_debug ("clk %s: new rate %lu (actual rate %lu)\n" , + clk->name, rate, actual_rate);pm_writel (PLL1 , ctrl); }
Signature · 1 line
1.7.3.rc1
PATCH 4/11 arch/mips: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- arch/mips/kernel/irq-gic.c | 2 +- arch/mips/pci/pci-rc32434.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/mips/kernel/irq-gic.c +1 -1
@@ -131,7 +131,7 @@ static int gic_set_affinity(unsigned int irq, const struct cpumask *cpumask)int i; irq -= _irqbase; -pr_debug (KERN_DEBUG "%s(%d) called\n" , __func__, irq); +pr_debug ("%s(%d) called\n" , __func__, irq);cpumask_and (&tmp, cpumask, cpu_online_mask);if (cpus_empty (tmp))return -1 ;
arch/mips/pci/pci-rc32434.c +1 -1
@@ -118,7 +118,7 @@ static int __init rc32434_pcibridge_init(void)if (!((pcicvalue ==PCIM_H_EA ) || (pcicvalue ==PCIM_H_IA_FIX ) || (pcicvalue ==PCIM_H_IA_RR ))) { -pr_err (KERN_ERR "PCI init error!!!\n" ); +pr_err ("PCI init error!!!\n" );/* Not in Host Mode, return ERROR */ return -1 ; }
Signature · 1 line
1.7.3.rc1
PATCH 9/11 drivers/staging/msm: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- drivers/staging/msm/staging-devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/msm/staging-devices.c +1 -1
@@ -166,7 +166,7 @@ static void __init qsd8x50_allocate_memory_regions(void) msm_fb_resources[0 ].start =__pa (addr); msm_fb_resources[0 ].end = msm_fb_resources[0 ].start + size -1 ; -pr_info (KERN_ERR "using %lu bytes of SMI at %lx physical for fb\n" , +pr_info ("using %lu bytes of SMI at %lx physical for fb\n" , size, (unsigned long )addr); }
Signature · 1 line
1.7.3.rc1
PATCH 10/11 drivers/usb/gadget: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- drivers/usb/gadget/r8a66597-udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/gadget/r8a66597-udc.c +1 -1
@@ -274,7 +274,7 @@ static int pipe_buffer_setting(struct r8a66597 *r8a66597, }if (buf_bsize && ((bufnum +16 ) >=R8A66597_MAX_BUFNUM )) { -pr_err (KERN_ERR "r8a66597 pipe memory is insufficient\n" ); +pr_err ("r8a66597 pipe memory is insufficient\n" );return -ENOMEM ; }
Signature · 1 line
1.7.3.rc1
PATCH 6/11 arch/x86: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- arch/x86/kernel/apb_timer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/apb_timer.c +2 -2
@@ -398,7 +398,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n, }break ;default : -pr_debug (KERN_INFO "APBT notified %lu, no action\n" , action); +pr_debug ("APBT notified %lu, no action\n" , action); }return NOTIFY_OK ; }
@@ -552,7 +552,7 @@ bad_count:pr_debug ("APB CS going back %lx:%lx:%lx " , t2, last_read, t2 - last_read); bad_count_x3: -pr_debug (KERN_INFO "tripple check enforced\n" ); +pr_debug ("triple check enforced\n" ); t0 =apbt_readl (phy_cs_timer_id,APBTMR_N_CURRENT_VALUE );udelay (1 );
Signature · 1 line
1.7.3.rc1
PATCH 3/11 arch/microblaze: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perches--- arch/microblaze/kernel/exceptions.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)
arch/microblaze/kernel/exceptions.c +6 -10
@@ -86,8 +86,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,switch (type &0x1F ) {case MICROBLAZE_ILL_OPCODE_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Illegal opcode exception " \ -"in user mode.\n" ); +pr_debug ("Illegal opcode exception in user mode\n" );_exception (SIGILL , regs,ILL_ILLOPC , addr);return ; }
@@ -97,8 +96,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,break ;case MICROBLAZE_IBUS_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Instruction bus error " \ -"exception in user mode.\n" ); +pr_debug ("Instruction bus error exception in user mode\n" );_exception (SIGBUS , regs,BUS_ADRERR , addr);return ; }
@@ -108,8 +106,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,break ;case MICROBLAZE_DBUS_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Data bus error exception " \ -"in user mode.\n" ); +pr_debug ("Data bus error exception in user mode\n" );_exception (SIGBUS , regs,BUS_ADRERR , addr);return ; }
@@ -119,8 +116,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,break ;case MICROBLAZE_DIV_ZERO_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Divide by zero exception " \ -"in user mode\n" ); +pr_debug ("Divide by zero exception in user mode\n" );_exception (SIGILL , regs,FPE_INTDIV , addr);return ; }
@@ -129,7 +125,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,die ("Divide by zero exception" , regs,SIGBUS );break ;case MICROBLAZE_FPU_EXCEPTION : -pr_debug (KERN_WARNING "FPU exception\n" ); +pr_debug ("FPU exception\n" );/* IEEE FP exception */ /* I removed fsr variable and use code var for storing fsr */ if (fsr &FSR_IO )
@@ -147,7 +143,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,#ifdef CONFIG_MMU case MICROBLAZE_PRIVILEGED_EXCEPTION : -pr_debug (KERN_WARNING "Privileged exception\n" ); +pr_debug ("Privileged exception\n" );/* "brk r0,r0" - used as debug breakpoint - old toolchain */ if (get_user (code, (unsigned long *)regs->pc) ==0 && code ==0x980c0000 ) {
Signature · 1 line
1.7.3.rc1
[tip:x86/debug] x86: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesCommit-ID: d0ed0c32662e756e7daf85e70a5a27a9c1111331 Gitweb: http://git.kernel.org/tip/d0ed0c32662e756e7daf85e70a5a27a9c1111331 Author: Joe Perches <[email protected]> AuthorDate: Sat, 11 Sep 2010 22:10:54 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 12 Sep 2010 09:32:31 +0200
x86: Remove pr_<level> uses of KERN_<level>
LKML-Reference: <d40c60f4b036a26db8492848695bdafaa3b42791.1284267142.git.joe@perches.com>
--- arch/x86/kernel/apb_timer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/apb_timer.c +2 -2
@@ -398,7 +398,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n, }break ;default : -pr_debug (KERN_INFO "APBT notified %lu, no action\n" , action); +pr_debug ("APBT notified %lu, no action\n" , action); }return NOTIFY_OK ; }
@@ -552,7 +552,7 @@ bad_count:pr_debug ("APB CS going back %lx:%lx:%lx " , t2, last_read, t2 - last_read); bad_count_x3: -pr_debug (KERN_INFO "tripple check enforced\n" ); +pr_debug ("triple check enforced\n" ); t0 =apbt_readl (phy_cs_timer_id,APBTMR_N_CURRENT_VALUE );udelay (1 );
Michal Simek
maintainerRe: [PATCH 03/11] arch/microblaze: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesQuoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Added to microblaze next branch.
Thanks,
Michal
Quoted 66 lines
--- arch/microblaze/kernel/exceptions.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)arch/microblaze/kernel/exceptions.c +6
-10@@ -86,8 +86,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,switch (type &0x1F ) {case MICROBLAZE_ILL_OPCODE_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Illegal opcode exception " \ -"in user mode.\n" ); +pr_debug ("Illegal opcode exception in user mode\n" );_exception (SIGILL , regs,ILL_ILLOPC , addr);return ; }@@ -97,8 +96,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,break ;case MICROBLAZE_IBUS_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Instruction bus error " \ -"exception in user mode.\n" ); +pr_debug ("Instruction bus error exception in user mode\n" );_exception (SIGBUS , regs,BUS_ADRERR , addr);return ; }@@ -108,8 +106,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,break ;case MICROBLAZE_DBUS_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Data bus error exception " \ -"in user mode.\n" ); +pr_debug ("Data bus error exception in user mode\n" );_exception (SIGBUS , regs,BUS_ADRERR , addr);return ; }@@ -119,8 +116,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,break ;case MICROBLAZE_DIV_ZERO_EXCEPTION :if (user_mode (regs)) { -pr_debug (KERN_WARNING "Divide by zero exception " \ -"in user mode\n" ); +pr_debug ("Divide by zero exception in user mode\n" );_exception (SIGILL , regs,FPE_INTDIV , addr);return ; }@@ -129,7 +125,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,die ("Divide by zero exception" , regs,SIGBUS );break ;case MICROBLAZE_FPU_EXCEPTION : -pr_debug (KERN_WARNING "FPU exception\n" ); +pr_debug ("FPU exception\n" );/* IEEE FP exception */ /* I removed fsr variable and use code var for storing fsr */ if (fsr &FSR_IO )@@ -147,7 +143,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,#ifdef CONFIG_MMU case MICROBLAZE_PRIVILEGED_EXCEPTION : -pr_debug (KERN_WARNING "Privileged exception\n" ); +pr_debug ("Privileged exception\n" );/* "brk r0,r0" - used as debug breakpoint - old toolchain */ if (get_user (code, (unsigned long *)regs->pc) ==0 && code ==0x980c0000 ) {
Signature · 4 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian
Re: [PATCH 11/11] sound: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesQuoted 5 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- sound/ppc/snd_ps3.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
Re: [PATCH 11/11] sound: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesHi Joe,
Quoted 7 lines · Joe Perches
sound/ppc/snd_ps3.c | 2 +-sound/ppc/snd_ps3.c +0
-0
sound/ppc/snd_ps3.c static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream, · line 585
Quoted 8 lines
sound/ppc/snd_ps3.c +1
-1@@ -579,7 +579,7 @@ static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream, rate * delay_ms / 1000) * substream->runtime->channels; - pr_debug(KERN_ERR "%s: time=%d rate=%d bytes=%ld, frames=%d, ret=%d\n", + pr_debug("%s: time=%d rate=%d bytes=%ld, frames=%d, ret=%d\n", __func__, delay_ms, rate,
snd_ps3.c looks OK.
Takashi Iwai
AppliedRe: [PATCH 11/11] sound: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesAt Sat, 11 Sep 2010 22:10:59 -0700,
Quoted 2 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Applied to sound git tree now. Thanks.
Takashi
Quoted 35 lines
--- sound/ppc/snd_ps3.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)sound/ppc/snd_ps3.c +1
-1@@ -579,7 +579,7 @@ static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream, rate * delay_ms / 1000) * substream->runtime->channels; - pr_debug(KERN_ERR "%s: time=%d rate=%d bytes=%ld, frames=%d, ret=%d\n", + pr_debug("%s: time=%d rate=%d bytes=%ld, frames=%d, ret=%d\n", __func__, delay_ms, rate,sound/soc/s3c24xx/s3c-dma.c +1
-2@@ -94,8 +94,7 @@ static void s3c_dma_enqueue(struct snd_pcm_substream *substream)if ((pos + len) > prtd->dma_end) { len = prtd->dma_end - pos; -pr_debug (KERN_DEBUG "%s: corrected dma len %ld\n" , - __func__, len); +pr_debug ("%s: corrected dma len %ld\n" , __func__, len); } ret = s3c2410_dma_enqueue(prtd->params->channel,Signature · 1 line
1.7.3.rc1
Re: [PATCH 08/11] drivers/net/skfp: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesFrom: Joe Perches <[email protected]>
Date: Sat, 11 Sep 2010 22:10:56 -0700
Quoted 1 line
Signed-off-by Joe Perches <[email protected]>
Applied.
Eric Miao
AppliedRe: [PATCH 01/11] arch/arm: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesQuoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Applied to 'fix', with a little bit modification to the subject line to follow ARM patch title conventions.
Quoted 22 lines
---
?arch/arm/mach-pxa/cpufreq-pxa2xx.c | ? ?3 +--
?1 files changed, 1 insertions(+), 2 deletions(-)arch/arm/mach-pxa/cpufreq-pxa2xx.c +1
-2@@ -312,8 +312,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, ? ? ? ?freqs.cpu = policy->cpu; ? ? ? ?if (freq_debug) - ? ? ? ? ? ? ? pr_debug(KERN_INFO "Changing CPU frequency to %d Mhz, " - ? ? ? ? ? ? ? ? ? ? ? ?"(SDRAM %d Mhz)\n", + ? ? ? ? ? ? ? pr_debug("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n",? ? ? ? ? ? ? ? ? ? ? ? freqs.new / 1000, (pxa_freq_settings[idx].div2) ? ? ? ? ? ? ? ? ? ? ? ? ? (
new_freq_mem/ 2000) : (new_freq_mem/ 1000));--
1.7.3.rc1
Ralf Baechle
AppliedRe: [PATCH 04/11] arch/mips: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesThanks, applied.
Ralf
Re: [PATCH 10/11] drivers/usb/gadget: Remove pr_<level> uses of KERN_<level>
In reply to Joe PerchesQuoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/usb/gadget/r8a66597-udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/usb/gadget/r8a66597-udc.c +0
-0
drivers/usb/gadget/r8a66597-udc.c static int pipe_buffer_setting(struct r8a66597 *r8a66597, · line 280
Quoted 8 lines
drivers/usb/gadget/r8a66597-udc.c +1
-1@@ -274,7 +274,7 @@ static int pipe_buffer_setting(struct r8a66597 *r8a66597, }if (buf_bsize && ((bufnum +16 ) >=R8A66597_MAX_BUFNUM )) { -pr_err (KERN_ERR "r8a66597 pipe memory is insufficient\n" ); +pr_err ("r8a66597 pipe memory is insufficient\n" );return -ENOMEM ; }
Ping?
Re: [PATCH 10/11] drivers/usb/gadget: Remove pr_<level> uses of KERN_<level>
Quoted 13 lines · Joe Perches
Quoted 12 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/usb/gadget/r8a66597-udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/usb/gadget/r8a66597-udc.c +0
-0@@ -274,7 +274,7 @@ static int pipe_buffer_setting(struct r8a66597 *r8a66597, }
Quoted 8 lines
drivers/usb/gadget/r8a66597-udc.c static int pipe_buffer_setting(struct r8a66597 *r8a66597, · line 280
Quoted 6 lines
drivers/usb/gadget/r8a66597-udc.c +1
-1if (buf_bsize && ((bufnum +16 ) >=R8A66597_MAX_BUFNUM )) { -pr_err (KERN_ERR "r8a66597 pipe memory is insufficient\n" ); +pr_err ("r8a66597 pipe memory is insufficient\n" );return -ENOMEM ; }Ping?
Sorry for the delay, now applied.
greg k-h
Re: [PATCH 07/11] drivers/infiniband: Remove pr_<level> uses of KERN_<level>
In reply to Joe Perchesthanks, applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html