ide: replace remaining __FUNCTION__ occurrences
Subsystems (46)
A message that is not in the archive (sent off-list or not yet received): ff8fd021606e7a6f03e9c274230cfcf64eade6d2.1204599636.git.harvey.harrison@gmail.com
PATCH 2/14 drivers/char: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/char/agp/agp.h | 2 +- drivers/char/cyclades.c | 4 +- drivers/char/drm/drmP.h | 8 +++--- drivers/char/drm/drm_sysfs.c | 2 +- drivers/char/drm/i830_dma.c | 18 ++++++------ drivers/char/drm/i830_drv.h | 2 +- drivers/char/drm/i830_irq.c | 8 +++--- drivers/char/drm/i915_dma.c | 8 +++--- drivers/char/drm/i915_drv.h | 2 +- drivers/char/drm/i915_irq.c | 2 +- drivers/char/drm/radeon_cp.c | 2 +- drivers/char/esp.c | 4 +- drivers/char/generic_serial.c | 4 +- drivers/char/hpet.c | 10 +++--- drivers/char/hvsi.c | 52 +++++++++++++++++++------------------- drivers/char/nozomi.c | 2 +- drivers/char/pcmcia/cm4000_cs.c | 2 +- drivers/char/pcmcia/cm4040_cs.c | 2 +- drivers/char/rio/rio_linux.h | 6 ++-- drivers/char/riscom8.c | 4 +- drivers/char/snsc.c | 18 ++++++------ drivers/char/snsc_event.c | 6 ++-- drivers/char/sonypi.c | 2 +- drivers/char/specialix.c | 10 +++--- drivers/char/sx.c | 8 +++--- 25 files changed, 94 insertions(+), 94 deletions(-)
drivers/char/agp/agp.h +1 -1
@@ -35,7 +35,7 @@//#define AGP_DEBUG 1 #ifdef AGP_DEBUG -#define DBG(x,y...) printk (KERN_DEBUG PFX "%s: " x "\n", __FUNCTION__ , ## y) +#define DBG(x,y...) printk (KERN_DEBUG PFX "%s: " x "\n", __func__ , ## y)#else #define DBG(x,y...) do { } while (0)#endif
drivers/char/cyclades.c +2 -2
@@ -3461,7 +3461,7 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)struct BOARD_CTRL __iomem *board_ctrl;struct CH_CTRL __iomem *ch_ctrl; -if (serial_paranoia_check (info, tty->name, __FUNCTION__)) +if (serial_paranoia_check (info, tty->name, __func__))return -ENODEV ; card = info->card;
@@ -3528,7 +3528,7 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,struct CH_CTRL __iomem *ch_ctrl;int retval; -if (serial_paranoia_check (info, tty->name, __FUNCTION__)) +if (serial_paranoia_check (info, tty->name, __func__))return -ENODEV ; card = info->card;
drivers/char/drm/drmP.h +4 -4
@@ -161,7 +161,7 @@ struct drm_device;* \param arg arguments */ #define DRM_ERROR(fmt, arg...) \ - printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg) + printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __func__ , ##arg)/** * Memory error output.
@@ -171,7 +171,7 @@ struct drm_device;* \param arg arguments */ #define DRM_MEM_ERROR(area, fmt, arg...) \ - printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \ + printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __func__, \ drm_mem_stats[area].name , ##arg) #define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
@@ -188,7 +188,7 @@ struct drm_device;if ( drm_debug ) \printk (KERN_DEBUG \"[" DRM_NAME ":%s] " fmt , \ - __FUNCTION__ , ##arg); \ + __func__ , ##arg); \ } while (0) #else #define DRM_DEBUG(fmt, arg...) do { } while (0)
@@ -239,7 +239,7 @@ do { \if ( !_DRM_LOCK_IS_HELD ( dev->lock.hw_lock->lock ) || \ dev->lock.file_priv != file_priv ) { \DRM_ERROR ("%s called without lock held, held %d owner %p %p\n" ,\ - __FUNCTION__,_DRM_LOCK_IS_HELD ( dev->lock.hw_lock->lock ),\ + __func__,_DRM_LOCK_IS_HELD ( dev->lock.hw_lock->lock ),\ dev->lock.file_priv, file_priv ); \return -EINVAL ; \ } \
drivers/char/drm/drm_sysfs.c +1 -1
@@ -33,7 +33,7 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state) {struct drm_device *drm_dev =to_drm_device (dev); -printk (KERN_ERR "%s\n" , __FUNCTION__); +printk (KERN_ERR "%s\n" , __func__);if (drm_dev->driver->suspend)return drm_dev->driver->suspend (drm_dev, state);
drivers/char/drm/i830_dma.c +9 -9
@@ -692,7 +692,7 @@ static void i830EmitState(struct drm_device * dev)drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;unsigned int dirty = sarea_priv->dirty; -DRM_DEBUG ("%s %x\n" , __FUNCTION__, dirty); +DRM_DEBUG ("%s %x\n" , __func__, dirty);if (dirty &I830_UPLOAD_BUFFERS ) {i830EmitDestVerified (dev, sarea_priv->BufferState);
@@ -1043,7 +1043,7 @@ static void i830_dma_dispatch_flip(struct drm_device * dev)RING_LOCALS ;DRM_DEBUG ("%s: page=%d pfCurrentPage=%d\n" , - __FUNCTION__, + __func__, dev_priv->current_page, dev_priv->sarea_priv->pf_current_page);
@@ -1206,7 +1206,7 @@ static void i830_dma_quiescent(struct drm_device * dev)OUT_RING (0 );ADVANCE_LP_RING (); -i830_wait_ring (dev, dev_priv->ring.Size -8 , __FUNCTION__); +i830_wait_ring (dev, dev_priv->ring.Size -8 , __func__); }static int i830_flush_queue (struct drm_device * dev)
@@ -1223,7 +1223,7 @@ static int i830_flush_queue(struct drm_device * dev)OUT_RING (0 );ADVANCE_LP_RING (); -i830_wait_ring (dev, dev_priv->ring.Size -8 , __FUNCTION__); +i830_wait_ring (dev, dev_priv->ring.Size -8 , __func__);for (i =0 ; i < dma->buf_count; i++) {struct drm_buf *buf = dma->buflist[i];
@@ -1344,7 +1344,7 @@ static void i830_do_init_pageflip(struct drm_device * dev) {drm_i830_private_t *dev_priv = dev->dev_private; -DRM_DEBUG ("%s\n" , __FUNCTION__); +DRM_DEBUG ("%s\n" , __func__); dev_priv->page_flipping =1 ; dev_priv->current_page =0 ; dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
@@ -1354,7 +1354,7 @@ static int i830_do_cleanup_pageflip(struct drm_device * dev) {drm_i830_private_t *dev_priv = dev->dev_private; -DRM_DEBUG ("%s\n" , __FUNCTION__); +DRM_DEBUG ("%s\n" , __func__);if (dev_priv->current_page !=0 )i830_dma_dispatch_flip (dev);
@@ -1367,7 +1367,7 @@ static int i830_flip_bufs(struct drm_device *dev, void *data, {drm_i830_private_t *dev_priv = dev->dev_private; -DRM_DEBUG ("%s\n" , __FUNCTION__); +DRM_DEBUG ("%s\n" , __func__);LOCK_TEST_WITH_RETURN (dev, file_priv);
@@ -1437,7 +1437,7 @@ static int i830_getparam(struct drm_device *dev, void *data,int value;if (!dev_priv) { -DRM_ERROR ("%s called with no initialization\n" , __FUNCTION__); +DRM_ERROR ("%s called with no initialization\n" , __func__);return -EINVAL ; }
@@ -1464,7 +1464,7 @@ static int i830_setparam(struct drm_device *dev, void *data,drm_i830_setparam_t *param = data;if (!dev_priv) { -DRM_ERROR ("%s called with no initialization\n" , __FUNCTION__); +DRM_ERROR ("%s called with no initialization\n" , __func__);return -EINVAL ; }
drivers/char/drm/i830_drv.h +1 -1
@@ -158,7 +158,7 @@ extern int i830_driver_device_is_agp(struct drm_device * dev);if (I830_VERBOSE ) \printk ("BEGIN_LP_RING(%d)\n" , (n)); \if (dev_priv->ring.space < n*4 ) \ -i830_wait_ring (dev, n*4 , __FUNCTION__); \ +i830_wait_ring (dev, n*4 , __func__); \ outcount =0 ; \ outring = dev_priv->ring.tail; \ ringmask = dev_priv->ring.tail_mask; \
drivers/char/drm/i830_irq.c +4 -4
@@ -58,7 +58,7 @@ static int i830_emit_irq(struct drm_device * dev)drm_i830_private_t *dev_priv = dev->dev_private;RING_LOCALS ; -DRM_DEBUG ("%s\n" , __FUNCTION__); +DRM_DEBUG ("%s\n" , __func__);atomic_inc (&dev_priv->irq_emitted);
@@ -77,7 +77,7 @@ static int i830_wait_irq(struct drm_device * dev, int irq_nr)unsigned long end = jiffies +HZ *3 ;int ret =0 ; -DRM_DEBUG ("%s\n" , __FUNCTION__); +DRM_DEBUG ("%s\n" , __func__);if (atomic_read (&dev_priv->irq_received) >= irq_nr)return 0 ;
@@ -124,7 +124,7 @@ int i830_irq_emit(struct drm_device *dev, void *data,LOCK_TEST_WITH_RETURN (dev, file_priv);if (!dev_priv) { -DRM_ERROR ("%s called with no initialization\n" , __FUNCTION__); +DRM_ERROR ("%s called with no initialization\n" , __func__);return -EINVAL ; }
@@ -147,7 +147,7 @@ int i830_irq_wait(struct drm_device *dev, void *data,drm_i830_irq_wait_t *irqwait = data;if (!dev_priv) { -DRM_ERROR ("%s called with no initialization\n" , __FUNCTION__); +DRM_ERROR ("%s called with no initialization\n" , __func__);return -EINVAL ; }
drivers/char/drm/i915_dma.c +4 -4
@@ -194,7 +194,7 @@ static int i915_dma_resume(struct drm_device * dev) {drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; -DRM_DEBUG ("%s\n" , __FUNCTION__); +DRM_DEBUG ("%s\n" , __func__);if (!dev_priv->sarea) {DRM_ERROR ("can not find sarea!\n" );
@@ -517,7 +517,7 @@ static int i915_dispatch_flip(struct drm_device * dev)RING_LOCALS ;DRM_DEBUG ("%s: page=%d pfCurrentPage=%d\n" , - __FUNCTION__, + __func__, dev_priv->current_page, dev_priv->sarea_priv->pf_current_page);
@@ -564,7 +564,7 @@ static int i915_quiescent(struct drm_device * dev)drm_i915_private_t *dev_priv = dev->dev_private;i915_kernel_lost_context (dev); -return i915_wait_ring (dev, dev_priv->ring.Size -8 , __FUNCTION__); +return i915_wait_ring (dev, dev_priv->ring.Size -8 , __func__); } static int i915_flush_ioctl(struct drm_device *dev, void *data,
@@ -642,7 +642,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,static int i915_flip_bufs (struct drm_device *dev,void *data,struct drm_file *file_priv) { -DRM_DEBUG ("%s\n" , __FUNCTION__); +DRM_DEBUG ("%s\n" , __func__);LOCK_TEST_WITH_RETURN (dev, file_priv);
drivers/char/drm/i915_drv.h +1 -1
@@ -263,7 +263,7 @@ extern void i915_mem_release(struct drm_device * dev,if (I915_VERBOSE ) \DRM_DEBUG ("BEGIN_LP_RING(%d)\n" , (n)); \if (dev_priv->ring.space < (n)*4 ) \ -i915_wait_ring (dev, (n)*4 , __FUNCTION__); \ +i915_wait_ring (dev, (n)*4 , __func__); \ outcount =0 ; \ outring = dev_priv->ring.tail; \ ringmask = dev_priv->ring.tail_mask; \
drivers/char/drm/i915_irq.c +1 -1
@@ -223,7 +223,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) temp &= (USER_INT_FLAG |VSYNC_PIPEA_FLAG |VSYNC_PIPEB_FLAG ); -DRM_DEBUG ("%s flag=%08x\n" , __FUNCTION__, temp); +DRM_DEBUG ("%s flag=%08x\n" , __func__, temp);if (temp ==0 )return IRQ_NONE ;
drivers/char/drm/radeon_cp.c +1 -1
@@ -894,7 +894,7 @@ static u32 RADEON_READ_IGPGART(drm_radeon_private_t *dev_priv, int addr)#if RADEON_FIFO_DEBUG static void radeon_status (drm_radeon_private_t * dev_priv) { -printk ("%s:\n" , __FUNCTION__); +printk ("%s:\n" , __func__);printk ("RBBM_STATUS = 0x%08x\n" , (unsigned int )RADEON_READ (RADEON_RBBM_STATUS )); printk("CP_RB_RTPR = 0x%08x\n",
drivers/char/esp.c +2 -2
@@ -1680,7 +1680,7 @@ static int esp_tiocmget(struct tty_struct *tty, struct file *file)unsigned char control, status;unsigned long flags; -if (serial_paranoia_check (info, tty->name, __FUNCTION__)) +if (serial_paranoia_check (info, tty->name, __func__))return -ENODEV ;if (tty->flags & (1 <<TTY_IO_ERROR ))return -EIO ;
@@ -1706,7 +1706,7 @@ static int esp_tiocmset(struct tty_struct *tty, struct file *file,struct esp_struct * info = (struct esp_struct *)tty->driver_data;unsigned long flags; -if (serial_paranoia_check (info, tty->name, __FUNCTION__)) +if (serial_paranoia_check (info, tty->name, __func__))return -ENODEV ;if (tty->flags & (1 <<TTY_IO_ERROR ))return -EIO ;
drivers/char/generic_serial.c +2 -2
@@ -41,8 +41,8 @@ static int gs_debug; #define gs_dprintk(f, str...) /* nothing */#endif -#define func_enter () gs_dprintk (GS_DEBUG_FLOW, "gs: enter %s\n", __FUNCTION__) -#define func_exit () gs_dprintk (GS_DEBUG_FLOW, "gs: exit %s\n", __FUNCTION__) +#define func_enter () gs_dprintk (GS_DEBUG_FLOW, "gs: enter %s\n", __func__) +#define func_exit () gs_dprintk (GS_DEBUG_FLOW, "gs: exit %s\n", __func__)#define RS_EVENT_WRITE_WAKEUP 1
drivers/char/hpet.c +5 -5
@@ -308,7 +308,7 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma)if (io_remap_pfn_range (vma, vma->vm_start, addr >>PAGE_SHIFT ,PAGE_SIZE , vma->vm_page_prot)) {printk (KERN_ERR "%s: io_remap_pfn_range failed\n" , - __FUNCTION__); + __func__);return -EAGAIN ; }
@@ -748,7 +748,7 @@ int hpet_alloc(struct hpet_data *hdp)*/ if (hpet_is_known (hdp)) {printk (KERN_DEBUG "%s: duplicate HPET ignored\n" , - __FUNCTION__); + __func__);return 0 ; }
@@ -906,7 +906,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)if (hpet_is_known (hdp)) {printk (KERN_DEBUG "%s: 0x%lx is busy\n" , - __FUNCTION__, hdp->hd_phys_address); + __func__, hdp->hd_phys_address);iounmap (hdp->hd_address);return AE_ALREADY_EXISTS ; }
@@ -923,7 +923,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)if (hpet_is_known (hdp)) {printk (KERN_DEBUG "%s: 0x%lx is busy\n" , - __FUNCTION__, hdp->hd_phys_address); + __func__, hdp->hd_phys_address);iounmap (hdp->hd_address);return AE_ALREADY_EXISTS ; }
@@ -962,7 +962,7 @@ static int hpet_acpi_add(struct acpi_device *device)return -ENODEV ;if (!data.hd_address || !data.hd_nirqs) { -printk ("%s: no address or irqs in _CRS\n" , __FUNCTION__); +printk ("%s: no address or irqs in _CRS\n" , __func__);return -ENODEV ; }
drivers/char/hvsi.c +26 -26
202 lines not on this page · raw message
drivers/char/nozomi.c +1 -1
@@ -73,7 +73,7 @@ do { \char tmp[P_BUF_SIZE ]; \ snprintf(tmp, sizeof(tmp), ##args); \printk (_err_flag_"[%d] %s(): %s\n" , __LINE__, \ - __FUNCTION__, tmp); \ + __func__, tmp); \ }while (0 ) #define DBG1(args...) D_(0x01, ##args)
drivers/char/pcmcia/cm4000_cs.c +1 -1
@@ -53,7 +53,7 @@ module_param(pc_debug, int, 0600); #define DEBUGP(n, rdr, x, args...) do { \ if (pc_debug >= (n)) \ dev_printk(KERN_DEBUG, reader_to_dev(rdr), "%s:" x, \ - __FUNCTION__ , ## args); \ + __func__ , ## args); \ } while (0)#else #define DEBUGP(n, rdr, x, args...)
drivers/char/pcmcia/cm4040_cs.c +1 -1
@@ -47,7 +47,7 @@ module_param(pc_debug, int, 0600); #define DEBUGP(n, rdr, x, args...) do { \ if (pc_debug >= (n)) \ dev_printk(KERN_DEBUG, reader_to_dev(rdr), "%s:" x, \ - __FUNCTION__ , ##args); \ + __func__ , ##args); \ } while (0)#else #define DEBUGP(n, rdr, x, args...)
drivers/char/rio/rio_linux.h +3 -3
@@ -186,9 +186,9 @@ static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n)#ifdef DEBUG #define rio_dprintk(f, str...) do { if (rio_debug & f) printk (str);} while (0) -#define func_enter () rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s\n", __FUNCTION__) -#define func_exit () rio_dprintk (RIO_DEBUG_FLOW, "rio: exit %s\n", __FUNCTION__) -#define func_enter2 () rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s (port %d)\n",__FUNCTION__, port->line) +#define func_enter () rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s\n", __func__) +#define func_exit () rio_dprintk (RIO_DEBUG_FLOW, "rio: exit %s\n", __func__) +#define func_enter2 () rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s (port %d)\n",__func__, port->line)#else #define rio_dprintk(f, str...) /* nothing */#define func_enter ()
drivers/char/riscom8.c +2 -2
@@ -1238,7 +1238,7 @@ static int rc_tiocmget(struct tty_struct *tty, struct file *file)unsigned int result;unsigned long flags; -if (rc_paranoia_check (port, tty->name, __FUNCTION__)) +if (rc_paranoia_check (port, tty->name, __func__))return -ENODEV ; bp =port_Board (port);
@@ -1266,7 +1266,7 @@ static int rc_tiocmset(struct tty_struct *tty, struct file *file,unsigned long flags;struct riscom_board *bp; -if (rc_paranoia_check (port, tty->name, __FUNCTION__)) +if (rc_paranoia_check (port, tty->name, __func__))return -ENODEV ; bp =port_Board (port);
drivers/char/snsc.c +9 -9
@@ -80,7 +80,7 @@ scdrv_open(struct inode *inode, struct file *file) sd =kzalloc (sizeof (struct subch_data_s ),GFP_KERNEL );if (sd ==NULL ) {printk ("%s: couldn't allocate subchannel data\n" , - __FUNCTION__); + __func__);return -ENOMEM ; }
@@ -90,7 +90,7 @@ scdrv_open(struct inode *inode, struct file *file)if (sd->sd_subch <0 ) {kfree (sd); -printk ("%s: couldn't allocate subchannel\n" , __FUNCTION__); +printk ("%s: couldn't allocate subchannel\n" , __func__);return -EBUSY ; }
@@ -110,7 +110,7 @@ scdrv_open(struct inode *inode, struct file *file)if (rv) {ia64_sn_irtr_close (sd->sd_nasid, sd->sd_subch);kfree (sd); -printk ("%s: irq request failed (%d)\n" , __FUNCTION__, rv); +printk ("%s: irq request failed (%d)\n" , __func__, rv);return -EBUSY ; }
@@ -215,7 +215,7 @@ scdrv_read(struct file *file, char __user *buf, size_t count, loff_t *f_pos)*/ if (count < len) {pr_debug ("%s: only accepting %d of %d bytes\n" , - __FUNCTION__, (int ) count, len); + __func__, (int ) count, len); } len =min ((int ) count, len);if (copy_to_user (buf, sd->sd_rb, len))
@@ -384,7 +384,7 @@ scdrv_init(void)if (alloc_chrdev_region (&first_dev,0 , num_cnodes,SYSCTL_BASENAME ) <0 ) {printk ("%s: failed to register SN system controller device\n" , - __FUNCTION__); + __func__);return -ENODEV ; } snsc_class =class_create (THIS_MODULE ,SYSCTL_BASENAME );
@@ -403,7 +403,7 @@ scdrv_init(void) GFP_KERNEL);if (!scd) {printk ("%s: failed to allocate device info" -"for %s/%s\n" , __FUNCTION__, +"for %s/%s\n" , __func__,SYSCTL_BASENAME , devname);continue ; }
@@ -412,7 +412,7 @@ scdrv_init(void) scd->scd_nasid =cnodeid_to_nasid (cnode);if (!(salbuf =kmalloc (SCDRV_BUFSZ ,GFP_KERNEL ))) {printk ("%s: failed to allocate driver buffer" -"(%s%s)\n" , __FUNCTION__, +"(%s%s)\n" , __func__,SYSCTL_BASENAME , devname);kfree (scd);continue ;
@@ -424,7 +424,7 @@ scdrv_init(void) ("%s: failed to initialize SAL for" " system controller communication" " (%s/%s): outdated PROM?\n" , - __FUNCTION__,SYSCTL_BASENAME , devname); + __func__,SYSCTL_BASENAME , devname);kfree (scd);kfree (salbuf);continue ;
@@ -435,7 +435,7 @@ scdrv_init(void)if (cdev_add (&scd->scd_cdev, dev,1 )) {printk ("%s: failed to register system" " controller device (%s%s)\n" , - __FUNCTION__,SYSCTL_BASENAME , devname); + __func__,SYSCTL_BASENAME , devname);kfree (scd);kfree (salbuf);continue ;
drivers/char/snsc_event.c +3 -3
@@ -275,7 +275,7 @@ scdrv_event_init(struct sysctl_data_s *scd) event_sd =kzalloc (sizeof (struct subch_data_s ),GFP_KERNEL );if (event_sd ==NULL ) {printk (KERN_WARNING "%s: couldn't allocate subchannel info" -" for event monitoring\n" , __FUNCTION__); +" for event monitoring\n" , __func__);return ; }
@@ -289,7 +289,7 @@ scdrv_event_init(struct sysctl_data_s *scd)if (event_sd->sd_subch <0 ) {kfree (event_sd);printk (KERN_WARNING "%s: couldn't open event subchannel\n" , - __FUNCTION__); + __func__);return ; }
@@ -299,7 +299,7 @@ scdrv_event_init(struct sysctl_data_s *scd) "system controller events", event_sd);if (rv) {printk (KERN_WARNING "%s: irq request failed (%d)\n" , - __FUNCTION__, rv); + __func__, rv);ia64_sn_irtr_close (event_sd->sd_nasid, event_sd->sd_subch);kfree (event_sd);return ;
drivers/char/sonypi.c +1 -1
@@ -506,7 +506,7 @@ static struct sonypi_device {while (--n && (command)) \udelay (1 ); \if (!n && (verbose || !quiet)) \ -printk (KERN_WARNING "sonypi command failed at %s : %s (line %d)\n" , __FILE__, __FUNCTION__, __LINE__); \ +printk (KERN_WARNING "sonypi command failed at %s : %s (line %d)\n" , __FILE__, __func__, __LINE__); \ }#ifdef CONFIG_ACPI
drivers/char/specialix.c +5 -5
@@ -131,8 +131,8 @@ static int sx_rxfifo = SPECIALIX_RXFIFO;#define SX_DEBUG_FIFO 0x0800 -#define func_enter () dprintk (SX_DEBUG_FLOW, "io8: enter %s\n",__FUNCTION__) -#define func_exit () dprintk (SX_DEBUG_FLOW, "io8: exit %s\n", __FUNCTION__) +#define func_enter () dprintk (SX_DEBUG_FLOW, "io8: enter %s\n",__func__) +#define func_exit () dprintk (SX_DEBUG_FLOW, "io8: exit %s\n", __func__)#define jiffies_from_ms (a) ((((a) * HZ)/1000)+1)
@@ -876,7 +876,7 @@ static irqreturn_t sx_interrupt(int irq, void *dev_id) bp = dev_id;spin_lock_irqsave (&bp->lock, flags); -dprintk (SX_DEBUG_FLOW ,"enter %s port %d room: %ld\n" , __FUNCTION__,port_No (sx_get_port (bp,"INT" )),SERIAL_XMIT_SIZE -sx_get_port (bp,"ITN" )->xmit_cnt -1 ); +dprintk (SX_DEBUG_FLOW ,"enter %s port %d room: %ld\n" , __func__,port_No (sx_get_port (bp,"INT" )),SERIAL_XMIT_SIZE -sx_get_port (bp,"ITN" )->xmit_cnt -1 );if (!(bp->flags &SX_BOARD_ACTIVE )) {dprintk (SX_DEBUG_IRQ ,"sx: False interrupt. irq %d.\n" , irq);spin_unlock_irqrestore (&bp->lock, flags);
@@ -1805,7 +1805,7 @@ static int sx_tiocmget(struct tty_struct *tty, struct file *file)func_enter (); -if (sx_paranoia_check (port, tty->name, __FUNCTION__)) { +if (sx_paranoia_check (port, tty->name, __func__)) {func_exit ();return -ENODEV ; }
@@ -1847,7 +1847,7 @@ static int sx_tiocmset(struct tty_struct *tty, struct file *file,func_enter (); -if (sx_paranoia_check (port, tty->name, __FUNCTION__)) { +if (sx_paranoia_check (port, tty->name, __func__)) {func_exit ();return -ENODEV ; }
drivers/char/sx.c +4 -4
@@ -384,11 +384,11 @@ static struct real_driver sx_real_driver = { #define sx_dprintk(f, str...) /* nothing */#endif -#define func_enter () sx_dprintk(SX_DEBUG_FLOW, "sx: enter %s\n",__FUNCTION__) -#define func_exit () sx_dprintk(SX_DEBUG_FLOW, "sx: exit %s\n",__FUNCTION__) +#define func_enter () sx_dprintk(SX_DEBUG_FLOW, "sx: enter %s\n",__func__) +#define func_exit () sx_dprintk(SX_DEBUG_FLOW, "sx: exit %s\n",__func__)#define func_enter2 () sx_dprintk(SX_DEBUG_FLOW, "sx: enter %s (port %d)\n", \ - __FUNCTION__, port->line) + __func__, port->line)/* * Firmware loader driver specific routines
@@ -1574,7 +1574,7 @@ static void sx_close(void *ptr)sx_dprintk (SX_DEBUG_CLOSE ,"WARNING port count:%d\n" , port->gs.count);/*printk("%s SETTING port count to zero: %p count: %d\n", -__FUNCTION__, port, port->gs.count); +__func__, port, port->gs.count); port->gs.count = 0;*/ }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 3/14 input: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/input/joystick/iforce/iforce-usb.c | 6 +++--- drivers/input/joystick/xpad.c | 12 ++++++------ drivers/input/keyboard/lkkbd.c | 6 +++--- drivers/input/misc/ati_remote.c | 18 +++++++++--------- drivers/input/misc/ati_remote2.c | 18 +++++++++--------- drivers/input/misc/keyspan_remote.c | 20 ++++++++++---------- drivers/input/misc/powermate.c | 6 +++--- drivers/input/misc/yealink.c | 12 ++++++------ drivers/input/mouse/appletouch.c | 8 ++++---- drivers/input/tablet/acecad.c | 4 ++-- drivers/input/tablet/aiptek.c | 6 +++--- drivers/input/tablet/kbtab.c | 6 +++--- drivers/input/tablet/wacom_sys.c | 6 +++--- drivers/input/touchscreen/usbtouchscreen.c | 22 +++++++++++----------- 14 files changed, 75 insertions(+), 75 deletions(-)
drivers/input/joystick/iforce/iforce-usb.c +3 -3
@@ -89,10 +89,10 @@ static void iforce_usb_irq(struct urb *urb)case -ESHUTDOWN :/* this urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , - __FUNCTION__, urb->status); + __func__, urb->status);return ;default : -dbg ("%s - urb has status of: %d" , __FUNCTION__, urb->status); +dbg ("%s - urb has status of: %d" , __func__, urb->status); goto exit; }
@@ -103,7 +103,7 @@ exit: status =usb_submit_urb (urb,GFP_ATOMIC );if (status)err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, status); + __func__, status); }static void iforce_usb_out (struct urb *urb)
drivers/input/joystick/xpad.c +6 -6
@@ -350,11 +350,11 @@ static void xpad_irq_in(struct urb *urb)case -ESHUTDOWN :/* this urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , - __FUNCTION__, urb->status); + __func__, urb->status);return ;default :dbg ("%s - nonzero urb status received: %d" , - __FUNCTION__, urb->status); + __func__, urb->status); goto exit; }
@@ -367,7 +367,7 @@ exit: retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); }#if defined(CONFIG_JOYSTICK_XPAD_FF ) || defined(CONFIG_JOYSTICK_XPAD_LEDS )
@@ -384,11 +384,11 @@ static void xpad_irq_out(struct urb *urb)case -ESHUTDOWN :/* this urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , - __FUNCTION__, urb->status); + __func__, urb->status);return ;default :dbg ("%s - nonzero urb status received: %d" , - __FUNCTION__, urb->status); + __func__, urb->status); goto exit; }
@@ -396,7 +396,7 @@ exit: retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); }static int xpad_init_output (struct usb_interface *intf,struct usb_xpad *xpad)
drivers/input/keyboard/lkkbd.c +3 -3
@@ -538,11 +538,11 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,switch (code) {case SND_CLICK :if (value ==0 ) { -DBG ("%s: Deactivating key clicks\n" , __FUNCTION__); +DBG ("%s: Deactivating key clicks\n" , __func__); lk->serio->write (lk->serio,LK_CMD_DISABLE_KEYCLICK ); lk->serio->write (lk->serio,LK_CMD_DISABLE_CTRCLICK ); }else { -DBG ("%s: Activating key clicks\n" , __FUNCTION__); +DBG ("%s: Activating key clicks\n" , __func__); lk->serio->write (lk->serio,LK_CMD_ENABLE_KEYCLICK ); lk->serio->write (lk->serio,volume_to_hw (lk->keyclick_volume)); lk->serio->write (lk->serio,LK_CMD_ENABLE_CTRCLICK );
@@ -560,7 +560,7 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,default :printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n" , - __FUNCTION__, type, code, value); + __func__, type, code, value); }return -1 ;
drivers/input/misc/ati_remote.c +9 -9
@@ -330,7 +330,7 @@ static int ati_remote_open(struct input_dev *inputdev) ati_remote->irq_urb->dev = ati_remote->udev;if (usb_submit_urb (ati_remote->irq_urb,GFP_KERNEL )) {dev_err (&ati_remote->interface->dev, -"%s: usb_submit_urb failed!\n" , __FUNCTION__); +"%s: usb_submit_urb failed!\n" , __func__);return -EIO ; }
@@ -356,7 +356,7 @@ static void ati_remote_irq_out(struct urb *urb)if (urb->status) {dev_dbg (&ati_remote->interface->dev,"%s: status %d\n" , - __FUNCTION__, urb->status); + __func__, urb->status);return ; }
@@ -601,17 +601,17 @@ static void ati_remote_irq_in(struct urb *urb)case -ENOENT :case -ESHUTDOWN :dev_dbg (&ati_remote->interface->dev,"%s: urb error status, unlink? \n" , - __FUNCTION__); + __func__);return ;default :/* error */ dev_dbg (&ati_remote->interface->dev,"%s: Nonzero urb status %d\n" , - __FUNCTION__, urb->status); + __func__, urb->status); } retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)dev_err (&ati_remote->interface->dev,"%s: usb_submit_urb()=%d\n" , - __FUNCTION__, retval); + __func__, retval); }/*
@@ -734,7 +734,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_deint err = -ENOMEM ;if (iface_host->desc.bNumEndpoints !=2 ) { -err ("%s: Unexpected desc.bNumEndpoints\n" , __FUNCTION__); +err ("%s: Unexpected desc.bNumEndpoints\n" , __func__);return -ENODEV ; }
@@ -742,11 +742,11 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de endpoint_out = &iface_host->endpoint[1 ].desc;if (!usb_endpoint_is_int_in (endpoint_in)) { -err ("%s: Unexpected endpoint_in\n" , __FUNCTION__); +err ("%s: Unexpected endpoint_in\n" , __func__);return -ENODEV ; }if (le16_to_cpu (endpoint_in->wMaxPacketSize) ==0 ) { -err ("%s: endpoint_in message size==0? \n" , __FUNCTION__); +err ("%s: endpoint_in message size==0? \n" , __func__);return -ENODEV ; }
@@ -814,7 +814,7 @@ static void ati_remote_disconnect(struct usb_interface *interface) ati_remote =usb_get_intfdata (interface);usb_set_intfdata (interface,NULL );if (!ati_remote) { -warn ("%s - null device?\n" , __FUNCTION__); +warn ("%s - null device?\n" , __func__);return ; }
drivers/input/misc/ati_remote2.c +9 -9
@@ -137,14 +137,14 @@ static int ati_remote2_open(struct input_dev *idev) r =usb_submit_urb (ar2->urb[0 ],GFP_KERNEL );if (r) {dev_err (&ar2->intf[0 ]->dev, -"%s: usb_submit_urb() = %d\n" , __FUNCTION__, r); +"%s: usb_submit_urb() = %d\n" , __func__, r);return r; } r =usb_submit_urb (ar2->urb[1 ],GFP_KERNEL );if (r) {usb_kill_urb (ar2->urb[0 ]);dev_err (&ar2->intf[1 ]->dev, -"%s: usb_submit_urb() = %d\n" , __FUNCTION__, r); +"%s: usb_submit_urb() = %d\n" , __func__, r);return r; }
@@ -294,17 +294,17 @@ static void ati_remote2_complete_mouse(struct urb *urb)case -ECONNRESET :case -ESHUTDOWN :dev_dbg (&ar2->intf[0 ]->dev, -"%s(): urb status = %d\n" , __FUNCTION__, urb->status); +"%s(): urb status = %d\n" , __func__, urb->status);return ;default :dev_err (&ar2->intf[0 ]->dev, -"%s(): urb status = %d\n" , __FUNCTION__, urb->status); +"%s(): urb status = %d\n" , __func__, urb->status); } r =usb_submit_urb (urb,GFP_ATOMIC );if (r)dev_err (&ar2->intf[0 ]->dev, -"%s(): usb_submit_urb() = %d\n" , __FUNCTION__, r); +"%s(): usb_submit_urb() = %d\n" , __func__, r); }static void ati_remote2_complete_key (struct urb *urb)
@@ -321,17 +321,17 @@ static void ati_remote2_complete_key(struct urb *urb)case -ECONNRESET :case -ESHUTDOWN :dev_dbg (&ar2->intf[1 ]->dev, -"%s(): urb status = %d\n" , __FUNCTION__, urb->status); +"%s(): urb status = %d\n" , __func__, urb->status);return ;default :dev_err (&ar2->intf[1 ]->dev, -"%s(): urb status = %d\n" , __FUNCTION__, urb->status); +"%s(): urb status = %d\n" , __func__, urb->status); } r =usb_submit_urb (urb,GFP_ATOMIC );if (r)dev_err (&ar2->intf[1 ]->dev, -"%s(): usb_submit_urb() = %d\n" , __FUNCTION__, r); +"%s(): usb_submit_urb() = %d\n" , __func__, r); }static int ati_remote2_input_init (struct ati_remote2 *ar2)
@@ -438,7 +438,7 @@ static int ati_remote2_setup(struct ati_remote2 *ar2) channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT);if (r) {dev_err (&ar2->udev->dev,"%s - failed to set channel due to error: %d\n" , - __FUNCTION__, r); + __func__, r);return r; }
drivers/input/misc/keyspan_remote.c +10 -10
@@ -159,7 +159,7 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed)if (dev->data.pos >= dev->data.len) {dev_dbg (&dev->udev->dev,"%s - Error ran out of data. pos: %d, len: %d\n" , - __FUNCTION__, dev->data.pos, dev->data.len); + __func__, dev->data.pos, dev->data.len);return -1 ; }
@@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote) remote->data.tester = remote->data.tester >>6 ; remote->data.bits_left -=6 ; }else { -err ("%s - Unknown sequence found in system data.\n" , __FUNCTION__); +err ("%s - Unknown sequence found in system data.\n" , __func__); remote->stage =0 ;return ; }
@@ -286,7 +286,7 @@ static void keyspan_check_data(struct usb_keyspan *remote) remote->data.tester = remote->data.tester >>6 ; remote->data.bits_left -=6 ; }else { -err ("%s - Unknown sequence found in button data.\n" , __FUNCTION__); +err ("%s - Unknown sequence found in button data.\n" , __func__); remote->stage =0 ;return ; }
@@ -302,7 +302,7 @@ static void keyspan_check_data(struct usb_keyspan *remote) remote->data.tester = remote->data.tester >>6 ; remote->data.bits_left -=6 ; }else { -err ("%s - Error in message, invalid toggle.\n" , __FUNCTION__); +err ("%s - Error in message, invalid toggle.\n" , __func__); remote->stage =0 ;return ; }
@@ -317,7 +317,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)dev_dbg (&remote->udev->dev,"%s found valid message: system: %d, button: %d, toggle: %d\n" , - __FUNCTION__, message.system, message.button, message.toggle); + __func__, message.system, message.button, message.toggle);if (message.toggle != remote->toggle) {keyspan_report_button (remote, message.button,1 );
@@ -341,7 +341,7 @@ static int keyspan_setup(struct usb_device* dev) 0x11, 0x40, 0x5601, 0x0, NULL, 0, 0);if (retval) {dev_dbg (&dev->dev,"%s - failed to set bit rate due to error: %d\n" , - __FUNCTION__, retval); + __func__, retval);return (retval); }
@@ -349,7 +349,7 @@ static int keyspan_setup(struct usb_device* dev) 0x44, 0x40, 0x0, 0x0, NULL, 0, 0);if (retval) {dev_dbg (&dev->dev,"%s - failed to set resume sensitivity due to error: %d\n" , - __FUNCTION__, retval); + __func__, retval);return (retval); }
@@ -357,11 +357,11 @@ static int keyspan_setup(struct usb_device* dev) 0x22, 0x40, 0x0, 0x0, NULL, 0, 0);if (retval) {dev_dbg (&dev->dev,"%s - failed to turn receive on due to error: %d\n" , - __FUNCTION__, retval); + __func__, retval);return (retval); } -dev_dbg (&dev->dev,"%s - Setup complete.\n" , __FUNCTION__); +dev_dbg (&dev->dev,"%s - Setup complete.\n" , __func__);return (retval); }
@@ -397,7 +397,7 @@ static void keyspan_irq_recv(struct urb *urb) resubmit: retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval) -err ("%s - usb_submit_urb failed with result: %d" , __FUNCTION__, retval); +err ("%s - usb_submit_urb failed with result: %d" , __func__, retval); }static int keyspan_open (struct input_dev *dev)
drivers/input/misc/powermate.c +3 -3
@@ -96,10 +96,10 @@ static void powermate_irq(struct urb *urb)case -ENOENT :case -ESHUTDOWN :/* this urb is terminated, clean up */ -dbg ("%s - urb shutting down with status: %d" , __FUNCTION__, urb->status); +dbg ("%s - urb shutting down with status: %d" , __func__, urb->status);return ;default : -dbg ("%s - nonzero urb status received: %d" , __FUNCTION__, urb->status); +dbg ("%s - nonzero urb status received: %d" , __func__, urb->status); goto exit; }
@@ -112,7 +112,7 @@ exit: retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); }/* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */
drivers/input/misc/yealink.c +6 -6
@@ -427,7 +427,7 @@ static void urb_irq_callback(struct urb *urb)int ret;if (urb->status) -err ("%s - urb status %d" , __FUNCTION__, urb->status); +err ("%s - urb status %d" , __func__, urb->status);switch (yld->irq_data->cmd) {case CMD_KEYPRESS :
@@ -449,7 +449,7 @@ static void urb_irq_callback(struct urb *urb) ret =usb_submit_urb (yld->urb_ctl,GFP_ATOMIC );if (ret) -err ("%s - usb_submit_urb failed %d" , __FUNCTION__, ret); +err ("%s - usb_submit_urb failed %d" , __func__, ret); }static void urb_ctl_callback (struct urb *urb)
@@ -458,7 +458,7 @@ static void urb_ctl_callback(struct urb *urb)int ret;if (urb->status) -err ("%s - urb status %d" , __FUNCTION__, urb->status); +err ("%s - urb status %d" , __func__, urb->status);switch (yld->ctl_data->cmd) {case CMD_KEYPRESS :
@@ -473,7 +473,7 @@ static void urb_ctl_callback(struct urb *urb) }if (ret) -err ("%s - usb_submit_urb failed %d" , __FUNCTION__, ret); +err ("%s - usb_submit_urb failed %d" , __func__, ret); }/*******************************************************************************
@@ -505,7 +505,7 @@ static int input_open(struct input_dev *dev)struct yealink_dev *yld =input_get_drvdata (dev);int i, ret; -dbg ("%s" , __FUNCTION__); +dbg ("%s" , __func__);/* force updates to device */ for (i =0 ; i<sizeof (yld->master); i++)
@@ -521,7 +521,7 @@ static int input_open(struct input_dev *dev) yld->ctl_data->sum =0x100 -CMD_INIT -10 ;if ((ret =usb_submit_urb (yld->urb_ctl,GFP_KERNEL )) !=0 ) {dbg ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, ret); + __func__, ret);return ret; }return 0 ;
drivers/input/mouse/appletouch.c +4 -4
@@ -276,7 +276,7 @@ static void atp_reinit(struct work_struct *work) retval =usb_submit_urb (dev->urb,GFP_ATOMIC );if (retval) {err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); } }
@@ -368,11 +368,11 @@ static void atp_complete(struct urb* urb)case -ESHUTDOWN :/* This urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , - __FUNCTION__, urb->status); + __func__, urb->status);return ;default :dbg ("%s - nonzero urb status received: %d" , - __FUNCTION__, urb->status); + __func__, urb->status); goto exit; }
@@ -554,7 +554,7 @@ exit: retval =usb_submit_urb (dev->urb,GFP_ATOMIC );if (retval) {err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); } }
drivers/input/tablet/acecad.c +2 -2
@@ -73,10 +73,10 @@ static void usb_acecad_irq(struct urb *urb)case -ENOENT :case -ESHUTDOWN :/* this urb is terminated, clean up */ -dbg ("%s - urb shutting down with status: %d" , __FUNCTION__, urb->status); +dbg ("%s - urb shutting down with status: %d" , __func__, urb->status);return ;default : -dbg ("%s - nonzero urb status received: %d" , __FUNCTION__, urb->status); +dbg ("%s - nonzero urb status received: %d" , __func__, urb->status); goto resubmit; }
drivers/input/tablet/aiptek.c +3 -3
@@ -448,12 +448,12 @@ static void aiptek_irq(struct urb *urb)case -ESHUTDOWN :/* This urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , - __FUNCTION__, urb->status); + __func__, urb->status);return ;default :dbg ("%s - nonzero urb status received: %d" , - __FUNCTION__, urb->status); + __func__, urb->status); goto exit; }
@@ -812,7 +812,7 @@ exit: retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval !=0 ) {err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); } }
drivers/input/tablet/kbtab.c +3 -3
@@ -56,10 +56,10 @@ static void kbtab_irq(struct urb *urb)case -ENOENT :case -ESHUTDOWN :/* this urb is terminated, clean up */ -dbg ("%s - urb shutting down with status: %d" , __FUNCTION__, urb->status); +dbg ("%s - urb shutting down with status: %d" , __func__, urb->status);return ;default : -dbg ("%s - nonzero urb status received: %d" , __FUNCTION__, urb->status); +dbg ("%s - nonzero urb status received: %d" , __func__, urb->status); goto exit; }
@@ -88,7 +88,7 @@ static void kbtab_irq(struct urb *urb) retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); }static struct usb_device_id kbtab_ids[] = {
drivers/input/tablet/wacom_sys.c +3 -3
@@ -56,10 +56,10 @@ static void wacom_sys_irq(struct urb *urb)case -ENOENT :case -ESHUTDOWN :/* this urb is terminated, clean up */ -dbg ("%s - urb shutting down with status: %d" , __FUNCTION__, urb->status); +dbg ("%s - urb shutting down with status: %d" , __func__, urb->status);return ;default : -dbg ("%s - nonzero urb status received: %d" , __FUNCTION__, urb->status); +dbg ("%s - nonzero urb status received: %d" , __func__, urb->status); goto exit; }
@@ -73,7 +73,7 @@ static void wacom_sys_irq(struct urb *urb) retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)err ("%s - usb_submit_urb failed with result %d" , - __FUNCTION__, retval); + __func__, retval); }void wacom_report_key (void *wcombo,unsigned int key_type,int key_data)
drivers/input/touchscreen/usbtouchscreen.c +11 -11
@@ -262,7 +262,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , 1, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);dbg ("%s - usb_control_msg - MTOUCHUSB_RESET - bytes|err: %d" , - __FUNCTION__, ret); + __func__, ret);if (ret <0 )return ret;msleep (150 );
@@ -273,7 +273,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , 1, 1, NULL, 0, USB_CTRL_SET_TIMEOUT);dbg ("%s - usb_control_msg - MTOUCHUSB_ASYNC_REPORT - bytes|err: %d" , - __FUNCTION__, ret); + __func__, ret);if (ret >=0 )break ;if (ret != -EPIPE )
@@ -786,18 +786,18 @@ static void usbtouch_irq(struct urb *urb)case -ETIME :/* this urb is timing out */ dbg ("%s - urb timed out - was the device unplugged?" , - __FUNCTION__); + __func__);return ;case -ECONNRESET :case -ENOENT :case -ESHUTDOWN :/* this urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , - __FUNCTION__, urb->status); + __func__, urb->status);return ;default :dbg ("%s - nonzero urb status received: %d" , - __FUNCTION__, urb->status); + __func__, urb->status); goto exit; }
@@ -807,7 +807,7 @@ exit: retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)err ("%s - usb_submit_urb failed with result: %d" , - __FUNCTION__, retval); + __func__, retval); }static int usbtouch_open (struct input_dev *input)
@@ -876,7 +876,7 @@ static int usbtouch_probe(struct usb_interface *intf, usbtouch->irq =usb_alloc_urb (0 ,GFP_KERNEL );if (!usbtouch->irq) { -dbg ("%s - usb_alloc_urb failed: usbtouch->irq" , __FUNCTION__); +dbg ("%s - usb_alloc_urb failed: usbtouch->irq" , __func__); goto out_free_buffers; }
@@ -932,14 +932,14 @@ static int usbtouch_probe(struct usb_interface *intf,if (type->init) { err = type->init (usbtouch);if (err) { -dbg ("%s - type->init() failed, err: %d" , __FUNCTION__, err); +dbg ("%s - type->init() failed, err: %d" , __func__, err); goto out_free_buffers; } } err =input_register_device (usbtouch->input);if (err) { -dbg ("%s - input_register_device failed, err: %d" , __FUNCTION__, err); +dbg ("%s - input_register_device failed, err: %d" , __func__, err); goto out_free_buffers; }
@@ -959,12 +959,12 @@ static void usbtouch_disconnect(struct usb_interface *intf) {struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); -dbg ("%s - called" , __FUNCTION__); +dbg ("%s - called" , __func__);if (!usbtouch)return ; -dbg ("%s - usbtouch is initialized, cleaning up" , __FUNCTION__); +dbg ("%s - usbtouch is initialized, cleaning up" , __func__);usb_set_intfdata (intf,NULL );usb_kill_urb (usbtouch->irq);input_unregister_device (usbtouch->input);
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 4/14 i2c: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/i2c/busses/i2c-davinci.c | 6 ++-- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 +++++++++++++++++++------------------- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/chips/isp1301_omap.c | 28 ++++++++++++------------ drivers/i2c/i2c-core.c | 2 +- 7 files changed, 45 insertions(+), 45 deletions(-)
drivers/i2c/busses/i2c-davinci.c +3 -3
@@ -328,7 +328,7 @@ i2c_davinci_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)int i;int ret; -dev_dbg (dev->dev,"%s: msgs: %d\n" , __FUNCTION__, num); +dev_dbg (dev->dev,"%s: msgs: %d\n" , __func__, num); ret =i2c_davinci_wait_bus_not_busy (dev,1 );if (ret <0 ) {
@@ -342,7 +342,7 @@ i2c_davinci_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)return ret; } -dev_dbg (dev->dev,"%s:%d ret: %d\n" , __FUNCTION__, __LINE__, ret); +dev_dbg (dev->dev,"%s:%d ret: %d\n" , __func__, __LINE__, ret);return num; }
@@ -364,7 +364,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)u16 w;while ((stat =davinci_i2c_read_reg (dev,DAVINCI_I2C_IVR_REG ))) { -dev_dbg (dev->dev,"%s: stat=0x%x\n" , __FUNCTION__, stat); +dev_dbg (dev->dev,"%s: stat=0x%x\n" , __func__, stat);if (count++ ==100 ) {dev_warn (dev->dev,"Too much work in one IRQ\n" );break ;
drivers/i2c/busses/i2c-pmcmsp.c +2 -2
@@ -467,7 +467,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd( (cmd->read_len == 0 || cmd->write_len == 0))) {dev_err (&pmcmsptwi_adapter.dev,"%s: Cannot transfer less than 1 byte\n" , - __FUNCTION__); + __func__);return -EINVAL ; }
@@ -475,7 +475,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd( cmd->write_len > MSP_MAX_BYTES_PER_RW) {dev_err (&pmcmsptwi_adapter.dev,"%s: Cannot transfer more than %d bytes\n" , - __FUNCTION__,MSP_MAX_BYTES_PER_RW ); + __func__,MSP_MAX_BYTES_PER_RW );return -EINVAL ; }
drivers/i2c/busses/i2c-pnx.c +22 -22
175 lines not on this page · raw message
drivers/i2c/busses/i2c-pxa.c +1 -1
@@ -154,7 +154,7 @@ static void i2c_pxa_show_state(struct pxa_i2c *i2c, int lno, const char *fname) readl(_ISR(i2c)), readl(_ICR(i2c)), readl(_IBMR(i2c))); } -#define show_state (i2c) i2c_pxa_show_state(i2c, __LINE__, __FUNCTION__) +#define show_state (i2c) i2c_pxa_show_state(i2c, __LINE__, __func__)#else #define i2c_debug 0
drivers/i2c/busses/i2c-s3c2410.c +2 -2
@@ -276,12 +276,12 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)switch (i2c->state) {case STATE_IDLE : -dev_err (i2c->dev,"%s: called in STATE_IDLE\n" , __FUNCTION__); +dev_err (i2c->dev,"%s: called in STATE_IDLE\n" , __func__); goto out;break ;case STATE_STOP : -dev_err (i2c->dev,"%s: called in STATE_STOP\n" , __FUNCTION__); +dev_err (i2c->dev,"%s: called in STATE_STOP\n" , __func__);s3c24xx_i2c_disable_irq (i2c); goto out_ack;
drivers/i2c/chips/isp1301_omap.c +14 -14
@@ -658,7 +658,7 @@ pulldown:OTG_CTRL_REG |=OTG_PULLUP ; } -check_state (isp, __FUNCTION__); +check_state (isp, __func__);dump_regs (isp,"otg->isp1301" ); }
@@ -782,7 +782,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)if (otg_ctrl &OTG_DRIVER_SEL ) {switch (isp->otg.state) {case OTG_STATE_A_IDLE : -b_idle (isp, __FUNCTION__); +b_idle (isp, __func__);break ;default :break ;
@@ -826,7 +826,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp) isp->otg.host->otg_port); } -check_state (isp, __FUNCTION__); +check_state (isp, __func__);return ret; }
@@ -837,7 +837,7 @@ static int otg_init(struct isp1301 *isp)if (!otg_dev)return -ENODEV ; -dump_regs (isp, __FUNCTION__); +dump_regs (isp, __func__);/* some of these values are board-specific... */ OTG_SYSCON_2_REG |=OTG_EN /* for B-device: */
@@ -853,9 +853,9 @@ static int otg_init(struct isp1301 *isp)update_otg1 (isp,isp1301_get_u8 (isp,ISP1301_INTERRUPT_SOURCE ));update_otg2 (isp,isp1301_get_u8 (isp,ISP1301_OTG_STATUS )); -check_state (isp, __FUNCTION__); +check_state (isp, __func__);pr_debug ("otg: %s, %s %06x\n" , -state_name (isp), __FUNCTION__,OTG_CTRL_REG ); +state_name (isp), __func__,OTG_CTRL_REG );OTG_IRQ_EN_REG =DRIVER_SWITCH |OPRT_CHG |B_SRP_TMROUT |B_HNP_FAIL
@@ -1041,11 +1041,11 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat) OTG1_DP_PULLDOWN);isp1301_clear_bits (isp,ISP1301_OTG_CONTROL_1 ,OTG1_DP_PULLUP ); -dump_regs (isp, __FUNCTION__); +dump_regs (isp, __func__);#endif /* FALLTHROUGH */ case OTG_STATE_B_SRP_INIT : -b_idle (isp, __FUNCTION__); +b_idle (isp, __func__);OTG_CTRL_REG &=OTG_CTRL_REG &OTG_XCEIV_OUTPUTS ;/* FALLTHROUGH */ case OTG_STATE_B_IDLE :
@@ -1077,7 +1077,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)*/ update_otg1 (isp, isp_stat);update_otg2 (isp, isp_bstat); -check_state (isp, __FUNCTION__); +check_state (isp, __func__);#endif dump_regs (isp,"isp1301->otg" );
@@ -1310,7 +1310,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)*/ isp1301_set_bits (isp,ISP1301_OTG_CONTROL_1 ,OTG1_VBUS_DRV ); -dump_regs (isp, __FUNCTION__); +dump_regs (isp, __func__);return 0 ;
@@ -1365,7 +1365,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)isp1301_set_bits (isp,ISP1301_INTERRUPT_FALLING ,INTR_VBUS_VLD );dev_info (&isp->client.dev,"B-Peripheral sessions ok\n" ); -dump_regs (isp, __FUNCTION__); +dump_regs (isp, __func__);/* If this has a Mini-AB connector, this mode is highly * nonstandard ... but can be handy for testing, so long
@@ -1416,7 +1416,7 @@ isp1301_start_srp(struct otg_transceiver *dev)pr_debug ("otg: SRP, %s ... %06x\n" ,state_name (isp),OTG_CTRL_REG );#ifdef CONFIG_USB_OTG -check_state (isp, __FUNCTION__); +check_state (isp, __func__);#endif return 0 ; }
@@ -1463,7 +1463,7 @@ isp1301_start_hnp(struct otg_transceiver *dev) }pr_debug ("otg: HNP %s, %06x ...\n" ,state_name (isp),OTG_CTRL_REG ); -check_state (isp, __FUNCTION__); +check_state (isp, __func__);return 0 ;#else /* srp-only */
@@ -1601,7 +1601,7 @@ fail2:update_otg2 (isp,isp1301_get_u8 (isp,ISP1301_OTG_STATUS ));#endif -dump_regs (isp, __FUNCTION__); +dump_regs (isp, __func__);#ifdef VERBOSE mod_timer (&isp->timer, jiffies +TIMER_JIFFIES );
drivers/i2c/i2c-core.c +1 -1
@@ -1502,7 +1502,7 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr, read_write =I2C_SMBUS_READ ;if (data->block[0 ] >I2C_SMBUS_BLOCK_MAX ) {dev_err (&adapter->dev,"%s called with invalid " -"block proc call size (%d)\n" , __FUNCTION__, +"block proc call size (%d)\n" , __func__, data->block[0 ]);return -1 ; }
Signature · 1 line
1.5.4.3.500.g83a2c
Re: [PATCH 04/14] i2c: replace remaining __FUNCTION__ occurrences
Hello Harvey,
Quoted 12 lines · Harvey Harrison
__FUNCTION__is gcc-specific, use__func__Signed-off-by Harvey Harrison <[email protected]>--- drivers/i2c/busses/i2c-davinci.c | 6 ++-- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 +++++++++++++++++++------------------- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/chips/isp1301_omap.c | 28 ++++++++++++------------ drivers/i2c/i2c-core.c | 2 +- 7 files changed, 45 insertions(+), 45 deletions(-)
Patch applied, thanks.
Signature · 1 line
Jean Delvare
PATCH 5/14 pci: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/pci/hotplug/acpi_pcihp.c | 24 +++--- drivers/pci/hotplug/acpiphp_core.c | 18 ++-- drivers/pci/hotplug/acpiphp_glue.c | 38 ++++---- drivers/pci/hotplug/acpiphp_ibm.c | 36 ++++---- drivers/pci/hotplug/cpci_hotplug_core.c | 60 +++++++------- drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- drivers/pci/hotplug/cpqphp.h | 6 +- drivers/pci/hotplug/cpqphp_core.c | 38 ++++---- drivers/pci/hotplug/cpqphp_ctrl.c | 64 +++++++------- drivers/pci/hotplug/cpqphp_nvram.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 8 +- drivers/pci/hotplug/fakephp.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 24 +++--- drivers/pci/hotplug/ibmphp_ebda.c | 92 ++++++++++---------- drivers/pci/hotplug/ibmphp_hpc.c | 68 +++++++------- drivers/pci/hotplug/ibmphp_pci.c | 18 ++-- drivers/pci/hotplug/ibmphp_res.c | 12 ++-- drivers/pci/hotplug/pci_hotplug_core.c | 2 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_core.c | 32 ++++---- drivers/pci/hotplug/pciehp_ctrl.c | 34 ++++---- drivers/pci/hotplug/pciehp_hpc.c | 144 +++++++++++++++--------------- drivers/pci/hotplug/pciehp_pci.c | 8 +- drivers/pci/hotplug/pcihp_skeleton.c | 18 ++-- drivers/pci/hotplug/rpadlpar_core.c | 20 ++-- drivers/pci/hotplug/rpaphp_core.c | 6 +- drivers/pci/hotplug/rpaphp_pci.c | 14 ++-- drivers/pci/hotplug/rpaphp_slot.c | 6 +- drivers/pci/hotplug/sgi_hotplug.c | 8 +- drivers/pci/hotplug/shpchp.h | 6 +- drivers/pci/hotplug/shpchp_core.c | 26 +++--- drivers/pci/hotplug/shpchp_ctrl.c | 46 +++++----- drivers/pci/hotplug/shpchp_hpc.c | 64 +++++++------- drivers/pci/hotplug/shpchp_pci.c | 4 +- drivers/pci/pci.c | 2 +- drivers/pci/pcie/aer/aerdrv.c | 4 +- drivers/pci/pcie/aer/aerdrv_core.c | 2 +- drivers/pci/pcie/portdrv_core.c | 4 +- drivers/pci/pcie/portdrv_pci.c | 2 +- 39 files changed, 487 insertions(+), 487 deletions(-)
drivers/pci/hotplug/acpi_pcihp.c +12 -12
@@ -36,7 +36,7 @@#define MY_NAME "acpi_pcihp" -#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0) +#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __func__ , ## arg); } while (0) #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
@@ -71,7 +71,7 @@ decode_type0_hpx_record(union acpi_object *record, struct hotplug_params *hpx)default :printk (KERN_WARNING "%s: Type 0 Revision %d record not supported\n" , - __FUNCTION__, revision); + __func__, revision);return AE_ERROR ; }return AE_OK ;
@@ -100,7 +100,7 @@ decode_type1_hpx_record(union acpi_object *record, struct hotplug_params *hpx)default :printk (KERN_WARNING "%s: Type 1 Revision %d record not supported\n" , - __FUNCTION__, revision); + __func__, revision);return AE_ERROR ; }return AE_OK ;
@@ -142,7 +142,7 @@ decode_type2_hpx_record(union acpi_object *record, struct hotplug_params *hpx)default :printk (KERN_WARNING "%s: Type 2 Revision %d record not supported\n" , - __FUNCTION__, revision); + __func__, revision);return AE_ERROR ; }return AE_OK ;
@@ -203,7 +203,7 @@ acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)break ;default :printk (KERN_ERR "%s: Type %d record not supported\n" , - __FUNCTION__, type); + __func__, type); status =AE_ERROR ; goto exit; }
@@ -235,7 +235,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp) ret_buf.pointer =kmalloc (ret_buf.length,GFP_KERNEL );if (!ret_buf.pointer) {printk (KERN_ERR "%s:%s alloc for _HPP fail\n" , - __FUNCTION__, (char *)string.pointer); + __func__, (char *)string.pointer);kfree (string.pointer);return AE_NO_MEMORY ; }
@@ -245,7 +245,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)break ;default :if (ACPI_FAILURE (status)) { -pr_debug ("%s:%s _HPP fail=0x%x\n" , __FUNCTION__, +pr_debug ("%s:%s _HPP fail=0x%x\n" , __func__, (char *)string.pointer, status);kfree (string.pointer);return status;
@@ -254,7 +254,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp) ext_obj = (union acpi_object *) ret_buf.pointer;if (ext_obj->type !=ACPI_TYPE_PACKAGE ) { -printk (KERN_ERR "%s:%s _HPP obj not a package\n" , __FUNCTION__, +printk (KERN_ERR "%s:%s _HPP obj not a package\n" , __func__, (char *)string.pointer); status =AE_ERROR ; goto free_and_return;
@@ -270,7 +270,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)break ;default :printk (KERN_ERR "%s:%s _HPP obj type incorrect\n" , - __FUNCTION__, (char *)string.pointer); + __func__, (char *)string.pointer); status =AE_ERROR ; goto free_and_return; }
@@ -311,12 +311,12 @@ acpi_status acpi_run_oshp(acpi_handle handle)if (ACPI_FAILURE (status))if (status !=AE_NOT_FOUND )printk (KERN_ERR "%s:%s OSHP fails=0x%x\n" , - __FUNCTION__, (char *)string.pointer, status); + __func__, (char *)string.pointer, status);else dbg ("%s:%s OSHP not found\n" , - __FUNCTION__, (char *)string.pointer); + __func__, (char *)string.pointer);else -pr_debug ("%s:%s OSHP passes\n" , __FUNCTION__, +pr_debug ("%s:%s OSHP passes\n" , __func__, (char *)string.pointer);kfree (string.pointer);
drivers/pci/hotplug/acpiphp_core.c +9 -9
@@ -138,7 +138,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* enable the specified slot */ return acpiphp_enable_slot (slot->acpi_slot);
@@ -156,7 +156,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* disable the specified slot */ retval =acpiphp_disable_slot (slot->acpi_slot);
@@ -179,7 +179,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {int retval = -ENODEV ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);if (attention_info &&try_module_get (attention_info->owner)) { retval = attention_info->set_attn (hotplug_slot, status);
@@ -202,7 +202,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =acpiphp_get_power_status (slot->acpi_slot);
@@ -224,7 +224,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value) {int retval = -EINVAL ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);if (attention_info &&try_module_get (attention_info->owner)) { retval = attention_info->get_attn (hotplug_slot, value);
@@ -247,7 +247,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =acpiphp_get_latch_status (slot->acpi_slot);
@@ -267,7 +267,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =acpiphp_get_adapter_status (slot->acpi_slot);
@@ -284,7 +284,7 @@ static int get_address(struct hotplug_slot *hotplug_slot, u32 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =acpiphp_get_address (slot->acpi_slot);
@@ -318,7 +318,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);kfree (slot->hotplug_slot);kfree (slot);
drivers/pci/hotplug/acpiphp_glue.c +19 -19
@@ -352,7 +352,7 @@ static void decode_hpp(struct acpiphp_bridge *bridge)/* use default numbers */ printk (KERN_WARNING "%s: Could not get hotplug parameters. Use defaults\n" , - __FUNCTION__); + __func__); bridge->hpp.t0 = &bridge->hpp.type0_data; bridge->hpp.t0->revision =0 ; bridge->hpp.t0->cache_line_size =0x10 ;
@@ -534,7 +534,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) status =acpi_evaluate_integer (handle,"_ADR" ,NULL , &tmp);if (ACPI_FAILURE (status)) { -dbg ("%s: _ADR evaluation failure\n" , __FUNCTION__); +dbg ("%s: _ADR evaluation failure\n" , __func__);return AE_OK ; }
@@ -578,7 +578,7 @@ static int add_bridge(acpi_handle handle)if (ACPI_SUCCESS (status)) { status =acpi_evaluate_integer (handle,"_STA" ,NULL , &tmp);if (ACPI_FAILURE (status)) { -dbg ("%s: _STA evaluation failure\n" , __FUNCTION__); +dbg ("%s: _STA evaluation failure\n" , __func__);return 0 ; }if ((tmp &ACPI_STA_FUNCTIONING ) ==0 )
@@ -928,10 +928,10 @@ static int power_on_slot(struct acpiphp_slot *slot) func = list_entry(l, struct acpiphp_func, sibling);if (func->flags &FUNC_HAS_PS0 ) { -dbg ("%s: executing _PS0\n" , __FUNCTION__); +dbg ("%s: executing _PS0\n" , __func__); status =acpi_evaluate_object (func->handle,"_PS0" ,NULL ,NULL );if (ACPI_FAILURE (status)) { -warn ("%s: _PS0 failed\n" , __FUNCTION__); +warn ("%s: _PS0 failed\n" , __func__); retval =-1 ; goto err_exit; }else
@@ -966,7 +966,7 @@ static int power_off_slot(struct acpiphp_slot *slot)if (func->flags &FUNC_HAS_PS3 ) { status =acpi_evaluate_object (func->handle,"_PS3" ,NULL ,NULL );if (ACPI_FAILURE (status)) { -warn ("%s: _PS3 failed\n" , __FUNCTION__); +warn ("%s: _PS3 failed\n" , __func__); retval =-1 ; goto err_exit; }else
@@ -1300,7 +1300,7 @@ int acpiphp_eject_slot(struct acpiphp_slot *slot) status =acpi_evaluate_object (func->handle,"_EJ0" , &arg_list,NULL );if (ACPI_FAILURE (status)) { -warn ("%s: _EJ0 failed\n" , __FUNCTION__); +warn ("%s: _EJ0 failed\n" , __func__);return -1 ; }else break ;
@@ -1349,7 +1349,7 @@ static int acpiphp_check_bridge(struct acpiphp_bridge *bridge) } } -dbg ("%s: %d enabled, %d disabled\n" , __FUNCTION__, enabled, disabled); +dbg ("%s: %d enabled, %d disabled\n" , __func__, enabled, disabled); err_exit:return retval;
@@ -1527,7 +1527,7 @@ check_sub_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)if (bridge) {acpi_get_name (handle,ACPI_FULL_PATHNAME , &buffer);dbg ("%s: re-enumerating slots under %s\n" , - __FUNCTION__, objname); + __func__, objname);acpiphp_check_bridge (bridge); }return AE_OK ;
@@ -1572,10 +1572,10 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *contswitch (type) {case ACPI_NOTIFY_BUS_CHECK :/* bus re-enumerate */ -dbg ("%s: Bus check notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Bus check notify on %s\n" , __func__, objname);if (bridge) {dbg ("%s: re-enumerating slots under %s\n" , - __FUNCTION__, objname); + __func__, objname);acpiphp_check_bridge (bridge); }if (num_sub_bridges)
@@ -1585,18 +1585,18 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *contcase ACPI_NOTIFY_DEVICE_CHECK :/* device check */ -dbg ("%s: Device check notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Device check notify on %s\n" , __func__, objname);acpiphp_check_bridge (bridge);break ;case ACPI_NOTIFY_DEVICE_WAKE :/* wake event */ -dbg ("%s: Device wake notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Device wake notify on %s\n" , __func__, objname);break ;case ACPI_NOTIFY_EJECT_REQUEST :/* request device eject */ -dbg ("%s: Device eject notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Device eject notify on %s\n" , __func__, objname);if ((bridge->type !=BRIDGE_TYPE_HOST ) && (bridge->flags &BRIDGE_HAS_EJ0 )) {struct acpiphp_slot *slot;
@@ -1649,24 +1649,24 @@ static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *contexswitch (type) {case ACPI_NOTIFY_BUS_CHECK :/* bus re-enumerate */ -dbg ("%s: Bus check notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Bus check notify on %s\n" , __func__, objname);acpiphp_enable_slot (func->slot);break ;case ACPI_NOTIFY_DEVICE_CHECK :/* device check : re-enumerate from parent bus */ -dbg ("%s: Device check notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Device check notify on %s\n" , __func__, objname);acpiphp_check_bridge (func->slot->bridge);break ;case ACPI_NOTIFY_DEVICE_WAKE :/* wake event */ -dbg ("%s: Device wake notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Device wake notify on %s\n" , __func__, objname);break ;case ACPI_NOTIFY_EJECT_REQUEST :/* request device eject */ -dbg ("%s: Device eject notify on %s\n" , __FUNCTION__, objname); +dbg ("%s: Device eject notify on %s\n" , __func__, objname);if (!(acpiphp_disable_slot (func->slot)))acpiphp_eject_slot (func->slot);break ;
@@ -1796,7 +1796,7 @@ int acpiphp_enable_slot(struct acpiphp_slot *slot)if (retval)power_off_slot (slot); }else { -dbg ("%s: Slot status is not ACPI_STA_ALL\n" , __FUNCTION__); +dbg ("%s: Slot status is not ACPI_STA_ALL\n" , __func__);power_off_slot (slot); }
drivers/pci/hotplug/acpiphp_ibm.c +18 -18
@@ -186,7 +186,7 @@ static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status) ibm_slot =ibm_slot_from_id (hpslot_to_sun (slot)); -dbg ("%s: set slot %d (%d) attention status to %d\n" , __FUNCTION__, +dbg ("%s: set slot %d (%d) attention status to %d\n" , __func__, ibm_slot->slot.slot_num, ibm_slot->slot.slot_id, (status ?1 :0 ));
@@ -231,7 +231,7 @@ static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status)else *status =0 ; -dbg ("%s: get slot %d (%d) attention status is %d\n" , __FUNCTION__, +dbg ("%s: get slot %d (%d) attention status is %d\n" , __func__, ibm_slot->slot.slot_num, ibm_slot->slot.slot_id, *status);
@@ -263,10 +263,10 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)u8 subevent = event &0xf0 ;struct notification *note = context; -dbg ("%s: Received notification %02x\n" , __FUNCTION__, event); +dbg ("%s: Received notification %02x\n" , __func__, event);if (subevent ==0x80 ) { -dbg ("%s: generationg bus event\n" , __FUNCTION__); +dbg ("%s: generationg bus event\n" , __func__);acpi_bus_generate_proc_event (note->device, note->event, detail); acpi_bus_generate_netlink_event(note->device->pnp.device_class, note->device->dev.bus_id,
@@ -299,7 +299,7 @@ static int ibm_get_table_from_acpi(char **bufp) status =acpi_evaluate_object (ibm_acpi_handle,"APCI" ,NULL , &buffer);if (ACPI_FAILURE (status)) { -err ("%s: APCI evaluation failed\n" , __FUNCTION__); +err ("%s: APCI evaluation failed\n" , __func__);return -ENODEV ; }
@@ -307,13 +307,13 @@ static int ibm_get_table_from_acpi(char **bufp)if (!(package) || (package->type !=ACPI_TYPE_PACKAGE ) || !(package->package.elements)) { -err ("%s: Invalid APCI object\n" , __FUNCTION__); +err ("%s: Invalid APCI object\n" , __func__); goto read_table_done; }for (size =0 , i =0 ; i < package->package.count; i++) {if (package->package.elements[i].type !=ACPI_TYPE_BUFFER ) { -err ("%s: Invalid APCI element %d\n" , __FUNCTION__, i); +err ("%s: Invalid APCI element %d\n" , __func__, i); goto read_table_done; } size += package->package.elements[i].buffer.length;
@@ -324,7 +324,7 @@ static int ibm_get_table_from_acpi(char **bufp) lbuf =kzalloc (size,GFP_KERNEL );dbg ("%s: element count: %i, ASL table size: %i, &table = 0x%p\n" , - __FUNCTION__, package->package.count, size, lbuf); + __func__, package->package.count, size, lbuf);if (lbuf) { *bufp = lbuf;
@@ -368,7 +368,7 @@ static ssize_t ibm_read_apci_table(struct kobject *kobj,int bytes_read = -EINVAL ;char *table =NULL ; -dbg ("%s: pos = %d, size = %zd\n" , __FUNCTION__, (int )pos, size); +dbg ("%s: pos = %d, size = %zd\n" , __func__, (int )pos, size);if (pos ==0 ) { bytes_read =ibm_get_table_from_acpi (&table);
@@ -402,7 +402,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle, status =acpi_get_object_info (handle, &info_buffer);if (ACPI_FAILURE (status)) {err ("%s: Failed to get device information status=0x%x\n" , - __FUNCTION__, status); + __func__, status);return retval; } info = info_buffer.pointer;
@@ -432,18 +432,18 @@ static int __init ibm_acpiphp_init(void)struct acpi_device *device;struct kobject *sysdir = &pci_hotplug_slots_kset->kobj; -dbg ("%s\n" , __FUNCTION__); +dbg ("%s\n" , __func__);if (acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , ibm_find_acpi_device, &ibm_acpi_handle,NULL ) !=FOUND_APCI ) { -err ("%s: acpi_walk_namespace failed\n" , __FUNCTION__); +err ("%s: acpi_walk_namespace failed\n" , __func__); retval = -ENODEV ; goto init_return; } -dbg ("%s: found IBM aPCI device\n" , __FUNCTION__); +dbg ("%s: found IBM aPCI device\n" , __func__);if (acpi_bus_get_device (ibm_acpi_handle, &device)) { -err ("%s: acpi_bus_get_device failed\n" , __FUNCTION__); +err ("%s: acpi_bus_get_device failed\n" , __func__); retval = -ENODEV ; goto init_return; }
@@ -458,7 +458,7 @@ static int __init ibm_acpiphp_init(void) &ibm_note);if (ACPI_FAILURE (status)) {err ("%s: Failed to register notification handler\n" , - __FUNCTION__); + __func__); retval = -EBUSY ; goto init_cleanup; }
@@ -479,17 +479,17 @@ static void __exit ibm_acpiphp_exit(void)acpi_status status;struct kobject *sysdir = &pci_hotplug_slots_kset->kobj; -dbg ("%s\n" , __FUNCTION__); +dbg ("%s\n" , __func__);if (acpiphp_unregister_attention (&ibm_attention_info)) -err ("%s: attention info deregistration failed" , __FUNCTION__); +err ("%s: attention info deregistration failed" , __func__); status =acpi_remove_notify_handler ( ibm_acpi_handle,ACPI_DEVICE_NOTIFY , ibm_handle_events);if (ACPI_FAILURE (status)) -err ("%s: Notification handler removal failed\n" , __FUNCTION__); +err ("%s: Notification handler removal failed\n" , __func__);/* remove the /sys entries */ sysfs_remove_bin_file (sysdir, &ibm_apci_table_attr); }
drivers/pci/hotplug/cpci_hotplug_core.c +30 -30
202 lines not on this page · raw message
drivers/pci/hotplug/cpci_hotplug_pci.c +5 -5
@@ -255,7 +255,7 @@ int cpci_configure_slot(struct slot* slot)struct pci_bus *parent;int fn; -dbg ("%s - enter" , __FUNCTION__); +dbg ("%s - enter" , __func__);if (slot->dev ==NULL ) { dbg("pci_dev null, finding %02x:%02x:%x",
@@ -273,7 +273,7 @@ int cpci_configure_slot(struct slot* slot)* we will only call this case when lookup fails. */ n =pci_scan_slot (slot->bus, slot->devfn); -dbg ("%s: pci_scan_slot returned %d" , __FUNCTION__, n); +dbg ("%s: pci_scan_slot returned %d" , __func__, n); slot->dev =pci_get_slot (slot->bus, slot->devfn);if (slot->dev ==NULL ) {err ("Could not find PCI device for slot %02x" , slot->number);
@@ -322,7 +322,7 @@ int cpci_configure_slot(struct slot* slot)pci_bus_add_devices (parent);pci_enable_bridges (parent); -dbg ("%s - exit" , __FUNCTION__); +dbg ("%s - exit" , __func__);return 0 ; }
@@ -331,7 +331,7 @@ int cpci_unconfigure_slot(struct slot* slot)int i;struct pci_dev *dev; -dbg ("%s - enter" , __FUNCTION__); +dbg ("%s - enter" , __func__);if (!slot->dev) {err ("No device for slot %02x\n" , slot->number);return -ENODEV ;
@@ -348,6 +348,6 @@ int cpci_unconfigure_slot(struct slot* slot)pci_dev_put (slot->dev); slot->dev =NULL ; -dbg ("%s - exit" , __FUNCTION__); +dbg ("%s - exit" , __func__);return 0 ; }
drivers/pci/hotplug/cpqphp.h +3 -3
@@ -674,7 +674,7 @@ static inline int cpq_get_latch_status(struct controller *ctrl, struct slot *slo hp_slot = slot->device - ctrl->slot_device_offset;dbg ("%s: slot->device = %d, ctrl->slot_device_offset = %d \n" , - __FUNCTION__, slot->device, ctrl->slot_device_offset); + __func__, slot->device, ctrl->slot_device_offset); status = (readl (ctrl->hpc_reg +INT_INPUT_CLEAR ) & (0x01L << hp_slot));
@@ -709,7 +709,7 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)DECLARE_WAITQUEUE (wait, current);int retval =0 ; -dbg ("%s - start\n" , __FUNCTION__); +dbg ("%s - start\n" , __func__);add_wait_queue (&ctrl->queue, &wait);/* Sleep for up to 1 second to wait for the LED to change. */ msleep_interruptible (1000 );
@@ -717,7 +717,7 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)if (signal_pending (current)) retval = -EINTR ; -dbg ("%s - end\n" , __FUNCTION__); +dbg ("%s - end\n" , __func__);return retval; }
drivers/pci/hotplug/cpqphp_core.c +19 -19
@@ -315,7 +315,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);kfree (slot->hotplug_slot->info);kfree (slot->hotplug_slot->name);
@@ -338,7 +338,7 @@ static int ctrl_slot_setup(struct controller *ctrl,void __iomem *slot_entry=NULL ;int result = -ENOMEM ; -dbg ("%s\n" , __FUNCTION__); +dbg ("%s\n" , __func__); tempdword =readl (ctrl->hpc_reg +INT_INPUT_CLEAR );
@@ -513,7 +513,7 @@ get_slot_mapping(struct pci_bus *bus, u8 bus_num, u8 dev_num, u8 *slot)u8 tbus, tdevice, tslot, bridgeSlot; -dbg ("%s: %p, %d, %d, %p\n" , __FUNCTION__, bus, bus_num, dev_num, slot); +dbg ("%s: %p, %d, %d, %p\n" , __func__, bus, bus_num, dev_num, slot); bridgeSlot =0xFF ;
@@ -636,7 +636,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -663,7 +663,7 @@ static int process_SI(struct hotplug_slot *hotplug_slot)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -695,7 +695,7 @@ static int process_SS(struct hotplug_slot *hotplug_slot)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -708,7 +708,7 @@ static int process_SS(struct hotplug_slot *hotplug_slot)if (!slot_func)return -ENODEV ; -dbg ("In %s, slot_func = %p, ctrl = %p\n" , __FUNCTION__, slot_func, ctrl); +dbg ("In %s, slot_func = %p, ctrl = %p\n" , __func__, slot_func, ctrl);return cpqhp_process_SS (ctrl, slot_func); }
@@ -718,7 +718,7 @@ static int hardware_test(struct hotplug_slot *hotplug_slot, u32 value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);return cpqhp_hardware_test (ctrl, value); }
@@ -729,7 +729,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =get_slot_enabled (ctrl, slot);return 0 ;
@@ -740,7 +740,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =cpq_get_attention_status (ctrl, slot);return 0 ;
@@ -751,7 +751,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =cpq_get_latch_status (ctrl, slot);
@@ -763,7 +763,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value =get_presence_status (ctrl, slot);
@@ -775,7 +775,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value = ctrl->speed_capability;
@@ -787,7 +787,7 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value = ctrl->speed;
@@ -841,7 +841,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)// TODO: This code can be made to support non-Compaq or Intel subsystem IDs rc =pci_read_config_word (pdev,PCI_SUBSYSTEM_VENDOR_ID , &subsystem_vid);if (rc) { -err ("%s : pci_read_config_word failed\n" , __FUNCTION__); +err ("%s : pci_read_config_word failed\n" , __func__); goto err_disable_device; }dbg ("Subsystem Vendor ID: %x\n" , subsystem_vid);
@@ -853,14 +853,14 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ctrl =kzalloc (sizeof (struct controller ),GFP_KERNEL );if (!ctrl) { -err ("%s : out of memory\n" , __FUNCTION__); +err ("%s : out of memory\n" , __func__); rc = -ENOMEM ; goto err_disable_device; } rc =pci_read_config_word (pdev,PCI_SUBSYSTEM_ID , &subsystem_deviceid);if (rc) { -err ("%s : pci_read_config_word failed\n" , __FUNCTION__); +err ("%s : pci_read_config_word failed\n" , __func__); goto err_free_ctrl; }
@@ -1142,7 +1142,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) rc =cpqhp_save_config (ctrl, ctrl->bus,readb (ctrl->hpc_reg +SLOT_MASK ));if (rc) {err ("%s: unable to save PCI configuration data, error %d\n" , - __FUNCTION__, rc); + __func__, rc); goto err_iounmap; }
@@ -1180,7 +1180,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (rc) {err (msg_initialization_err,6 );err ("%s: unable to save PCI configuration data, error %d\n" , - __FUNCTION__, rc); + __func__, rc); goto err_iounmap; }
drivers/pci/hotplug/cpqphp_ctrl.c +32 -32
188 lines not on this page · raw message
drivers/pci/hotplug/cpqphp_nvram.c +1 -1
@@ -160,7 +160,7 @@ static int check_for_compaq_ROM (void __iomem *rom_start) (temp6 == 'Q')) { result =1 ; } -dbg ("%s - returned %d\n" , __FUNCTION__, result); +dbg ("%s - returned %d\n" , __func__, result);return result; }
drivers/pci/hotplug/cpqphp_pci.c +4 -4
@@ -120,7 +120,7 @@ int cpqhp_unconfigure_device(struct pci_func* func) {int j; -dbg ("%s: bus/dev/func = %x/%x/%x\n" , __FUNCTION__, func->bus, func->device, func->function); +dbg ("%s: bus/dev/func = %x/%x/%x\n" , __func__, func->bus, func->device, func->function);for (j=0 ; j<8 ; j++) {struct pci_dev * temp =pci_find_slot (func->bus,PCI_DEVFN (func->device, j));
@@ -170,11 +170,11 @@ int cpqhp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) fakedev->bus = fakebus; fakebus->number = bus_num;dbg ("%s: dev %d, bus %d, pin %d, num %d\n" , - __FUNCTION__, dev_num, bus_num, int_pin, irq_num); + __func__, dev_num, bus_num, int_pin, irq_num); rc =pcibios_set_irq_routing (fakedev, int_pin -0x0a , irq_num);kfree (fakedev);kfree (fakebus); -dbg ("%s: rc %d\n" , __FUNCTION__, rc); +dbg ("%s: rc %d\n" , __func__, rc);if (!rc)return !rc;
@@ -1423,7 +1423,7 @@ int cpqhp_return_board_resources(struct pci_func * func, struct resource_lists *int rc =0 ;struct pci_resource *node;struct pci_resource *t_node; -dbg ("%s\n" , __FUNCTION__); +dbg ("%s\n" , __func__);if (!func)return 1 ;
drivers/pci/hotplug/fakephp.c +1 -1
@@ -320,7 +320,7 @@ static int disable_slot(struct hotplug_slot *slot)return -ENODEV ; dslot = slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, slot->name);/* don't disable bridged devices just yet, we can't handle them easily... */ if (dslot->dev->subordinate) {
drivers/pci/hotplug/ibmphp_core.c +12 -12
@@ -395,7 +395,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spestruct slot *pslot;u8 mode =0 ; -debug ("%s - Entry hotplug_slot[%p] pvalue[%p]\n" , __FUNCTION__, +debug ("%s - Entry hotplug_slot[%p] pvalue[%p]\n" , __func__, hotplug_slot, value);ibmphp_lock_operations ();
@@ -425,7 +425,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe }ibmphp_unlock_operations (); -debug ("%s - Exit rc[%d] value[%x]\n" , __FUNCTION__, rc, *value); +debug ("%s - Exit rc[%d] value[%x]\n" , __func__, rc, *value);return rc; }
@@ -435,7 +435,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spestruct slot *pslot;u8 mode =0 ; -debug ("%s - Entry hotplug_slot[%p] pvalue[%p]\n" , __FUNCTION__, +debug ("%s - Entry hotplug_slot[%p] pvalue[%p]\n" , __func__, hotplug_slot, value);ibmphp_lock_operations ();
@@ -471,7 +471,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe }ibmphp_unlock_operations (); -debug ("%s - Exit rc[%d] value[%x]\n" , __FUNCTION__, rc, *value); +debug ("%s - Exit rc[%d] value[%x]\n" , __func__, rc, *value);return rc; }
@@ -741,13 +741,13 @@ static void free_slots(void)struct list_head * tmp;struct list_head * next; -debug ("%s -- enter\n" , __FUNCTION__); +debug ("%s -- enter\n" , __func__);list_for_each_safe (tmp, next, &ibmphp_slot_head) { slot_cur = list_entry(tmp, struct slot, ibm_slot_list);pci_hp_deregister (slot_cur->hotplug_slot); } -debug ("%s -- exit\n" , __FUNCTION__); +debug ("%s -- exit\n" , __func__); }static void ibm_unconfigure_device (struct pci_func *func)
@@ -755,7 +755,7 @@ static void ibm_unconfigure_device(struct pci_func *func)struct pci_dev *temp;u8 j; -debug ("inside %s\n" , __FUNCTION__); +debug ("inside %s\n" , __func__);debug ("func->device = %x, func->function = %x\n" , func->device, func->function);debug ("func->device << 3 | 0x0 = %x\n" , func->device <<3 |0x0 );
@@ -786,13 +786,13 @@ static u8 bus_structure_fixup(u8 busno) bus =kmalloc (sizeof (*bus),GFP_KERNEL );if (!bus) { -err ("%s - out of memory\n" , __FUNCTION__); +err ("%s - out of memory\n" , __func__);return 1 ; } dev =kmalloc (sizeof (*dev),GFP_KERNEL );if (!dev) {kfree (bus); -err ("%s - out of memory\n" , __FUNCTION__); +err ("%s - out of memory\n" , __func__);return 1 ; }
@@ -803,7 +803,7 @@ static u8 bus_structure_fixup(u8 busno)if (!pci_read_config_word (dev,PCI_VENDOR_ID , &l) && (l !=0x0000 ) && (l !=0xffff )) {debug ("%s - Inside bus_struture_fixup()\n" , - __FUNCTION__); + __func__);pci_scan_bus (busno, ibmphp_pci_bus->ops,NULL );break ; }
@@ -900,7 +900,7 @@ static int set_bus(struct slot * slot_cur) { }, }; -debug ("%s - entry slot # %d\n" , __FUNCTION__, slot_cur->number); +debug ("%s - entry slot # %d\n" , __func__, slot_cur->number);if (SET_BUS_STATUS (slot_cur->ctrl) &&is_bus_empty (slot_cur)) { rc =slot_update (&slot_cur);if (rc)
@@ -975,7 +975,7 @@ static int set_bus(struct slot * slot_cur)/* This is for x440, once Brandon fixes the firmware, will not need this delay */ msleep (1000 ); -debug ("%s -Exit\n" , __FUNCTION__); +debug ("%s -Exit\n" , __func__);return 0 ; }
drivers/pci/hotplug/ibmphp_ebda.c +46 -46
153 lines not on this page · raw message
drivers/pci/hotplug/ibmphp_hpc.c +34 -34
253 lines not on this page · raw message
drivers/pci/hotplug/ibmphp_pci.c +9 -9
@@ -364,7 +364,7 @@ static int configure_device (struct pci_func *func)struct resource_node *pfmem[6 ];unsigned int devfn; -debug ("%s - inside\n" , __FUNCTION__); +debug ("%s - inside\n" , __func__); devfn =PCI_DEVFN (func->device, func->function); ibmphp_pci_bus->number = func->busno;
@@ -595,7 +595,7 @@ static int configure_bridge (struct pci_func **func_passed, u8 slotno)u8 irq;int retval; -debug ("%s - enter\n" , __FUNCTION__); +debug ("%s - enter\n" , __func__); devfn =PCI_DEVFN (func->function, func->device); ibmphp_pci_bus->number = func->busno;
@@ -1234,7 +1234,7 @@ static int unconfigure_boot_device (u8 busno, u8 device, u8 function)u32 tmp_address;unsigned int devfn; -debug ("%s - enter\n" , __FUNCTION__); +debug ("%s - enter\n" , __func__); bus =ibmphp_find_res_bus (busno);if (!bus) {
@@ -1351,7 +1351,7 @@ static int unconfigure_boot_bridge (u8 busno, u8 device, u8 function) bus_no = (int ) busno;debug ("busno is %x\n" , busno);pci_bus_read_config_byte (ibmphp_pci_bus, devfn,PCI_PRIMARY_BUS , &pri_number); -debug ("%s - busno = %x, primary_number = %x\n" , __FUNCTION__, busno, pri_number); +debug ("%s - busno = %x, primary_number = %x\n" , __func__, busno, pri_number);pci_bus_read_config_byte (ibmphp_pci_bus, devfn,PCI_SECONDARY_BUS , &sec_number);debug ("sec_number is %x\n" , sec_number);
@@ -1437,7 +1437,7 @@ static int unconfigure_boot_bridge (u8 busno, u8 device, u8 function) } }/* end of mem */ }/* end of for */ -debug ("%s - exiting, returning success\n" , __FUNCTION__); +debug ("%s - exiting, returning success\n" , __func__);return 0 ; }
@@ -1453,7 +1453,7 @@ static int unconfigure_boot_card (struct slot *slot_cur)unsigned int devfn;u8 valid_device =0x00 ;/* To see if we are ever able to find valid device and read it */ -debug ("%s - enter\n" , __FUNCTION__); +debug ("%s - enter\n" , __func__); device = slot_cur->device; busno = slot_cur->bus;
@@ -1470,7 +1470,7 @@ static int unconfigure_boot_card (struct slot *slot_cur)/* found correct device!!! */ ++valid_device; -debug ("%s - found correct device\n" , __FUNCTION__); +debug ("%s - found correct device\n" , __func__);/* header: x x x x x x x x * | |___________|=> 1=PPB bridge, 0=normal device, 2=CardBus Bridge
@@ -1573,7 +1573,7 @@ int ibmphp_unconfigure_card (struct slot **slot_cur, int the_end)struct pci_func *cur_func =NULL ;struct pci_func *temp_func; -debug ("%s - enter\n" , __FUNCTION__); +debug ("%s - enter\n" , __func__);if (!the_end) {/* Need to unconfigure the card */
@@ -1624,7 +1624,7 @@ int ibmphp_unconfigure_card (struct slot **slot_cur, int the_end) sl->func =NULL ; *slot_cur = sl; -debug ("%s - exit\n" , __FUNCTION__); +debug ("%s - exit\n" , __func__);return 0 ; }
drivers/pci/hotplug/ibmphp_res.c +6 -6
@@ -563,7 +563,7 @@ static void fix_resources (struct bus_node *bus_cur)struct range_node *range;struct resource_node *res; -debug ("%s - bus_cur->busno = %d\n" , __FUNCTION__, bus_cur->busno); +debug ("%s - bus_cur->busno = %d\n" , __func__, bus_cur->busno);if (bus_cur->needIOUpdate) { res = bus_cur->firstIO;
@@ -599,7 +599,7 @@ int ibmphp_add_resource (struct resource_node *res)struct range_node *range_cur =NULL ;struct resource_node *res_start =NULL ; -debug ("%s - enter\n" , __FUNCTION__); +debug ("%s - enter\n" , __func__);if (!res) {err ("NULL passed to add\n" );
@@ -762,7 +762,7 @@ int ibmphp_add_resource (struct resource_node *res) } } -debug ("%s - exit\n" , __FUNCTION__); +debug ("%s - exit\n" , __func__);return 0 ; }
@@ -1001,7 +1001,7 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)return -EINVAL ; } -debug ("%s - enter\n" , __FUNCTION__); +debug ("%s - enter\n" , __func__);debug ("bus_cur->busno is %d\n" , bus_cur->busno);/* This is a quick fix to not mess up with the code very much. i.e.,
@@ -1029,7 +1029,7 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)while (res_cur) { range =find_range (bus_cur, res_cur); -debug ("%s - rangeno = %d\n" , __FUNCTION__, res_cur->rangeno); +debug ("%s - rangeno = %d\n" , __func__, res_cur->rangeno);if (!range) {err ("no range for the device exists... bailing out...\n" );
@@ -1942,7 +1942,7 @@ static int __init update_bridge_ranges (struct bus_node **bus)return -ENODEV ; ibmphp_pci_bus->number = bus_cur->busno; -debug ("inside %s\n" , __FUNCTION__); +debug ("inside %s\n" , __func__);debug ("bus_cur->busno = %x\n" , bus_cur->busno);for (device =0 ; device <32 ; device++) {
drivers/pci/hotplug/pci_hotplug_core.c +1 -1
@@ -43,7 +43,7 @@#define MY_NAME "pci_hotplug" -#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0) +#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __func__ , ## arg); } while (0) #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
drivers/pci/hotplug/pciehp.h +1 -1
@@ -168,7 +168,7 @@ static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)return slot; } -err ("%s: slot (device=0x%x) not found\n" , __FUNCTION__, device); +err ("%s: slot (device=0x%x) not found\n" , __func__, device);return NULL ; }
drivers/pci/hotplug/pciehp_core.c +16 -16
@@ -184,7 +184,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);kfree (slot->hotplug_slot->info);kfree (slot->hotplug_slot);
@@ -301,7 +301,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); hotplug_slot->info->attention_status = status;
@@ -316,7 +316,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);return pciehp_sysfs_enable_slot (slot); }
@@ -326,7 +326,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);return pciehp_sysfs_disable_slot (slot); }
@@ -336,7 +336,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_power_status (slot, value);if (retval <0 )
@@ -350,7 +350,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_attention_status (slot, value);if (retval <0 )
@@ -364,7 +364,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_latch_status (slot, value);if (retval <0 )
@@ -378,7 +378,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_adapter_status (slot, value);if (retval <0 )
@@ -392,7 +392,7 @@ static int get_address(struct hotplug_slot *hotplug_slot, u32 *value)struct slot *slot = hotplug_slot->private;struct pci_bus *bus = slot->ctrl->pci_dev->subordinate; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value = (pci_domain_nr (bus) <<16 ) | (slot->bus <<8 ) | slot->device;
@@ -404,7 +404,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spestruct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_max_bus_speed (slot, value);if (retval <0 )
@@ -418,7 +418,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spestruct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_cur_bus_speed (slot, value);if (retval <0 )
@@ -437,7 +437,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ ctrl =kzalloc (sizeof (*ctrl),GFP_KERNEL );if (!ctrl) { -err ("%s : out of memory\n" , __FUNCTION__); +err ("%s : out of memory\n" , __func__); goto err_out_none; }INIT_LIST_HEAD (&ctrl->slot_list);
@@ -454,7 +454,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_pci_set_drvdata (pdev, ctrl);dbg ("%s: ctrl bus=0x%x, device=%x, function=%x, irq=%x\n" , - __FUNCTION__, pdev->bus->number,PCI_SLOT (pdev->devfn), + __func__, pdev->bus->number,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn), pdev->irq);/* Setup the slot information structures */
@@ -503,13 +503,13 @@ static void pciehp_remove (struct pcie_device *dev)#ifdef CONFIG_PM static int pciehp_suspend (struct pcie_device *dev,pm_message_t state) { -printk ("%s ENTRY\n" , __FUNCTION__); +printk ("%s ENTRY\n" , __func__);return 0 ; }static int pciehp_resume (struct pcie_device *dev) { -printk ("%s ENTRY\n" , __FUNCTION__); +printk ("%s ENTRY\n" , __func__);if (pciehp_force) {struct pci_dev *pdev = dev->port;struct controller *ctrl =pci_get_drvdata (pdev);
@@ -563,7 +563,7 @@ static int __init pcied_init(void)dbg ("pcie_port_service_register = %d\n" , retval);info (DRIVER_DESC " version: " DRIVER_VERSION "\n" );if (retval) -dbg ("%s: Failure to register service\n" , __FUNCTION__); +dbg ("%s: Failure to register service\n" , __func__);return retval; }
drivers/pci/hotplug/pciehp_ctrl.c +17 -17
@@ -181,7 +181,7 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)if (POWER_CTRL (ctrl->ctrlcap)) {if (pslot->hpc_ops->power_off_slot (pslot)) {err ("%s: Issue of Slot Power Off command failed\n" , - __FUNCTION__); + __func__);return ; } }
@@ -192,7 +192,7 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)if (ATTN_LED (ctrl->ctrlcap)) {if (pslot->hpc_ops->set_attention_status (pslot,1 )) {err ("%s: Issue of Set Attention Led command failed\n" , - __FUNCTION__); + __func__);return ; } }
@@ -211,7 +211,7 @@ static int board_added(struct slot *p_slot)struct controller *ctrl = p_slot->ctrl;dbg ("%s: slot device, slot offset, hp slot = %d, %d ,%d\n" , - __FUNCTION__, p_slot->device, + __func__, p_slot->device, ctrl->slot_device_offset, p_slot->hp_slot);if (POWER_CTRL (ctrl->ctrlcap)) {
@@ -230,14 +230,14 @@ static int board_added(struct slot *p_slot)/* Check link training status */ retval = p_slot->hpc_ops->check_lnk_status (ctrl);if (retval) { -err ("%s: Failed to check link status\n" , __FUNCTION__); +err ("%s: Failed to check link status\n" , __func__);set_slot_off (ctrl, p_slot);return retval; }/* Check for a power fault */ if (p_slot->hpc_ops->query_power_fault (p_slot)) { -dbg ("%s: power fault detected\n" , __FUNCTION__); +dbg ("%s: power fault detected\n" , __func__); retval =POWER_FAILURE ; goto err_exit; }
@@ -277,14 +277,14 @@ static int remove_board(struct slot *p_slot)if (retval)return retval; -dbg ("In %s, hp_slot = %d\n" , __FUNCTION__, p_slot->hp_slot); +dbg ("In %s, hp_slot = %d\n" , __func__, p_slot->hp_slot);if (POWER_CTRL (ctrl->ctrlcap)) {/* power off slot */ retval = p_slot->hpc_ops->power_off_slot (p_slot);if (retval) {err ("%s: Issue of Slot Disable command failed\n" , - __FUNCTION__); + __func__);return retval; } }
@@ -319,7 +319,7 @@ static void pciehp_power_thread(struct work_struct *work)case POWEROFF_STATE :mutex_unlock (&p_slot->lock);dbg ("%s: disabling bus:device(%x:%x)\n" , - __FUNCTION__, p_slot->bus, p_slot->device); + __func__, p_slot->bus, p_slot->device);pciehp_disable_slot (p_slot);mutex_lock (&p_slot->lock); p_slot->state =STATIC_STATE ;
@@ -347,7 +347,7 @@ void pciehp_queue_pushbutton_work(struct work_struct *work) info =kmalloc (sizeof (*info),GFP_KERNEL );if (!info) { -err ("%s: Cannot allocate memory\n" , __FUNCTION__); +err ("%s: Cannot allocate memory\n" , __func__);return ; } info->p_slot = p_slot;
@@ -424,7 +424,7 @@ static void handle_button_press_event(struct slot *p_slot)* expires to cancel hot-add or hot-remove */ info ("Button cancel on Slot(%s)\n" , p_slot->name); -dbg ("%s: button cancel\n" , __FUNCTION__); +dbg ("%s: button cancel\n" , __func__);cancel_delayed_work (&p_slot->work);if (p_slot->state ==BLINKINGOFF_STATE ) {if (PWR_LED (ctrl->ctrlcap))
@@ -465,7 +465,7 @@ static void handle_surprise_event(struct slot *p_slot) info =kmalloc (sizeof (*info),GFP_KERNEL );if (!info) { -err ("%s: Cannot allocate memory\n" , __FUNCTION__); +err ("%s: Cannot allocate memory\n" , __func__);return ; } info->p_slot = p_slot;
@@ -526,7 +526,7 @@ int pciehp_enable_slot(struct slot *p_slot) rc = p_slot->hpc_ops->get_adapter_status (p_slot, &getstatus);if (rc || !getstatus) { -info ("%s: no adapter on slot(%s)\n" , __FUNCTION__, +info ("%s: no adapter on slot(%s)\n" , __func__, p_slot->name);mutex_unlock (&p_slot->ctrl->crit_sect);return -ENODEV ;
@@ -534,7 +534,7 @@ int pciehp_enable_slot(struct slot *p_slot)if (MRL_SENS (p_slot->ctrl->ctrlcap)) { rc = p_slot->hpc_ops->get_latch_status (p_slot, &getstatus);if (rc || getstatus) { -info ("%s: latch open on slot(%s)\n" , __FUNCTION__, +info ("%s: latch open on slot(%s)\n" , __func__, p_slot->name);mutex_unlock (&p_slot->ctrl->crit_sect);return -ENODEV ;
@@ -544,7 +544,7 @@ int pciehp_enable_slot(struct slot *p_slot)if (POWER_CTRL (p_slot->ctrl->ctrlcap)) { rc = p_slot->hpc_ops->get_power_status (p_slot, &getstatus);if (rc || getstatus) { -info ("%s: already enabled on slot(%s)\n" , __FUNCTION__, +info ("%s: already enabled on slot(%s)\n" , __func__, p_slot->name);mutex_unlock (&p_slot->ctrl->crit_sect);return -EINVAL ;
@@ -579,7 +579,7 @@ int pciehp_disable_slot(struct slot *p_slot)if (!HP_SUPR_RM (p_slot->ctrl->ctrlcap)) { ret = p_slot->hpc_ops->get_adapter_status (p_slot, &getstatus);if (ret || !getstatus) { -info ("%s: no adapter on slot(%s)\n" , __FUNCTION__, +info ("%s: no adapter on slot(%s)\n" , __func__, p_slot->name);mutex_unlock (&p_slot->ctrl->crit_sect);return -ENODEV ;
@@ -589,7 +589,7 @@ int pciehp_disable_slot(struct slot *p_slot)if (MRL_SENS (p_slot->ctrl->ctrlcap)) { ret = p_slot->hpc_ops->get_latch_status (p_slot, &getstatus);if (ret || getstatus) { -info ("%s: latch open on slot(%s)\n" , __FUNCTION__, +info ("%s: latch open on slot(%s)\n" , __func__, p_slot->name);mutex_unlock (&p_slot->ctrl->crit_sect);return -ENODEV ;
@@ -599,7 +599,7 @@ int pciehp_disable_slot(struct slot *p_slot)if (POWER_CTRL (p_slot->ctrl->ctrlcap)) { ret = p_slot->hpc_ops->get_power_status (p_slot, &getstatus);if (ret || !getstatus) { -info ("%s: already disabled slot(%s)\n" , __FUNCTION__, +info ("%s: already disabled slot(%s)\n" , __func__, p_slot->name);mutex_unlock (&p_slot->ctrl->crit_sect);return -EINVAL ;
drivers/pci/hotplug/pciehp_hpc.c +72 -72
509 lines not on this page · raw message
drivers/pci/hotplug/pciehp_pci.c +4 -4
@@ -40,7 +40,7 @@ static void program_hpp_type0(struct pci_dev *dev, struct hpp_type0 *hpp)if (hpp->revision >1 ) {printk (KERN_WARNING "%s: Rev.%d type0 record not supported\n" , - __FUNCTION__, hpp->revision); + __func__, hpp->revision);return ; }
@@ -82,7 +82,7 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)if (hpp->revision >1 ) {printk (KERN_WARNING "%s: Rev.%d type2 record not supported\n" , - __FUNCTION__, hpp->revision); + __func__, hpp->revision);return ; }
@@ -150,7 +150,7 @@ static void program_fw_provided_values(struct pci_dev *dev)if (pciehp_get_hp_params_from_firmware (dev, &hpp)) {printk (KERN_WARNING "%s: Could not get hotplug parameters\n" , - __FUNCTION__); + __func__);return ; }
@@ -245,7 +245,7 @@ int pciehp_unconfigure_device(struct slot *p_slot)struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;u16 command; -dbg ("%s: bus/dev = %x/%x\n" , __FUNCTION__, p_slot->bus, +dbg ("%s: bus/dev = %x/%x\n" , __func__, p_slot->bus, p_slot->device); ret = p_slot->hpc_ops->get_adapter_status (p_slot, &presence);if (ret)
drivers/pci/hotplug/pcihp_skeleton.c +9 -9
@@ -98,7 +98,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* * Fill in code here to enable the specified slot
@@ -112,7 +112,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* * Fill in code here to disable the specified slot
@@ -126,7 +126,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);switch (status) {case 0 :
@@ -151,7 +151,7 @@ static int hardware_test(struct hotplug_slot *hotplug_slot, u32 value)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);switch (value) {case 0 :
@@ -170,7 +170,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* * Fill in logic to get the current power status of the specific
@@ -185,7 +185,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* * Fill in logic to get the current attention status of the specific
@@ -200,7 +200,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* * Fill in logic to get the current latch status of the specific
@@ -215,7 +215,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval =0 ; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);/* * Fill in logic to get the current adapter status of the specific
@@ -229,7 +229,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);kfree (slot->hotplug_slot->info);kfree (slot->hotplug_slot);kfree (slot);
drivers/pci/hotplug/rpadlpar_core.c +10 -10
@@ -147,7 +147,7 @@ static void dlpar_pci_add_bus(struct device_node *dn) dev =of_create_pci_dev (dn, phb->bus, pdn->devfn);if (!dev) {printk (KERN_ERR "%s: failed to create pci dev for %s\n" , - __FUNCTION__, dn->full_name); + __func__, dn->full_name);return ; }
@@ -183,21 +183,21 @@ static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn) dev =dlpar_find_new_dev (phb->bus, dn);if (!dev) { -printk (KERN_ERR "%s: unable to add bus %s\n" , __FUNCTION__, +printk (KERN_ERR "%s: unable to add bus %s\n" , __func__, drc_name);return -EIO ; }if (dev->hdr_type !=PCI_HEADER_TYPE_BRIDGE ) {printk (KERN_ERR "%s: unexpected header type %d, unable to add bus %s\n" , - __FUNCTION__, dev->hdr_type, drc_name); + __func__, dev->hdr_type, drc_name);return -EIO ; }/* Add hotplug slot */ if (rpaphp_add_slot (dn)) {printk (KERN_ERR "%s: unable to add hotplug slot %s\n" , - __FUNCTION__, drc_name); + __func__, drc_name);return -EIO ; }return 0 ;
@@ -239,7 +239,7 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn)if (rpaphp_deregister_slot (slot)) {printk (KERN_ERR "%s: unable to remove hotplug slot %s\n" , - __FUNCTION__, drc_name); + __func__, drc_name);return -EIO ; } }
@@ -270,7 +270,7 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn)if (rpaphp_add_slot (dn)) {printk (KERN_ERR "%s: unable to add hotplug slot %s\n" , - __FUNCTION__, drc_name); + __func__, drc_name);return -EIO ; }return 0 ;
@@ -284,7 +284,7 @@ static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn)if (!vio_register_device_node (dn)) {printk (KERN_ERR "%s: failed to register vio node %s\n" , - __FUNCTION__, drc_name); + __func__, drc_name);return -EIO ; }return 0 ;
@@ -384,7 +384,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)if (rpaphp_deregister_slot (slot)) {printk (KERN_ERR "%s: unable to remove hotplug slot %s\n" , - __FUNCTION__, drc_name); + __func__, drc_name);return -EIO ; } }else
@@ -392,7 +392,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)if (pcibios_unmap_io_space (bus)) {printk (KERN_ERR "%s: failed to unmap bus range\n" , - __FUNCTION__); + __func__);return -ERANGE ; }
@@ -458,7 +458,7 @@ int __init rpadlpar_io_init(void)if (!is_dlpar_capable ()) {printk (KERN_WARNING "%s: partition not DLPAR capable\n" , - __FUNCTION__); + __func__);return -EPERM ; }
drivers/pci/hotplug/rpaphp_core.c +3 -3
@@ -317,7 +317,7 @@ int rpaphp_add_slot(struct device_node *dn)if (!is_php_dn (dn, &indexes, &names, &types, &power_domains))return 0 ; -dbg ("Entry %s: dn->full_name=%s\n" , __FUNCTION__, dn->full_name); +dbg ("Entry %s: dn->full_name=%s\n" , __func__, dn->full_name);/* register PCI devices */ name = (char *) &names[1 ];
@@ -343,7 +343,7 @@ int rpaphp_add_slot(struct device_node *dn) name +=strlen (name) +1 ; type +=strlen (type) +1 ; } -dbg ("%s - Exit: rc[%d]\n" , __FUNCTION__, retval); +dbg ("%s - Exit: rc[%d]\n" , __func__, retval);/* XXX FIXME: reports a failure only if last entry in loop failed */ return retval;
@@ -404,7 +404,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) }else if (state ==EMPTY ) { slot->state =EMPTY ; }else { -err ("%s: slot[%s] is in invalid state\n" , __FUNCTION__, slot->name); +err ("%s: slot[%s] is in invalid state\n" , __func__, slot->name); slot->state =NOT_VALID ;return -EINVAL ; }
drivers/pci/hotplug/rpaphp_pci.c +7 -7
@@ -42,7 +42,7 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state)if (rc <0 ) {if (rc == -EFAULT || rc == -EEXIST ) {dbg ("%s: slot must be power up to get sensor-state\n" , - __FUNCTION__); + __func__);/* some slots have to be powered up * before get-sensor will succeed.
@@ -51,15 +51,15 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state) &setlevel);if (rc <0 ) {dbg ("%s: power on slot[%s] failed rc=%d.\n" , - __FUNCTION__, slot->name, rc); + __func__, slot->name, rc); }else { rc =rtas_get_sensor (DR_ENTITY_SENSE , slot->index, state); } }else if (rc == -ENODEV ) -info ("%s: slot is unusable\n" , __FUNCTION__); +info ("%s: slot is unusable\n" , __func__);else -err ("%s failed to get sensor state\n" , __FUNCTION__); +err ("%s failed to get sensor state\n" , __func__); }return rc; }
@@ -95,7 +95,7 @@ int rpaphp_enable_slot(struct slot *slot) bus =pcibios_find_pci_bus (slot->dn);if (!bus) { -err ("%s: no pci_bus for dn %s\n" , __FUNCTION__, slot->dn->full_name); +err ("%s: no pci_bus for dn %s\n" , __func__, slot->dn->full_name);return -EINVAL ; }
@@ -111,7 +111,7 @@ int rpaphp_enable_slot(struct slot *slot)/* non-empty slot has to have child */ if (!slot->dn->child) {err ("%s: slot[%s]'s device_node doesn't have child for adapter\n" , - __FUNCTION__, slot->name); + __func__, slot->name);return -EINVAL ; }
@@ -125,7 +125,7 @@ int rpaphp_enable_slot(struct slot *slot)if (debug) {struct pci_dev *dev; -dbg ("%s: pci_devs of slot[%s]\n" , __FUNCTION__, slot->dn->full_name); +dbg ("%s: pci_devs of slot[%s]\n" , __func__, slot->dn->full_name); list_for_each_entry (dev, &bus->devices, bus_list)dbg ("\t%s\n" ,pci_name (dev)); }
drivers/pci/hotplug/rpaphp_slot.c +3 -3
@@ -131,7 +131,7 @@ int rpaphp_deregister_slot(struct slot *slot)struct hotplug_slot *php_slot = slot->hotplug_slot;dbg ("%s - Entry: deregistering slot=%s\n" , - __FUNCTION__, slot->name); + __func__, slot->name);list_del (&slot->rpaphp_slot_list);
@@ -142,7 +142,7 @@ int rpaphp_deregister_slot(struct slot *slot)if (retval)err ("Problem unregistering a slot %s\n" , slot->name); -dbg ("%s - Exit: rc[%d]\n" , __FUNCTION__, retval); +dbg ("%s - Exit: rc[%d]\n" , __func__, retval);return retval; }EXPORT_SYMBOL_GPL (rpaphp_deregister_slot);
@@ -153,7 +153,7 @@ int rpaphp_register_slot(struct slot *slot)int retval;dbg ("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n" , - __FUNCTION__, slot->dn->full_name, slot->index, slot->name, + __func__, slot->dn->full_name, slot->index, slot->name, slot->power_domain, slot->type);/* should not try to register the same slot twice */
drivers/pci/hotplug/sgi_hotplug.c +4 -4
@@ -367,7 +367,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) ret =acpi_load_table ((struct acpi_table_header *)ssdt);if (ACPI_FAILURE (ret)) {printk (KERN_ERR "%s: acpi_load_table failed (0x%x)\n" , - __FUNCTION__, ret); + __func__, ret);/* try to continue on */ } }
@@ -459,7 +459,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)if (ACPI_FAILURE (ret)) {printk (KERN_ERR "%s: acpi_bus_add " "failed (0x%x) for slot %d " -"func %d\n" , __FUNCTION__, +"func %d\n" , __func__, ret, (int )(adr>>16 ), (int )(adr&0xffff ));/* try to continue on */
@@ -570,7 +570,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)if (ACPI_FAILURE (ret)) {printk (KERN_ERR "%s: acpi_unload_table_id " "failed (0x%x) for id %d\n" , - __FUNCTION__, ret, ssdt_id); + __func__, ret, ssdt_id);/* try to continue on */ } }
@@ -689,7 +689,7 @@ static int sn_pci_hotplug_init(void)if (!sn_prom_feature_available (PRF_HOTPLUG_SUPPORT )) {printk (KERN_ERR "%s: PROM version does not support hotplug.\n" , - __FUNCTION__); + __func__);return -EPERM ; }
drivers/pci/hotplug/shpchp.h +3 -3
@@ -234,7 +234,7 @@ static inline struct slot *shpchp_find_slot(struct controller *ctrl, u8 device)return slot; } -err ("%s: slot (device=0x%x) not found\n" , __FUNCTION__, device); +err ("%s: slot (device=0x%x) not found\n" , __func__, device);return NULL ; }
@@ -268,7 +268,7 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)pci_read_config_dword (p_slot->ctrl->pci_dev,PCIX_MISC_BRIDGE_ERRORS_OFFSET , &pcix_bridge_errors_reg); perr_set = pcix_bridge_errors_reg &PERR_OBSERVED_MASK ;if (perr_set) { -dbg ("%s W1C: Bridge_Errors[ PERR_OBSERVED = %08X]\n" ,__FUNCTION__ , perr_set); +dbg ("%s W1C: Bridge_Errors[ PERR_OBSERVED = %08X]\n" ,__func__ , perr_set);pci_write_config_dword (p_slot->ctrl->pci_dev,PCIX_MISC_BRIDGE_ERRORS_OFFSET , perr_set); }
@@ -277,7 +277,7 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)pci_read_config_dword (p_slot->ctrl->pci_dev,PCIX_MEM_BASE_LIMIT_OFFSET , &pcix_mem_base_reg); rse_set = pcix_mem_base_reg &RSE_MASK ;if (rse_set) { -dbg ("%s W1C: Memory_Base_Limit[ RSE ]\n" ,__FUNCTION__ ); +dbg ("%s W1C: Memory_Base_Limit[ RSE ]\n" ,__func__ );pci_write_config_dword (p_slot->ctrl->pci_dev,PCIX_MEM_BASE_LIMIT_OFFSET , rse_set); }
drivers/pci/hotplug/shpchp_core.c +13 -13
@@ -91,7 +91,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);kfree (slot->hotplug_slot->info);kfree (slot->hotplug_slot);
@@ -195,7 +195,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); hotplug_slot->info->attention_status = status; slot->hpc_ops->set_attention_status (slot, status);
@@ -207,7 +207,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);return shpchp_sysfs_enable_slot (slot); }
@@ -216,7 +216,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name);return shpchp_sysfs_disable_slot (slot); }
@@ -226,7 +226,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_power_status (slot, value);if (retval <0 )
@@ -240,7 +240,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_attention_status (slot, value);if (retval <0 )
@@ -254,7 +254,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_latch_status (slot, value);if (retval <0 )
@@ -268,7 +268,7 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_adapter_status (slot, value);if (retval <0 )
@@ -282,7 +282,7 @@ static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)struct slot *slot =get_slot (hotplug_slot);struct pci_bus *bus = slot->ctrl->pci_dev->subordinate; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); *value = (pci_domain_nr (bus) <<16 ) | (slot->bus <<8 ) | slot->device;
@@ -294,7 +294,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_max_bus_speed (slot, value);if (retval <0 )
@@ -308,7 +308,7 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __FUNCTION__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); retval = slot->hpc_ops->get_cur_bus_speed (slot, value);if (retval <0 )
@@ -338,7 +338,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ctrl =kzalloc (sizeof (*ctrl),GFP_KERNEL );if (!ctrl) { -err ("%s : out of memory\n" , __FUNCTION__); +err ("%s : out of memory\n" , __func__); goto err_out_none; }INIT_LIST_HEAD (&ctrl->slot_list);
@@ -402,7 +402,7 @@ static int __init shpcd_init(void)int retval =0 ; retval =pci_register_driver (&shpc_driver); -dbg ("%s: pci_register_driver = %d\n" , __FUNCTION__, retval); +dbg ("%s: pci_register_driver = %d\n" , __func__, retval);info (DRIVER_DESC " version: " DRIVER_VERSION "\n" );return retval; }
drivers/pci/hotplug/shpchp_ctrl.c +23 -23
79 lines not on this page · raw message
drivers/pci/hotplug/shpchp_hpc.c +32 -32
64 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.4.3.500.g83a2c
Part of the diff is not shown here. View the raw message.
PATCH 6/14 drivers/s390: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/s390/block/dasd.c | 4 +- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/vmwatchdog.c | 4 +- drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/device_status.c | 2 +- drivers/s390/crypto/zcrypt_api.h | 8 +- drivers/s390/net/claw.c | 344 +++++++++++++++++++------------------- drivers/s390/net/ctcmain.c | 112 ++++++------ drivers/s390/net/netiucv.c | 96 ++++++------ drivers/s390/s390mach.c | 8 +- drivers/s390/scsi/zfcp_def.h | 2 +- 11 files changed, 292 insertions(+), 292 deletions(-)
drivers/s390/block/dasd.c +2 -2
@@ -980,12 +980,12 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,break ;case -ETIMEDOUT :printk (KERN_WARNING "%s(%s): request timed out\n" , - __FUNCTION__, cdev->dev.bus_id); + __func__, cdev->dev.bus_id);//FIXME - dasd uses own timeout interface... break ;default :printk (KERN_WARNING "%s(%s): unknown error %ld\n" , - __FUNCTION__, cdev->dev.bus_id,PTR_ERR (irb)); + __func__, cdev->dev.bus_id,PTR_ERR (irb)); }return ; }
drivers/s390/char/tape_34xx.c +1 -1
@@ -394,7 +394,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,return tape_34xx_erp_failed (request, -ENOSPC );default :PRINT_ERR ("Invalid op in %s:%i\n" , - __FUNCTION__, __LINE__); + __func__, __LINE__);return tape_34xx_erp_failed (request,0 ); } }
drivers/s390/char/vmwatchdog.c +2 -2
@@ -96,7 +96,7 @@ static int vmwdt_keepalive(void)if (ret) {printk (KERN_WARNING "%s: problem setting interval %d, " -"cmd %s\n" , __FUNCTION__, vmwdt_interval, +"cmd %s\n" , __func__, vmwdt_interval, vmwdt_cmd); }return ret;
@@ -107,7 +107,7 @@ static int vmwdt_disable(void)int ret =__diag288 (wdt_cancel,0 ,"" ,0 );if (ret) {printk (KERN_WARNING "%s: problem disabling watchdog\n" , - __FUNCTION__); + __func__); }return ret; }
drivers/s390/char/zcore.c +1 -1
@@ -224,7 +224,7 @@ static int __init init_cpu_info(enum arch_id arch) sa =kmalloc (sizeof (*sa),GFP_KERNEL );if (!sa) { -ERROR_MSG ("kmalloc failed: %s: %i\n" ,__FUNCTION__, __LINE__); +ERROR_MSG ("kmalloc failed: %s: %i\n" ,__func__, __LINE__);return -ENOMEM ; }if (memcpy_hsa_kernel (sa, sys_info.sa_base, sys_info.sa_size) <0 ) {
drivers/s390/cio/device_status.c +1 -1
@@ -62,7 +62,7 @@ ccw_device_path_notoper(struct ccw_device *cdev)stsch (sch->schid, &sch->schib);CIO_MSG_EVENT (0 ,"%s(0.%x.%04x) - path(s) %02x are " -"not operational \n" , __FUNCTION__, +"not operational \n" , __func__, sch->schid.ssid, sch->schid.sch_no, sch->schib.pmcw.pnom);
drivers/s390/crypto/zcrypt_api.h +4 -4
@@ -43,17 +43,17 @@#define DEV_NAME "zcrypt" #define PRINTK(fmt, args...) \ - printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) + printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args) #define PRINTKN(fmt, args...) \ printk(KERN_DEBUG DEV_NAME ": " fmt, ## args) #define PRINTKW(fmt, args...) \ - printk(KERN_WARNING DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) + printk(KERN_WARNING DEV_NAME ": %s -> " fmt, __func__ , ## args) #define PRINTKC(fmt, args...) \ - printk(KERN_CRIT DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) + printk(KERN_CRIT DEV_NAME ": %s -> " fmt, __func__ , ## args)#ifdef ZCRYPT_DEBUG #define PDEBUG(fmt, args...) \ - printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) + printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args)#else #define PDEBUG(fmt, args...) do {} while (0)#endif
drivers/s390/net/claw.c +172 -172
1,300 lines not on this page · raw message
drivers/s390/net/ctcmain.c +56 -56
418 lines not on this page · raw message
drivers/s390/net/netiucv.c +48 -48
384 lines not on this page · raw message
drivers/s390/s390mach.c +4 -4
@@ -59,15 +59,15 @@ repeat:printk (KERN_WARNING "%s: Code does not support more " "than two chained crws; please report to " -"[email protected]!\n" , __FUNCTION__); +"[email protected]!\n" , __func__); ccode =stcrw (&tmp_crw);printk (KERN_WARNING "%s: crw reports slct=%d, oflw=%d, " "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n" , - __FUNCTION__, tmp_crw.slct, tmp_crw.oflw, + __func__, tmp_crw.slct, tmp_crw.oflw, tmp_crw.chn, tmp_crw.rsc, tmp_crw.anc, tmp_crw.erc, tmp_crw.rsid);printk (KERN_WARNING "%s: This was crw number %x in the " -"chain\n" , __FUNCTION__, chain); +"chain\n" , __func__, chain);if (ccode !=0 )break ; chain = tmp_crw.chn ? chain +1 :0 ;
@@ -83,7 +83,7 @@ repeat: crw[chain].rsid);/* Check for overflows. */ if (crw[chain].oflw) { -pr_debug ("%s: crw overflow detected!\n" , __FUNCTION__); +pr_debug ("%s: crw overflow detected!\n" , __func__);css_schedule_eval_all (); chain =0 ;continue ;
drivers/s390/scsi/zfcp_def.h +1 -1
@@ -539,7 +539,7 @@ struct zfcp_rc_entry {/* logging routine for zfcp */ #define _ZFCP_LOG(fmt, args...) \ - printk(KERN_ERR ZFCP_NAME": %s(%d): " fmt, __FUNCTION__, \ + printk(KERN_ERR ZFCP_NAME": %s(%d): " fmt, __func__, \ __LINE__ , ##args) #define ZFCP_LOG(level, fmt, args...) \
Signature · 1 line
1.5.4.3.500.g83a2c
Re: [PATCH 06/14] drivers/s390: replace remaining __FUNCTION__ occurrences
Quoted 16 lines · Harvey Harrison
__FUNCTION__is gcc-specific, use__func__Signed-off-by Harvey Harrison <[email protected]>--- drivers/s390/block/dasd.c | 4 +- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/vmwatchdog.c | 4 +- drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/device_status.c | 2 +- drivers/s390/crypto/zcrypt_api.h | 8 +- drivers/s390/net/claw.c | 344 +++++++++++++++++++------------------- drivers/s390/net/ctcmain.c | 112 ++++++------ drivers/s390/net/netiucv.c | 96 ++++++------ drivers/s390/s390mach.c | 8 +- drivers/s390/scsi/zfcp_def.h | 2 +- 11 files changed, 292 insertions(+), 292 deletions(-)
Urgh, is this really necessary? The linux kernel is always compiled with gcc for s390. Yes __func__ is a bit shorter and maybe even looks nicer than __FUNCTION__ but is it really worth the trouble ?
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
Re: [PATCH 06/14] drivers/s390: replace remaining __FUNCTION__ occurrences
Quoted 18 lines · On Tue, 04 Mar 2008 09:55:07 +0100 Martin Schwidefsky <[email protected]>…
Quoted 16 lines · Harvey Harrison
__FUNCTION__is gcc-specific, use__func__Signed-off-by Harvey Harrison <[email protected]>--- drivers/s390/block/dasd.c | 4 +- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/vmwatchdog.c | 4 +- drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/device_status.c | 2 +- drivers/s390/crypto/zcrypt_api.h | 8 +- drivers/s390/net/claw.c | 344 +++++++++++++++++++------------------- drivers/s390/net/ctcmain.c | 112 ++++++------ drivers/s390/net/netiucv.c | 96 ++++++------ drivers/s390/s390mach.c | 8 +- drivers/s390/scsi/zfcp_def.h | 2 +- 11 files changed, 292 insertions(+), 292 deletions(-)
Quoted 4 lines
Urgh, is this really necessary? The linux kernel is always compiled with gcc for s390. Yes
__func__is a bit shorter and maybe even looks nicer than__FUNCTION__but is it really worth the trouble ?
That's what everyone is asking ;)
Unfortunately, __func__ is preferred and __FUNCTION__ is deprecated. So the patch converts your code from "wrong" to "right". Even though it was only a teeny bit wrong.
PATCH 7/14 isdn: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/isdn/capi/capidrv.c | 4 ++-- drivers/isdn/capi/capilib.c | 2 +- drivers/isdn/capi/kcapi.c | 4 ++-- drivers/isdn/capi/kcapi.h | 2 +- drivers/isdn/hisax/asuscom.c | 2 +- drivers/isdn/hisax/avm_pci.c | 2 +- drivers/isdn/hisax/diva.c | 2 +- drivers/isdn/hisax/elsa.c | 2 +- drivers/isdn/hisax/hfc_sx.c | 2 +- drivers/isdn/hisax/hfc_usb.c | 6 +++--- drivers/isdn/hisax/hfcscard.c | 2 +- drivers/isdn/hisax/hisax_debug.h | 6 +++--- drivers/isdn/hisax/hisax_fcpcipnp.c | 2 +- drivers/isdn/hisax/ix1_micro.c | 2 +- drivers/isdn/hisax/niccy.c | 2 +- drivers/isdn/hisax/sedlbauer.c | 2 +- drivers/isdn/hisax/st5481.h | 10 +++++----- drivers/isdn/hisax/teles3.c | 2 +- drivers/isdn/i4l/isdn_common.c | 2 +- drivers/isdn/i4l/isdn_net.h | 6 +++--- drivers/isdn/i4l/isdn_ppp.c | 32 ++++++++++++++++---------------- drivers/isdn/i4l/isdn_tty.c | 6 +++--- 22 files changed, 51 insertions(+), 51 deletions(-)
drivers/isdn/capi/capidrv.c +2 -2
@@ -1388,12 +1388,12 @@ static void capidrv_recv_message(struct capi20_appl *ap, struct sk_buff *skb)_cdebbuf *cdb =capi_cmsg2str (&s_cmsg);if (cdb) { -printk (KERN_DEBUG "%s: applid=%d %s\n" , __FUNCTION__, +printk (KERN_DEBUG "%s: applid=%d %s\n" , __func__, ap->applid, cdb->buf);cdebbuf_free (cdb); }else printk (KERN_DEBUG "%s: applid=%d %s not traced\n" , - __FUNCTION__, ap->applid, + __func__, ap->applid,capi_cmd2str (s_cmsg.Command, s_cmsg.Subcommand)); } if (s_cmsg.Command == CAPI_DATA_B3
drivers/isdn/capi/capilib.c +1 -1
@@ -4,7 +4,7 @@#include <linux/isdn/capilli.h> #define DBG(format, arg...) do { \ -printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ +printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \ } while (0)struct capilib_msgidqueue {
drivers/isdn/capi/kcapi.c +2 -2
@@ -154,7 +154,7 @@ static void register_appl(struct capi_ctr *card, u16 applid, capi_register_paramif (card) card->register_appl (card, applid, rparam);else -printk (KERN_WARNING "%s: cannot get card resources\n" , __FUNCTION__); +printk (KERN_WARNING "%s: cannot get card resources\n" , __func__); }
@@ -178,7 +178,7 @@ static void notify_up(u32 contr)printk (KERN_DEBUG "kcapi: notify up contr %d\n" , contr); }if (!card) { -printk (KERN_WARNING "%s: invalid contr %d\n" , __FUNCTION__, contr); +printk (KERN_WARNING "%s: invalid contr %d\n" , __func__, contr);return ; }for (applid =1 ; applid <=CAPI_MAXAPPL ; applid++) {
drivers/isdn/capi/kcapi.h +1 -1
@@ -17,7 +17,7 @@#ifdef KCAPI_DEBUG #define DBG(format, arg...) do { \ -printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ +printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \ } while (0)#else #define DBG(format, arg...) /* */
drivers/isdn/hisax/asuscom.c +1 -1
@@ -346,7 +346,7 @@ setup_asuscom(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/avm_pci.c +1 -1
@@ -797,7 +797,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs) err =pnp_activate_dev (pnp_avm_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } cs->hw.avm.cfg_reg =
drivers/isdn/hisax/diva.c +1 -1
@@ -1088,7 +1088,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/elsa.c +1 -1
@@ -937,7 +937,7 @@ setup_elsa_isapnp(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/hfc_sx.c +1 -1
@@ -1419,7 +1419,7 @@ setup_hfcsx(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/hfc_usb.c +3 -3
@@ -905,7 +905,7 @@ rx_int_complete(struct urb *urb)if (status) {printk (KERN_INFO "HFC-S USB: %s error resubmitting URB fifo(%d)\n" , - __FUNCTION__, fifon); + __func__, fifon); } }
@@ -1543,14 +1543,14 @@ hfc_usb_disconnect(struct usb_interface *intf)stop_isoc_chain (&context->fifos[i]);DBG (HFCUSB_DBG_INIT ,"HFC-S USB: %s stopping ISOC chain Fifo(%i)" , - __FUNCTION__, i); + __func__, i); } }else {if (context->fifos[i].active >0 ) { context->fifos[i].active =0 ;DBG (HFCUSB_DBG_INIT ,"HFC-S USB: %s unlinking URB for Fifo(%i)" , - __FUNCTION__, i); + __func__, i); }usb_kill_urb (context->fifos[i].urb);usb_free_urb (context->fifos[i].urb);
drivers/isdn/hisax/hfcscard.c +1 -1
@@ -193,7 +193,7 @@ setup_hfcs(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/hisax_debug.h +3 -3
@@ -27,14 +27,14 @@ #define DBG(level, format, arg...) do { \ if (level & __debug_variable) \ -printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ +printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \ } while (0)#define DBG_PACKET (level,data,count) \ - if (level & __debug_variable) dump_packet(__FUNCTION__,data,count) + if (level & __debug_variable) dump_packet(__func__,data,count)#define DBG_SKB (level,skb) \ - if ((level & __debug_variable) && skb) dump_packet(__FUNCTION__,skb->data,skb->len) + if ((level & __debug_variable) && skb) dump_packet(__func__,skb->data,skb->len) static void __attribute__((unused))
drivers/isdn/hisax/hisax_fcpcipnp.c +1 -1
@@ -935,7 +935,7 @@ static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_ipnp_disable_dev (pdev); retval =pnp_activate_dev (pdev);if (retval <0 ) { -printk (KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n" , __FUNCTION__, +printk (KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n" , __func__, (char *)dev_id->driver_data, retval); goto err_free; }
drivers/isdn/hisax/ix1_micro.c +1 -1
@@ -253,7 +253,7 @@ setup_ix1micro(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/niccy.c +1 -1
@@ -256,7 +256,7 @@ int __devinit setup_niccy(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err <0 ) {printk (KERN_WARNING "%s: pnp_activate_dev " -"ret(%d)\n" , __FUNCTION__, err); +"ret(%d)\n" , __func__, err);return 0 ; } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/sedlbauer.c +1 -1
@@ -555,7 +555,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[1 ] =pnp_port_start (pnp_d,0 );
drivers/isdn/hisax/st5481.h +5 -5
@@ -218,13 +218,13 @@ enum {#define L1_EVENT_COUNT (EV_TIMER3 + 1) #define ERR(format, arg...) \ -printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) +printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) #define WARN(format, arg...) \ -printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) +printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) #define INFO(format, arg...) \ -printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) +printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __func__ , ## arg)#include "isdnhdlc.h" #include "fsm.h"
@@ -406,7 +406,7 @@ struct st5481_adapter {/* * Submit an URB with error reporting. This is a macro so -* the __FUNCTION__ returns the caller function name. +* the __func__ returns the caller function name. */ #define SUBMIT_URB (urb, mem_flags) \ ({ \
@@ -470,7 +470,7 @@ extern int st5481_debug;#ifdef CONFIG_HISAX_DEBUG #define DBG_ISO_PACKET (level,urb) \ - if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb) + if (level & __debug_variable) dump_iso_packet(__func__,urb)static void __attribute__((unused))dump_iso_packet (const char *name,struct urb *urb)
drivers/isdn/hisax/teles3.c +1 -1
@@ -301,7 +301,7 @@ setup_teles3(struct IsdnCard *card) err =pnp_activate_dev (pnp_d);if (err<0 ) {printk (KERN_WARNING "%s: pnp_activate_dev ret(%d)\n" , - __FUNCTION__, err); + __func__, err);return (0 ); } card->para[3 ] =pnp_port_start (pnp_d,2 );
drivers/isdn/i4l/isdn_common.c +1 -1
@@ -1924,7 +1924,7 @@ isdn_free_channel(int di, int ch, int usage)if ((di <0 ) || (ch <0 )) {printk (KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n" , - __FUNCTION__, di, ch); + __func__, di, ch);return ; }for (i =0 ; i <ISDN_MAX_CHANNELS ; i++)
drivers/isdn/i4l/isdn_net.h +3 -3
@@ -108,7 +108,7 @@ static __inline__ void isdn_net_add_to_bundle(isdn_net_dev *nd, isdn_net_local * lp = nd->queue;// printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n", -// __FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last); +// __func__, lp->name, lp, nlp->name, nlp, lp->last); nlp->last = lp->last; lp->last->next = nlp; lp->last = nlp;
@@ -129,7 +129,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp) master_lp = (isdn_net_local *) lp->master->priv;// printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n", -// __FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); +// __func__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); spin_lock_irqsave (&master_lp->netdev->queue_lock, flags); lp->last->next = lp->next; lp->next->last = lp->last;
@@ -141,7 +141,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp) } lp->next = lp->last = lp;/* (re)set own pointers */ // printk(KERN_DEBUG "%s: mndq(%p)\n", -// __FUNCTION__, master_lp->netdev->queue); +// __func__, master_lp->netdev->queue); spin_unlock_irqrestore (&master_lp->netdev->queue_lock, flags); }
drivers/isdn/i4l/isdn_ppp.c +16 -16
@@ -110,7 +110,7 @@ isdn_ppp_free(isdn_net_local * lp)if (lp->ppp_slot <0 || lp->ppp_slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: ppp_slot(%d) out of range\n" , - __FUNCTION__, lp->ppp_slot); + __func__, lp->ppp_slot);return 0 ; }
@@ -127,7 +127,7 @@ isdn_ppp_free(isdn_net_local * lp)#endif /* CONFIG_ISDN_MPP */ if (lp->ppp_slot <0 || lp->ppp_slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: ppp_slot(%d) now invalid\n" , - __FUNCTION__, lp->ppp_slot); + __func__, lp->ppp_slot);return 0 ; } is = ippp_table[lp->ppp_slot];
@@ -226,7 +226,7 @@ isdn_ppp_wakeup_daemon(isdn_net_local * lp) {if (lp->ppp_slot <0 || lp->ppp_slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: ppp_slot(%d) out of range\n" , - __FUNCTION__, lp->ppp_slot); + __func__, lp->ppp_slot);return ; } ippp_table[lp->ppp_slot]->state =IPPP_OPEN |IPPP_CONNECT |IPPP_NOBLOCK ;
@@ -245,7 +245,7 @@ isdn_ppp_closewait(int slot)if (slot <0 || slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: slot(%d) out of range\n" , - __FUNCTION__, slot); + __func__, slot);return 0 ; } is = ippp_table[slot];
@@ -343,7 +343,7 @@ isdn_ppp_release(int min, struct file *file) is = file->private_data;if (!is) { -printk (KERN_ERR "%s: no file->private_data\n" , __FUNCTION__); +printk (KERN_ERR "%s: no file->private_data\n" , __func__);return ; }if (is->debug &0x1 )
@@ -353,7 +353,7 @@ isdn_ppp_release(int min, struct file *file)isdn_net_dev *p = is->lp->netdev;if (!p) { -printk (KERN_ERR "%s: no lp->netdev\n" , __FUNCTION__); +printk (KERN_ERR "%s: no lp->netdev\n" , __func__);return ; } is->state &= ~IPPP_CONNECT ;/* -> effect: no call of wakeup */
@@ -1080,7 +1080,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buffprintk (KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n" );if (net_dev->local->ppp_slot <0 ) {printk (KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n" , - __FUNCTION__, net_dev->local->ppp_slot); + __func__, net_dev->local->ppp_slot); goto drop_packet; }if (slhc_remember (ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <=0 ) {
@@ -1107,7 +1107,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff skb_old->len);if (net_dev->local->ppp_slot <0 ) {printk (KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n" , - __FUNCTION__, net_dev->local->ppp_slot); + __func__, net_dev->local->ppp_slot); goto drop_packet; } pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp,
@@ -1553,7 +1553,7 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )if (lp->ppp_slot <0 ) {printk (KERN_ERR "%s: lp->ppp_slot(%d) out of range\n" , - __FUNCTION__, lp->ppp_slot); + __func__, lp->ppp_slot);return (-EINVAL ); }
@@ -1604,7 +1604,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, slot = lp->ppp_slot;if (slot <0 || slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: lp->ppp_slot(%d)\n" , - __FUNCTION__, lp->ppp_slot); + __func__, lp->ppp_slot); stats->frame_drops++;dev_kfree_skb (skb);spin_unlock_irqrestore (&mp->lock, flags);
@@ -1641,7 +1641,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, slot = lpq->ppp_slot;if (slot <0 || slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: lpq->ppp_slot(%d)\n" , - __FUNCTION__, lpq->ppp_slot); + __func__, lpq->ppp_slot); }else {u32 lls = ippp_table[slot]->last_link_seqno;if (MP_LT (lls, minseq))
@@ -1875,7 +1875,7 @@ void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,if (lp->ppp_slot <0 || lp->ppp_slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: lp->ppp_slot(%d) out of range\n" , - __FUNCTION__, lp->ppp_slot); + __func__, lp->ppp_slot);return ; }if (MP_FLAGS (from) == (MP_BEGIN_FRAG |MP_END_FRAG ) ) {
@@ -2655,7 +2655,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, lp->ppp_slot);if (lp->ppp_slot <0 || lp->ppp_slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: lp->ppp_slot(%d) out of range\n" , - __FUNCTION__, lp->ppp_slot); + __func__, lp->ppp_slot);return ; } is = ippp_table[lp->ppp_slot];
@@ -2665,7 +2665,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;if (slot <0 || slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: slot(%d) out of range\n" , - __FUNCTION__, slot); + __func__, slot);return ; } mis = ippp_table[slot];
@@ -2829,7 +2829,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, structreturn ;if (slot <0 || slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: lp->ppp_slot(%d) out of range\n" , - __FUNCTION__, slot); + __func__, slot);return ; } is = ippp_table[slot];
@@ -2852,7 +2852,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;if (slot <0 || slot >=ISDN_MAX_CHANNELS ) {printk (KERN_ERR "%s: slot(%d) out of range\n" , - __FUNCTION__, slot); + __func__, slot);return ; } mis = ippp_table[slot];
drivers/isdn/i4l/isdn_tty.c +3 -3
@@ -1347,7 +1347,7 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)modem_info *info = (modem_info *) tty->driver_data;u_char control, status; -if (isdn_tty_paranoia_check (info, tty->name, __FUNCTION__)) +if (isdn_tty_paranoia_check (info, tty->name, __func__))return -ENODEV ;if (tty->flags & (1 <<TTY_IO_ERROR ))return -EIO ;
@@ -1372,7 +1372,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file, {modem_info *info = (modem_info *) tty->driver_data; -if (isdn_tty_paranoia_check (info, tty->name, __FUNCTION__)) +if (isdn_tty_paranoia_check (info, tty->name, __func__))return -ENODEV ;if (tty->flags & (1 <<TTY_IO_ERROR ))return -EIO ;
@@ -1608,7 +1608,7 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)if (isdn_tty_paranoia_check (info, tty->name,"isdn_tty_open" ))return -ENODEV ;if (!try_module_get (info->owner)) { -printk (KERN_WARNING "%s: cannot reserve module\n" , __FUNCTION__); +printk (KERN_WARNING "%s: cannot reserve module\n" , __func__);return -ENODEV ; }#ifdef ISDN_DEBUG_MODEM_OPEN
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 8/14 scsi: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/scsi/advansys.c | 2 +- drivers/scsi/aha152x.c | 12 ++++---- drivers/scsi/aic94xx/aic94xx.h | 4 +- drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +- drivers/scsi/aic94xx/aic94xx_scb.c | 46 ++++++++++++++++---------------- drivers/scsi/aic94xx/aic94xx_task.c | 2 +- drivers/scsi/aic94xx/aic94xx_tmf.c | 18 ++++++------ drivers/scsi/arm/fas216.c | 4 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/imm.c | 2 +- drivers/scsi/ipr.h | 6 ++-- drivers/scsi/iscsi_tcp.c | 12 ++++---- drivers/scsi/libsas/sas_ata.c | 16 +++++----- drivers/scsi/libsas/sas_expander.c | 12 ++++---- drivers/scsi/libsas/sas_port.c | 4 +- drivers/scsi/libsas/sas_scsi_host.c | 28 ++++++++++---------- drivers/scsi/libsrp.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 6 ++-- drivers/scsi/megaraid/mega_common.h | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 16 +++++----- drivers/scsi/megaraid/megaraid_mm.c | 4 +- drivers/scsi/nsp32.c | 4 +- drivers/scsi/nsp32_debug.c | 2 +- drivers/scsi/pcmcia/nsp_cs.c | 4 +- drivers/scsi/pcmcia/nsp_debug.c | 2 +- drivers/scsi/ppa.c | 2 +- drivers/scsi/qla1280.c | 12 ++++---- drivers/scsi/scsi_debug.c | 12 ++++---- drivers/scsi/scsi_devinfo.c | 6 ++-- drivers/scsi/scsi_error.c | 26 +++++++++--------- drivers/scsi/scsi_lib.c | 6 ++-- drivers/scsi/scsi_netlink.c | 8 +++--- drivers/scsi/scsi_proc.c | 4 +- drivers/scsi/scsi_scan.c | 12 ++++---- drivers/scsi/scsi_tgt_priv.h | 2 +- drivers/scsi/scsi_transport_fc.c | 12 ++++---- drivers/scsi/scsi_transport_sas.c | 4 +- drivers/scsi/tmscsim.c | 8 +++--- drivers/scsi/wd7000.c | 8 +++--- drivers/scsi/zalon.c | 8 +++--- 42 files changed, 175 insertions(+), 175 deletions(-)
drivers/scsi/advansys.c +1 -1
@@ -2278,7 +2278,7 @@ do { \ #define ASC_DBG(lvl, format, arg...) { \ if (asc_dbglvl >= (lvl)) \ printk(KERN_DEBUG "%s: %s: " format, DRV_NAME, \ - __FUNCTION__ , ## arg); \ + __func__ , ## arg); \ }#define ASC_DBG_PRT_SCSI_HOST (lvl, s) \
drivers/scsi/aha152x.c +6 -6
@@ -288,20 +288,20 @@ static LIST_HEAD(aha152x_host_list);#define DO_LOCK (flags) \ do { \ if(spin_is_locked(&QLOCK)) { \ - DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \ + DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \ } \ - DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \ spin_lock_irqsave(&QLOCK,flags); \ - DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ - QLOCKER=__FUNCTION__; \ + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \ + QLOCKER=__func__; \ QLOCKERL=__LINE__; \ } while(0)#define DO_UNLOCK (flags) \ do { \ - DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \ + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \ spin_unlock_irqrestore(&QLOCK,flags); \ - DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \ QLOCKER="(not locked)"; \ QLOCKERL=0; \ } while(0)
drivers/scsi/aic94xx/aic94xx.h +2 -2
@@ -39,9 +39,9 @@#ifdef ASD_ENTER_EXIT #define ENTER printk(KERN_NOTICE "%s: ENTER %s\n", ASD_DRIVER_NAME, \ - __FUNCTION__) + __func__)#define EXIT printk(KERN_NOTICE "%s: --EXIT %s\n", ASD_DRIVER_NAME, \ - __FUNCTION__) + __func__)#else #define ENTER #define EXIT
drivers/scsi/aic94xx/aic94xx_hwi.c +1 -1
@@ -1361,7 +1361,7 @@ int asd_enable_phys(struct asd_ha_struct *asd_ha, const u8 phy_mask)struct asd_ascb *ascb_list;if (!phy_mask) { -asd_printk ("%s called with phy_mask of 0!?\n" , __FUNCTION__); +asd_printk ("%s called with phy_mask of 0!?\n" , __func__);return 0 ; }
drivers/scsi/aic94xx/aic94xx_scb.c +23 -23
162 lines not on this page · raw message
drivers/scsi/aic94xx/aic94xx_task.c +1 -1
@@ -320,7 +320,7 @@ Again:case TC_RESUME :case TC_PARTIAL_SG_LIST :default : -ASD_DPRINTK ("%s: dl opcode: 0x%x?\n" , __FUNCTION__, opcode); +ASD_DPRINTK ("%s: dl opcode: 0x%x?\n" , __func__, opcode);break ; }
drivers/scsi/aic94xx/aic94xx_tmf.c +9 -9
@@ -70,12 +70,12 @@ static inline void asd_timedout_common(unsigned long data)static void asd_clear_nexus_tasklet_complete (struct asd_ascb *ascb,struct done_list_struct *dl) { -ASD_DPRINTK ("%s: here\n" , __FUNCTION__); +ASD_DPRINTK ("%s: here\n" , __func__);if (!del_timer (&ascb->timer)) { -ASD_DPRINTK ("%s: couldn't delete timer\n" , __FUNCTION__); +ASD_DPRINTK ("%s: couldn't delete timer\n" , __func__);return ; } -ASD_DPRINTK ("%s: opcode: 0x%x\n" , __FUNCTION__, dl->opcode); +ASD_DPRINTK ("%s: opcode: 0x%x\n" , __func__, dl->opcode); ascb->uldd_task = (void *) (unsigned long ) dl->opcode;complete (&ascb->completion); }
@@ -84,14 +84,14 @@ static void asd_clear_nexus_timedout(unsigned long data) {struct asd_ascb *ascb = (void *) data; -ASD_DPRINTK ("%s: here\n" , __FUNCTION__); +ASD_DPRINTK ("%s: here\n" , __func__);asd_timedout_common (data); ascb->uldd_task = (void *)TMF_RESP_FUNC_FAILED ;complete (&ascb->completion); }#define CLEAR_NEXUS_PRE \ - ASD_DPRINTK("%s: PRE\n", __FUNCTION__); \ + ASD_DPRINTK("%s: PRE\n", __func__); \ res = 1; \ ascb = asd_ascb_alloc_list(asd_ha, &res, GFP_KERNEL); \ if (!ascb) \
@@ -101,12 +101,12 @@ static void asd_clear_nexus_timedout(unsigned long data) scb->header.opcode = CLEAR_NEXUS#define CLEAR_NEXUS_POST \ - ASD_DPRINTK("%s: POST\n", __FUNCTION__); \ + ASD_DPRINTK("%s: POST\n", __func__); \ res = asd_enqueue_internal(ascb, asd_clear_nexus_tasklet_complete, \ asd_clear_nexus_timedout); \ if (res) \ goto out_err; \ - ASD_DPRINTK("%s: clear nexus posted, waiting...\n", __FUNCTION__); \ + ASD_DPRINTK("%s: clear nexus posted, waiting...\n", __func__); \ wait_for_completion(&ascb->completion); \ res = (int) (unsigned long) ascb->uldd_task; \ if (res == TC_NO_ERROR) \
@@ -355,7 +355,7 @@ int asd_abort_task(struct sas_task *task)if (task->task_state_flags &SAS_TASK_STATE_DONE ) {spin_unlock_irqrestore (&task->task_state_lock, flags); res =TMF_RESP_FUNC_COMPLETE ; -ASD_DPRINTK ("%s: task 0x%p done\n" , __FUNCTION__, task); +ASD_DPRINTK ("%s: task 0x%p done\n" , __func__, task); goto out_done; }spin_unlock_irqrestore (&task->task_state_lock, flags);
@@ -418,7 +418,7 @@ int asd_abort_task(struct sas_task *task)if (task->task_state_flags &SAS_TASK_STATE_DONE ) {spin_unlock_irqrestore (&task->task_state_lock, flags); res =TMF_RESP_FUNC_COMPLETE ; -ASD_DPRINTK ("%s: task 0x%p done\n" , __FUNCTION__, task); +ASD_DPRINTK ("%s: task 0x%p done\n" , __func__, task); goto out_done; }spin_unlock_irqrestore (&task->task_state_lock, flags);
drivers/scsi/arm/fas216.c +2 -2
@@ -240,7 +240,7 @@ static void __fas216_checkmagic(FAS216_Info *info, const char *func) panic("scsi memory space corrupted in %s", func); } } -#define fas216_checkmagic (info) __fas216_checkmagic((info), __FUNCTION__) +#define fas216_checkmagic (info) __fas216_checkmagic((info), __func__)#else #define fas216_checkmagic (info)#endif
@@ -2658,7 +2658,7 @@ int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)fas216_checkmagic (info);printk ("scsi%d.%c: %s: resetting host\n" , - info->host->host_no,'0' + SCpnt->device->id, __FUNCTION__); + info->host->host_no,'0' + SCpnt->device->id, __func__);/* * Reset the SCSI chip.
drivers/scsi/ibmvscsi/ibmvstgt.c +1 -1
@@ -55,7 +55,7 @@/* tmp - will replace with SCSI logging stuff */ #define eprintk(fmt, args...) \ do { \ - printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ + printk("%s(%d) " fmt, __func__, __LINE__, ##args); \ } while (0)/* #define dprintk eprintk */ #define dprintk(fmt, args...)
drivers/scsi/imm.c +1 -1
@@ -163,7 +163,7 @@ static int imm_proc_info(struct Scsi_Host *host, char *buffer, char **start,#if IMM_DEBUG >0 #define imm_fail (x,y) printk("imm: imm_fail(%i) from %s at line %d\n",\ - y, __FUNCTION__, __LINE__); imm_fail_func(x,y); + y, __func__, __LINE__); imm_fail_func(x,y);static inline void imm_fail_func (imm_struct *dev,int error_code) #else
drivers/scsi/ipr.h +3 -3
@@ -1403,10 +1403,10 @@ struct ipr_ucode_image_header { }#define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) -#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__)) -#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__)) +#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __func__)) +#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __func__))#define ipr_err_separator \ ipr_err("----------------------------------------------------------\n")
drivers/scsi/iscsi_tcp.c +6 -6
@@ -535,7 +535,7 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)if (tcp_ctask->exp_datasn != datasn) {debug_tcp ("%s: ctask->exp_datasn(%d) != rhdr->datasn(%d)\n" , - __FUNCTION__, tcp_ctask->exp_datasn, datasn); + __func__, tcp_ctask->exp_datasn, datasn);return ISCSI_ERR_DATASN ; }
@@ -544,7 +544,7 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) tcp_ctask->data_offset =be32_to_cpu (rhdr->offset);if (tcp_ctask->data_offset + tcp_conn->in.datalen >scsi_bufflen (sc)) {debug_tcp ("%s: data_offset(%d) + data_len(%d) > total_length_in(%d)\n" , - __FUNCTION__, tcp_ctask->data_offset, + __func__, tcp_ctask->data_offset, tcp_conn->in.datalen,scsi_bufflen (sc));return ISCSI_ERR_DATA_OFFSET ; }
@@ -637,7 +637,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)if (tcp_ctask->exp_datasn != r2tsn){debug_tcp ("%s: ctask->exp_datasn(%d) != rhdr->r2tsn(%d)\n" , - __FUNCTION__, tcp_ctask->exp_datasn, r2tsn); + __func__, tcp_ctask->exp_datasn, r2tsn);return ISCSI_ERR_R2TSN ; }
@@ -1174,7 +1174,7 @@ iscsi_tcp_send_hdr_prep(struct iscsi_conn *conn, void *hdr, size_t hdrlen) {struct iscsi_tcp_conn *tcp_conn = conn->dd_data; -debug_tcp ("%s(%p%s)\n" , __FUNCTION__, tcp_conn, +debug_tcp ("%s(%p%s)\n" , __func__, tcp_conn, conn->hdrdgst_en?", digest enabled" :"" );/* Clear the data segment - needs to be filled in by the
@@ -1215,7 +1215,7 @@ iscsi_tcp_send_data_prep(struct iscsi_conn *conn, struct scatterlist *sg,struct hash_desc *tx_hash =NULL ;unsigned int hdr_spec_len; -debug_tcp ("%s(%p, offset=%d, datalen=%d%s)\n" , __FUNCTION__, +debug_tcp ("%s(%p, offset=%d, datalen=%d%s)\n" , __func__, tcp_conn, offset, len, conn->datadgst_en?", digest enabled" :"" );
@@ -1240,7 +1240,7 @@ iscsi_tcp_send_linear_data_prepare(struct iscsi_conn *conn, void *data,struct hash_desc *tx_hash =NULL ;unsigned int hdr_spec_len; -debug_tcp ("%s(%p, datalen=%d%s)\n" , __FUNCTION__, tcp_conn, len, +debug_tcp ("%s(%p, datalen=%d%s)\n" , __func__, tcp_conn, len, conn->datadgst_en?", digest enabled" :"" );/* Make sure the datalen matches what the caller
drivers/scsi/libsas/sas_ata.c +8 -8
@@ -74,7 +74,7 @@ static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)case SAS_OPEN_TO :case SAS_OPEN_REJECT :SAS_DPRINTK ("%s: Saw error %d. What to do?\n" , - __FUNCTION__, ts->stat); + __func__, ts->stat);return AC_ERR_OTHER ;case SAS_ABORTED_TASK :
@@ -115,7 +115,7 @@ static void sas_ata_task_done(struct sas_task *task) }else if (stat->stat !=SAM_STAT_GOOD ) { ac =sas_to_ata_err (stat);if (ac) { -SAS_DPRINTK ("%s: SAS error %x\n" , __FUNCTION__, +SAS_DPRINTK ("%s: SAS error %x\n" , __func__, stat->stat);/* We saw a SAS error. Send a vague error. */ qc->err_mask = ac;
@@ -242,20 +242,20 @@ static void sas_ata_phy_reset(struct ata_port *ap) res = i->dft->lldd_I_T_nexus_reset (dev);if (res) -SAS_DPRINTK ("%s: Unable to reset I T nexus?\n" , __FUNCTION__); +SAS_DPRINTK ("%s: Unable to reset I T nexus?\n" , __func__);switch (dev->sata_dev.command_set) {case ATA_COMMAND_SET : -SAS_DPRINTK ("%s: Found ATA device.\n" , __FUNCTION__); +SAS_DPRINTK ("%s: Found ATA device.\n" , __func__); ap->link.device[0 ].class =ATA_DEV_ATA ;break ;case ATAPI_COMMAND_SET : -SAS_DPRINTK ("%s: Found ATAPI device.\n" , __FUNCTION__); +SAS_DPRINTK ("%s: Found ATAPI device.\n" , __func__); ap->link.device[0 ].class =ATA_DEV_ATAPI ;break ;default :SAS_DPRINTK ("%s: Unknown SATA command set: %d.\n" , - __FUNCTION__, + __func__, dev->sata_dev.command_set); ap->link.device[0 ].class =ATA_DEV_UNKNOWN ;break ;
@@ -303,7 +303,7 @@ static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in, {struct domain_device *dev = ap->private_data; -SAS_DPRINTK ("STUB %s\n" , __FUNCTION__); +SAS_DPRINTK ("STUB %s\n" , __func__);switch (sc_reg_in) {case SCR_STATUS : dev->sata_dev.sstatus = val;
@@ -328,7 +328,7 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in, {struct domain_device *dev = ap->private_data; -SAS_DPRINTK ("STUB %s\n" , __FUNCTION__); +SAS_DPRINTK ("STUB %s\n" , __func__);switch (sc_reg_in) {case SCR_STATUS : *val = dev->sata_dev.sstatus;
drivers/scsi/libsas/sas_expander.c +6 -6
@@ -121,7 +121,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,break ; }else {SAS_DPRINTK ("%s: task to dev %016llx response: 0x%x " -"status 0x%x\n" , __FUNCTION__, +"status 0x%x\n" , __func__,SAS_ADDR (dev->sas_addr), task->task_status.resp, task->task_status.stat);
@@ -1279,7 +1279,7 @@ static int sas_configure_present(struct domain_device *dev, int phy_id, goto out; }else if (res !=SMP_RESP_FUNC_ACC ) {SAS_DPRINTK ("%s: dev %016llx phy 0x%x index 0x%x " -"result 0x%x\n" , __FUNCTION__, +"result 0x%x\n" , __func__,SAS_ADDR (dev->sas_addr), phy_id, i, res); goto out; }
@@ -1901,7 +1901,7 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,if (!rsp) {printk ("%s: space for a smp response is missing\n" , - __FUNCTION__); + __func__);return -EINVAL ; }
@@ -1914,20 +1914,20 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,if (type !=SAS_EDGE_EXPANDER_DEVICE && type !=SAS_FANOUT_EXPANDER_DEVICE ) {printk ("%s: can we send a smp request to a device?\n" , - __FUNCTION__); + __func__);return -EINVAL ; } dev =sas_find_dev_by_rphy (rphy);if (!dev) { -printk ("%s: fail to find a domain_device?\n" , __FUNCTION__); +printk ("%s: fail to find a domain_device?\n" , __func__);return -EINVAL ; }/* do we need to support multiple segments? */ if (req->bio->bi_vcnt >1 || rsp->bio->bi_vcnt >1 ) {printk ("%s: multiple segments req %u %u, rsp %u %u\n" , - __FUNCTION__, req->bio->bi_vcnt, req->data_len, + __func__, req->bio->bi_vcnt, req->data_len, rsp->bio->bi_vcnt, rsp->data_len);return -EINVAL ; }
drivers/scsi/libsas/sas_port.c +2 -2
@@ -50,7 +50,7 @@ static void sas_form_port(struct asd_sas_phy *phy)sas_deform_port (phy); else {SAS_DPRINTK ("%s: phy%d belongs to port%d already(%d)!\n" , - __FUNCTION__, phy->id, phy->port->id, + __func__, phy->id, phy->port->id, phy->port->num_phys);return ; }
@@ -78,7 +78,7 @@ static void sas_form_port(struct asd_sas_phy *phy)if (i >= sas_ha->num_phys) {printk (KERN_NOTICE "%s: couldn't find a free port, bug?\n" , - __FUNCTION__); + __func__);spin_unlock_irqrestore (&sas_ha->phy_port_lock, flags);return ; }
drivers/scsi/libsas/sas_scsi_host.c +14 -14
@@ -341,7 +341,7 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task) flags);SAS_DPRINTK ("%s: task 0x%p aborted from " "task_queue\n" , - __FUNCTION__, task); + __func__, task);return TASK_IS_ABORTED ; } }
@@ -349,13 +349,13 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task) }for (i =0 ; i <5 ; i++) { -SAS_DPRINTK ("%s: aborting task 0x%p\n" , __FUNCTION__, task); +SAS_DPRINTK ("%s: aborting task 0x%p\n" , __func__, task); res = si->dft->lldd_abort_task (task);spin_lock_irqsave (&task->task_state_lock, flags);if (task->task_state_flags &SAS_TASK_STATE_DONE ) {spin_unlock_irqrestore (&task->task_state_lock, flags); -SAS_DPRINTK ("%s: task 0x%p is done\n" , __FUNCTION__, +SAS_DPRINTK ("%s: task 0x%p is done\n" , __func__, task);return TASK_IS_DONE ; }
@@ -363,24 +363,24 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)if (res ==TMF_RESP_FUNC_COMPLETE ) {SAS_DPRINTK ("%s: task 0x%p is aborted\n" , - __FUNCTION__, task); + __func__, task);return TASK_IS_ABORTED ; }else if (si->dft->lldd_query_task) {SAS_DPRINTK ("%s: querying task 0x%p\n" , - __FUNCTION__, task); + __func__, task); res = si->dft->lldd_query_task (task);switch (res) {case TMF_RESP_FUNC_SUCC :SAS_DPRINTK ("%s: task 0x%p at LU\n" , - __FUNCTION__, task); + __func__, task);return TASK_IS_AT_LU ;case TMF_RESP_FUNC_COMPLETE :SAS_DPRINTK ("%s: task 0x%p not at LU\n" , - __FUNCTION__, task); + __func__, task);return TASK_IS_NOT_AT_LU ;case TMF_RESP_FUNC_FAILED :SAS_DPRINTK ("%s: task 0x%p failed to abort\n" , - __FUNCTION__, task); + __func__, task);return TASK_ABORT_FAILED ; }
@@ -547,7 +547,7 @@ Again:switch (res) {case TASK_IS_DONE : -SAS_DPRINTK ("%s: task 0x%p is done\n" , __FUNCTION__, +SAS_DPRINTK ("%s: task 0x%p is done\n" , __func__, task);sas_eh_finish_cmd (cmd);if (need_reset)
@@ -555,7 +555,7 @@ Again:continue ;case TASK_IS_ABORTED :SAS_DPRINTK ("%s: task 0x%p is aborted\n" , - __FUNCTION__, task); + __func__, task);sas_eh_finish_cmd (cmd);if (need_reset)try_to_reset_cmd_device (shost, cmd);
@@ -635,7 +635,7 @@ Again: }return list_empty (work_q); clear_q: -SAS_DPRINTK ("--- Exit %s -- clear_q\n" , __FUNCTION__); +SAS_DPRINTK ("--- Exit %s -- clear_q\n" , __func__);list_for_each_entry_safe (cmd, n, work_q, eh_entry)sas_eh_finish_cmd (cmd);
@@ -652,7 +652,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)list_splice_init (&shost->eh_cmd_q, &eh_work_q);spin_unlock_irqrestore (shost->host_lock, flags); -SAS_DPRINTK ("Enter %s\n" , __FUNCTION__); +SAS_DPRINTK ("Enter %s\n" , __func__);/* * Deal with commands that still have SAS tasks (i.e. they didn't * complete via the normal sas_task completion mechanism)
@@ -671,7 +671,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost) out:scsi_eh_flush_done_q (&ha->eh_done_q); -SAS_DPRINTK ("--- Exit %s\n" , __FUNCTION__); +SAS_DPRINTK ("--- Exit %s\n" , __func__);return ; }
@@ -992,7 +992,7 @@ int __sas_task_abort(struct sas_task *task)if (task->task_state_flags &SAS_TASK_STATE_ABORTED || task->task_state_flags &SAS_TASK_STATE_DONE ) {spin_unlock_irqrestore (&task->task_state_lock, flags); -SAS_DPRINTK ("%s: Task %p already finished.\n" , __FUNCTION__, +SAS_DPRINTK ("%s: Task %p already finished.\n" , __func__, task);return 0 ; }
drivers/scsi/libsrp.c +1 -1
@@ -39,7 +39,7 @@ enum srp_task_attributes {/* tmp - will replace with SCSI logging stuff */ #define eprintk(fmt, args...) \ do { \ - printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ + printk("%s(%d) " fmt, __func__, __LINE__, ##args); \ } while (0)/* #define dprintk eprintk */ #define dprintk(fmt, args...)
drivers/scsi/lpfc/lpfc_init.c +2 -2
@@ -2106,7 +2106,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)if (iocbq_entry ==NULL ) {printk (KERN_ERR "%s: only allocated %d iocbs of " "expected %d count. Unloading driver.\n" , - __FUNCTION__, i,LPFC_IOCB_LIST_CNT ); + __func__, i,LPFC_IOCB_LIST_CNT ); error = -ENOMEM ; goto out_free_iocbq; }
@@ -2116,7 +2116,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)kfree (iocbq_entry);printk (KERN_ERR "%s: failed to allocate IOTAG. " "Unloading driver.\n" , - __FUNCTION__); + __func__); error = -ENOMEM ; goto out_free_iocbq; }
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
@@ -342,7 +342,7 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) {printk (KERN_ERR "%s: Too many sg segments from " "dma_map_sg. Config %d, seg_cnt %d" , - __FUNCTION__, phba->cfg_sg_seg_cnt, + __func__, phba->cfg_sg_seg_cnt, lpfc_cmd->seg_cnt);scsi_dma_unmap (scsi_cmnd);return 1 ;
drivers/scsi/lpfc/lpfc_sli.c +3 -3
@@ -219,7 +219,7 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)case CMD_IOCB_LOGENTRY_CN :case CMD_IOCB_LOGENTRY_ASYNC_CN :printk ("%s - Unhandled SLI-3 Command x%x\n" , - __FUNCTION__, iocb_cmnd); + __func__, iocb_cmnd); type =LPFC_UNKNOWN_IOCB ;break ;default :
@@ -1719,7 +1719,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba, rspiocbp =__lpfc_sli_get_iocbq (phba);if (rspiocbp ==NULL ) {printk (KERN_ERR "%s: out of buffers! Failing " -"completion.\n" , __FUNCTION__); +"completion.\n" , __func__);break ; }
@@ -3770,7 +3770,7 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,break ;default :printk (KERN_ERR "%s: Unknown context cmd type, value %d\n" , - __FUNCTION__, ctx_cmd); + __func__, ctx_cmd);break ; }
drivers/scsi/megaraid/mega_common.h +1 -1
@@ -266,7 +266,7 @@ typedef struct {#define ASSERT (expression) \ if (!(expression)) { \ ASSERT_ACTION("assertion failed:(%s), file: %s, line: %d:%s\n", \ - #expression, __FILE__, __LINE__, __FUNCTION__); \ + #expression, __FILE__, __LINE__, __func__); \ }#else #define ASSERT (expression)
drivers/scsi/megaraid/megaraid_mbox.c +8 -8
@@ -458,7 +458,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)if (adapter ==NULL ) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d.\n" , __FUNCTION__, __LINE__)); +"megaraid: out of memory, %s %d.\n" , __func__, __LINE__)); goto out_probe_one; }
@@ -1002,7 +1002,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)if (!raid_dev->una_mbox64) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d\n" , __FUNCTION__, +"megaraid: out of memory, %s %d\n" , __func__, __LINE__));return -1 ; }
@@ -1030,7 +1030,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)if (!adapter->ibuf) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d\n" , __FUNCTION__, +"megaraid: out of memory, %s %d\n" , __func__, __LINE__)); goto out_free_common_mbox;
@@ -1052,7 +1052,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)if (adapter->kscb_list ==NULL ) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d\n" , __FUNCTION__, +"megaraid: out of memory, %s %d\n" , __func__, __LINE__)); goto out_free_ibuf; }
@@ -1060,7 +1060,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)// memory allocation for our command packets if (megaraid_mbox_setup_dma_pools (adapter) !=0 ) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d\n" , __FUNCTION__, +"megaraid: out of memory, %s %d\n" , __func__, __LINE__)); goto out_free_scb_list; }
@@ -2981,7 +2981,7 @@ megaraid_mbox_product_info(adapter_t *adapter)if (pinfo ==NULL ) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d\n" , __FUNCTION__, +"megaraid: out of memory, %s %d\n" , __func__, __LINE__));return -1 ;
@@ -3491,7 +3491,7 @@ megaraid_cmm_register(adapter_t *adapter)if (adapter->uscb_list ==NULL ) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d\n" , __FUNCTION__, +"megaraid: out of memory, %s %d\n" , __func__, __LINE__));return -1 ; }
@@ -3862,7 +3862,7 @@ megaraid_sysfs_alloc_resources(adapter_t *adapter) !raid_dev->sysfs_buffer) {con_log (CL_ANN , (KERN_WARNING -"megaraid: out of memory, %s %d\n" , __FUNCTION__, +"megaraid: out of memory, %s %d\n" , __func__, __LINE__)); rval = -ENOMEM ;
drivers/scsi/megaraid/megaraid_mm.c +2 -2
@@ -927,7 +927,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp) !adapter->pthru_dma_pool) {con_log (CL_ANN , (KERN_WARNING -"megaraid cmm: out of memory, %s %d\n" , __FUNCTION__, +"megaraid cmm: out of memory, %s %d\n" , __func__, __LINE__)); rval = (-ENOMEM );
@@ -955,7 +955,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)con_log (CL_ANN , (KERN_WARNING "megaraid cmm: out of memory, %s %d\n" , - __FUNCTION__, __LINE__)); + __func__, __LINE__)); rval = (-ENOMEM );
drivers/scsi/nsp32.c +2 -2
@@ -299,9 +299,9 @@ static struct scsi_host_template nsp32_template = {#else # define NSP32_DEBUG_MASK 0xffffff # define nsp32_msg(type, args...) \ - nsp32_message (__FUNCTION__, __LINE__, (type), args) + nsp32_message (__func__, __LINE__, (type), args) # define nsp32_dbg(mask, args...) \ - nsp32_dmessage(__FUNCTION__, __LINE__, (mask), args) + nsp32_dmessage(__func__, __LINE__, (mask), args)#endif #define NSP32_DEBUG_QUEUECOMMAND BIT(0)
drivers/scsi/nsp32_debug.c +1 -1
@@ -88,7 +88,7 @@ static void print_commandk (unsigned char *command)int i,s;// printk(KERN_DEBUG); print_opcodek (command[0 ]); -/*printk(KERN_DEBUG "%s ", __FUNCTION__);*/ +/*printk(KERN_DEBUG "%s ", __func__);*/ if ((command[0 ] >>5 ) ==6 || (command[0 ] >>5 ) ==7 ) { s =12 ;/* vender specific */
drivers/scsi/pcmcia/nsp_cs.c +2 -2
@@ -107,9 +107,9 @@ static nsp_hw_data nsp_data_base; /* attach <-> detect glue */#else # define NSP_DEBUG_MASK 0xffffff # define nsp_msg(type, args...) \ - nsp_cs_message (__FUNCTION__, __LINE__, (type), args) + nsp_cs_message (__func__, __LINE__, (type), args) # define nsp_dbg(mask, args...) \ - nsp_cs_dmessage(__FUNCTION__, __LINE__, (mask), args) + nsp_cs_dmessage(__func__, __LINE__, (mask), args)#endif #define NSP_DEBUG_QUEUECOMMAND BIT(0)
drivers/scsi/pcmcia/nsp_debug.c +1 -1
@@ -90,7 +90,7 @@ static void print_commandk (unsigned char *command)int i, s;printk (KERN_DEBUG );print_opcodek (command[0 ]); -/*printk(KERN_DEBUG "%s ", __FUNCTION__);*/ +/*printk(KERN_DEBUG "%s ", __func__);*/ if ((command[0 ] >>5 ) ==6 || (command[0 ] >>5 ) ==7 ) { s =12 ;/* vender specific */
drivers/scsi/ppa.c +1 -1
@@ -171,7 +171,7 @@ static int device_check(ppa_struct *dev);#if PPA_DEBUG >0 #define ppa_fail (x,y) printk("ppa: ppa_fail(%i) from %s at line %d\n",\ - y, __FUNCTION__, __LINE__); ppa_fail_func(x,y); + y, __func__, __LINE__); ppa_fail_func(x,y); static inline void ppa_fail_func(ppa_struct *dev, int error_code)#else static inline void ppa_fail (ppa_struct *dev,int error_code)
drivers/scsi/qla1280.c +6 -6
@@ -1700,7 +1700,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha) risc_code_size = *ql1280_board_tbl[ha->devnum].fwlen;dprintk (1 ,"%s: DMA RISC code (%i) words\n" , - __FUNCTION__, risc_code_size); + __func__, risc_code_size); num =0 ;while (risc_code_size >0 ) {
@@ -1726,7 +1726,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha) mb[7 ] =pci_dma_hi32 (ha->request_dma) &0xffff ; mb[6 ] =pci_dma_hi32 (ha->request_dma) >>16 ;dprintk (2 ,"%s: op=%d 0x%p = 0x%4x,0x%4x,0x%4x,0x%4x\n" , - __FUNCTION__, mb[0 ], + __func__, mb[0 ], (void *)(long )ha->request_dma, mb[6 ], mb[7 ], mb[2 ], mb[3 ]); err = qla1280_mailbox_command(ha, BIT_4 | BIT_3 | BIT_2 |
@@ -1758,10 +1758,10 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)if (tbuf[i] != sp[i] && warn++ <10 ) {printk (KERN_ERR "%s: FW compare error @ " "byte(0x%x) loop#=%x\n" , - __FUNCTION__, i, num); + __func__, i, num);printk (KERN_ERR "%s: FWbyte=%x " "FWfromChip=%x\n" , - __FUNCTION__, sp[i], tbuf[i]); + __func__, sp[i], tbuf[i]);/*break; */ } }
@@ -1786,7 +1786,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)int err;dprintk (1 ,"%s: Verifying checksum of loaded RISC code.\n" , - __FUNCTION__); + __func__);/* Verify checksum of loaded RISC code. */ mb[0 ] =MBC_VERIFY_CHECKSUM ;
@@ -1799,7 +1799,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha) }/* Start firmware execution. */ -dprintk (1 ,"%s: start firmware running.\n" , __FUNCTION__); +dprintk (1 ,"%s: start firmware running.\n" , __func__); mb[0 ] =MBC_EXECUTE_FIRMWARE ; mb[1 ] = *ql1280_board_tbl[ha->devnum].fwstart; err =qla1280_mailbox_command (ha,BIT_1 |BIT_0 , &mb[0 ]);
drivers/scsi/scsi_debug.c +6 -6
@@ -2117,7 +2117,7 @@ static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev) open_devip =kzalloc (sizeof (*open_devip),GFP_ATOMIC );if (NULL == open_devip) {printk (KERN_ERR "%s: out of memory at line %d\n" , - __FUNCTION__, __LINE__); + __func__, __LINE__);return NULL ; } open_devip->sdbg_host = sdbg_host;
@@ -3015,7 +3015,7 @@ static int sdebug_add_adapter(void) sdbg_host =kzalloc (sizeof (*sdbg_host),GFP_KERNEL );if (NULL == sdbg_host) {printk (KERN_ERR "%s: out of memory at line %d\n" , - __FUNCTION__, __LINE__); + __func__, __LINE__);return -ENOMEM ; }
@@ -3026,7 +3026,7 @@ static int sdebug_add_adapter(void) sdbg_devinfo =kzalloc (sizeof (*sdbg_devinfo),GFP_KERNEL );if (NULL == sdbg_devinfo) {printk (KERN_ERR "%s: out of memory at line %d\n" , - __FUNCTION__, __LINE__); + __func__, __LINE__); error = -ENOMEM ; goto clean; }
@@ -3093,7 +3093,7 @@ static int sdebug_driver_probe(struct device * dev) hpnt =scsi_host_alloc (&sdebug_driver_template,sizeof (sdbg_host));if (NULL == hpnt) { -printk (KERN_ERR "%s: scsi_register failed\n" , __FUNCTION__); +printk (KERN_ERR "%s: scsi_register failed\n" , __func__); error = -ENODEV ;return error; }
@@ -3108,7 +3108,7 @@ static int sdebug_driver_probe(struct device * dev) error =scsi_add_host (hpnt, &sdbg_host->dev);if (error) { -printk (KERN_ERR "%s: scsi_add_host failed\n" , __FUNCTION__); +printk (KERN_ERR "%s: scsi_add_host failed\n" , __func__); error = -ENODEV ;scsi_host_put (hpnt); }else
@@ -3128,7 +3128,7 @@ static int sdebug_driver_remove(struct device * dev)if (!sdbg_host) {printk (KERN_ERR "%s: Unable to locate host info\n" , - __FUNCTION__); + __func__);return -ENODEV ; }
drivers/scsi/scsi_devinfo.c +3 -3
@@ -272,7 +272,7 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length, }if (from_length > to_length)printk (KERN_WARNING "%s: %s string '%s' is too long\n" , - __FUNCTION__, name, from); + __func__, name, from); }/**
@@ -298,7 +298,7 @@ static int scsi_dev_info_list_add(int compatible, char *vendor, char *model, devinfo =kmalloc (sizeof (*devinfo),GFP_KERNEL );if (!devinfo) { -printk (KERN_ERR "%s: no memory\n" , __FUNCTION__); +printk (KERN_ERR "%s: no memory\n" , __func__);return -ENOMEM ; }
@@ -363,7 +363,7 @@ static int scsi_dev_info_list_add_str(char *dev_list) strflags =strsep (&next, next_check);if (!model || !strflags) {printk (KERN_ERR "%s: bad dev info string '%s' '%s'" -" '%s'\n" , __FUNCTION__, vendor, model, +" '%s'\n" , __func__, vendor, model, strflags); res = -EINVAL ; }else
drivers/scsi/scsi_error.c +13 -13
@@ -139,7 +139,7 @@ void scsi_add_timer(struct scsi_cmnd *scmd, int timeout, scmd->eh_timeout.function = (void (*)(unsigned long )) complete;SCSI_LOG_ERROR_RECOVERY (5 ,printk ("%s: scmd: %p, time:" -" %d, (%p)\n" , __FUNCTION__, +" %d, (%p)\n" , __func__, scmd, timeout, complete));add_timer (&scmd->eh_timeout);
@@ -163,7 +163,7 @@ int scsi_delete_timer(struct scsi_cmnd *scmd) rtn =del_timer (&scmd->eh_timeout);SCSI_LOG_ERROR_RECOVERY (5 ,printk ("%s: scmd: %p," -" rtn: %d\n" , __FUNCTION__, +" rtn: %d\n" , __func__, scmd, rtn)); scmd->eh_timeout.data = (unsigned long )NULL ;
@@ -233,7 +233,7 @@ int scsi_block_when_processing_errors(struct scsi_device *sdev) online =scsi_device_online (sdev); -SCSI_LOG_ERROR_RECOVERY (5 ,printk ("%s: rtn: %d\n" , __FUNCTION__, +SCSI_LOG_ERROR_RECOVERY (5 ,printk ("%s: rtn: %d\n" , __func__, online));return online;
@@ -271,7 +271,7 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host *shost,SCSI_LOG_ERROR_RECOVERY (3 ,sdev_printk (KERN_INFO , sdev,"%s: cmds failed: %d, cancel: %d\n" , - __FUNCTION__, cmd_failed, + __func__, cmd_failed, cmd_cancel)); cmd_cancel =0 ; cmd_failed =0 ;
@@ -459,7 +459,7 @@ static void scsi_eh_done(struct scsi_cmnd *scmd)SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s scmd: %p result: %x\n" , - __FUNCTION__, scmd, scmd->result)); + __func__, scmd, scmd->result)); eh_action = scmd->device->host->eh_action;if (eh_action)
@@ -476,7 +476,7 @@ static int scsi_try_host_reset(struct scsi_cmnd *scmd)int rtn;SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s: Snd Host RST\n" , - __FUNCTION__)); + __func__));if (!scmd->device->host->hostt->eh_host_reset_handler)return FAILED ;
@@ -505,7 +505,7 @@ static int scsi_try_bus_reset(struct scsi_cmnd *scmd)int rtn;SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s: Snd Bus RST\n" , - __FUNCTION__)); + __func__));if (!scmd->device->host->hostt->eh_bus_reset_handler)return FAILED ;
@@ -721,7 +721,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s: scmd: %p, timeleft: %ld\n" , - __FUNCTION__, scmd, timeleft)); + __func__, scmd, timeleft));/* * If there is time left scsi_eh_done got called, and we will
@@ -733,7 +733,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, rtn =scsi_eh_completed_normally (scmd);SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s: scsi_eh_completed_normally %x\n" , - __FUNCTION__, rtn)); + __func__, rtn));switch (rtn) {case SUCCESS :
@@ -868,7 +868,7 @@ retry_tur: rtn =scsi_send_eh_cmnd (scmd, tur_command,6 ,SENSE_TIMEOUT ,0 );SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s: scmd %p rtn %x\n" , - __FUNCTION__, scmd, rtn)); + __func__, scmd, rtn));switch (rtn) {case NEEDS_RETRY :
@@ -1201,7 +1201,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)if (!scsi_device_online (scmd->device)) {SCSI_LOG_ERROR_RECOVERY (5 ,printk ("%s: device offline - report" " as SUCCESS\n" , - __FUNCTION__)); + __func__));return SUCCESS ; }
@@ -1416,7 +1416,7 @@ static void scsi_restart_operations(struct Scsi_Host *shost)* ioctls to queued block devices. */ SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s: waking up host to restart\n" , - __FUNCTION__)); + __func__));spin_lock_irqsave (shost->host_lock, flags);if (scsi_host_set_state (shost,SHOST_RUNNING ))
@@ -1736,7 +1736,7 @@ scsi_reset_provider(struct scsi_device *dev, int flag)*/ SCSI_LOG_ERROR_RECOVERY (3 ,printk ("%s: waking up host to restart after TMF\n" , - __FUNCTION__)); + __func__));wake_up (&shost->host_wait);
drivers/scsi/scsi_lib.c +3 -3
@@ -1348,7 +1348,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)if (unlikely (cmd ==NULL )) {printk (KERN_CRIT "impossible request in %s.\n" , - __FUNCTION__); + __func__);BUG (); }
@@ -1472,7 +1472,7 @@ static void scsi_request_fn(struct request_queue *q)printk (KERN_CRIT "impossible request in %s.\n" "please mail a stack trace to " "[email protected]\n" , - __FUNCTION__); + __func__);blk_dump_rq_flags (req,"foo" );BUG (); }
@@ -2461,7 +2461,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count,if (unlikely (i == sg_count)) {printk (KERN_ERR "%s: Bytes in sg: %zu, requested offset %zu, " "elements %d\n" , - __FUNCTION__, sg_len, *offset, sg_count); + __func__, sg_len, *offset, sg_count);WARN_ON (1 );return NULL ; }
drivers/scsi/scsi_netlink.c +4 -4
@@ -55,7 +55,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)if ((nlh->nlmsg_len < (sizeof (*nlh) +sizeof (*hdr))) || (skb->len < nlh->nlmsg_len)) {printk (KERN_WARNING "%s: discarding partial skb\n" , - __FUNCTION__); + __func__);return ; }
@@ -82,7 +82,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)if (nlh->nlmsg_len < (sizeof (*nlh) + hdr->msglen)) {printk (KERN_WARNING "%s: discarding partial message\n" , - __FUNCTION__); + __func__);return ; }
@@ -139,7 +139,7 @@ scsi_netlink_init(void) error =netlink_register_notifier (&scsi_netlink_notifier);if (error) {printk (KERN_ERR "%s: register of event handler failed - %d\n" , - __FUNCTION__, error); + __func__, error);return ; }
@@ -148,7 +148,7 @@ scsi_netlink_init(void) THIS_MODULE);if (!scsi_nl_sock) {printk (KERN_ERR "%s: register of recieve handler failed\n" , - __FUNCTION__); + __func__);netlink_unregister_notifier (&scsi_netlink_notifier); }
drivers/scsi/scsi_proc.c +2 -2
@@ -114,7 +114,7 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht) sht->proc_dir =proc_mkdir (sht->proc_name, proc_scsi);if (!sht->proc_dir)printk (KERN_ERR "%s: proc_mkdir failed for %s\n" , - __FUNCTION__, sht->proc_name); + __func__, sht->proc_name);else sht->proc_dir->owner = sht->module; }
@@ -157,7 +157,7 @@ void scsi_proc_host_add(struct Scsi_Host *shost) sht->proc_dir, proc_scsi_read, shost);if (!p) {printk (KERN_ERR "%s: Failed to register host %d in" -"%s\n" , __FUNCTION__, shost->host_no, +"%s\n" , __func__, shost->host_no, sht->proc_name);return ; }
drivers/scsi/scsi_scan.c +6 -6
@@ -318,7 +318,7 @@ out_device_destroy:put_device (&sdev->sdev_gendev); out:if (display_failure_msg) -printk (ALLOC_FAILURE_MSG , __FUNCTION__); +printk (ALLOC_FAILURE_MSG , __func__);return NULL ; }
@@ -384,7 +384,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, starget =kzalloc (size,GFP_KERNEL );if (!starget) { -printk (KERN_ERR "%s: allocation failure\n" , __FUNCTION__); +printk (KERN_ERR "%s: allocation failure\n" , __func__);return NULL ; } dev = &starget->dev;
@@ -1331,7 +1331,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, lun_data =kmalloc (length,GFP_ATOMIC | (sdev->host->unchecked_isa_dma ? __GFP_DMA :0 ));if (!lun_data) { -printk (ALLOC_FAILURE_MSG , __FUNCTION__); +printk (ALLOC_FAILURE_MSG , __func__); goto out; }
@@ -1645,7 +1645,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel, {SCSI_LOG_SCAN_BUS (3 ,shost_printk (KERN_INFO , shost,"%s: <%u:%u:%u>\n" , - __FUNCTION__, channel, id, lun)); + __func__, channel, id, lun)); if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) || ((id != SCAN_WILD_CARD) && (id >= shost->max_id)) ||
@@ -1699,7 +1699,7 @@ static struct async_scan_data *scsi_prep_async_scan(struct Scsi_Host *shost)return NULL ;if (shost->async_scan) { -printk ("%s called twice for host %d" , __FUNCTION__, +printk ("%s called twice for host %d" , __func__, shost->host_no);dump_stack ();return NULL ;
@@ -1753,7 +1753,7 @@ static void scsi_finish_async_scan(struct async_scan_data *data)mutex_lock (&shost->scan_mutex);if (!shost->async_scan) { -printk ("%s called twice for host %d" , __FUNCTION__, +printk ("%s called twice for host %d" , __func__, shost->host_no);dump_stack ();return ;
drivers/scsi/scsi_tgt_priv.h +1 -1
@@ -6,7 +6,7 @@ struct task_struct;/* tmp - will replace with SCSI logging stuff */ #define eprintk(fmt, args...) \ do { \ - printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ + printk("%s(%d) " fmt, __func__, __LINE__, ##args); \ } while (0) #define dprintk(fmt, args...)
drivers/scsi/scsi_transport_fc.c +6 -6
@@ -570,7 +570,7 @@ send_fail: name =get_fc_host_event_code_name (event_code);printk (KERN_WARNING "%s: Dropped Event : host %d %s data 0x%08x - err %d\n" , - __FUNCTION__, shost->host_no, + __func__, shost->host_no, (name) ? name :"<unknown>" , event_data, err);return ; }
@@ -643,7 +643,7 @@ send_vendor_fail_skb: send_vendor_fail:printk (KERN_WARNING "%s: Dropped Event : host %d vendor_unique - err %d\n" , - __FUNCTION__, shost->host_no, err); + __func__, shost->host_no, err);return ; }EXPORT_SYMBOL (fc_host_post_vendor_event);
@@ -2386,7 +2386,7 @@ fc_rport_create(struct Scsi_Host *shost, int channel, size = (sizeof (struct fc_rport ) + fci->f->dd_fcrport_size); rport =kzalloc (size,GFP_KERNEL );if (unlikely (!rport)) { -printk (KERN_ERR "%s: allocation failure\n" , __FUNCTION__); +printk (KERN_ERR "%s: allocation failure\n" , __func__);return NULL ; }
@@ -3059,7 +3059,7 @@ fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev, size = (sizeof (struct fc_vport ) + fci->f->dd_fcvport_size); vport =kzalloc (size,GFP_KERNEL );if (unlikely (!vport)) { -printk (KERN_ERR "%s: allocation failure\n" , __FUNCTION__); +printk (KERN_ERR "%s: allocation failure\n" , __func__);return -ENOMEM ; }
@@ -3123,7 +3123,7 @@ fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,printk (KERN_ERR "%s: Cannot create vport symlinks for " "%s, err=%d\n" , - __FUNCTION__, dev->bus_id, error); + __func__, dev->bus_id, error); }spin_lock_irqsave (shost->host_lock, flags); vport->flags &= ~FC_VPORT_CREATING ;
@@ -3236,7 +3236,7 @@ fc_vport_sched_delete(struct work_struct *work)if (stat)dev_printk (KERN_ERR , vport->dev.parent,"%s: %s could not be deleted created via " -"shost%d channel %d - error %d\n" , __FUNCTION__, +"shost%d channel %d - error %d\n" , __func__, vport->dev.bus_id, vport->shost->host_no, vport->channel, stat); }
drivers/scsi/scsi_transport_sas.c +2 -2
@@ -756,7 +756,7 @@ static void sas_port_create_link(struct sas_port *port,return ; err:printk (KERN_ERR "%s: Cannot create port links, err=%d\n" , - __FUNCTION__, res); + __func__, res); } static void sas_port_delete_link(struct sas_port *port,
@@ -1006,7 +1006,7 @@ void sas_port_mark_backlink(struct sas_port *port)return ; err:printk (KERN_ERR "%s: Cannot create port backlink, err=%d\n" , - __FUNCTION__, res); + __func__, res); }EXPORT_SYMBOL (sas_port_mark_backlink);
drivers/scsi/tmscsim.c +4 -4
@@ -452,7 +452,7 @@ static int dc390_pci_map (struct dc390_srb* pSRB)/* TODO: error handling */ if (pSRB->SGcount !=1 ) error =1 ; -DEBUG1 (printk ("%s(): Mapped sense buffer %p at %x\n" , __FUNCTION__, pcmd->sense_buffer, cmdp->saved_dma_handle)); +DEBUG1 (printk ("%s(): Mapped sense buffer %p at %x\n" , __func__, pcmd->sense_buffer, cmdp->saved_dma_handle));/* Map SG list */ }else if (scsi_sg_count (pcmd)) {int nseg;
@@ -466,7 +466,7 @@ static int dc390_pci_map (struct dc390_srb* pSRB)if (nseg <0 ) error =1 ;DEBUG1 (printk ("%s(): Mapped SG %p with %d (%d) elements\n" ,\ - __FUNCTION__,scsi_sglist (pcmd), nseg,scsi_sg_count (pcmd))); + __func__,scsi_sglist (pcmd), nseg,scsi_sg_count (pcmd)));/* Map single segment */ }else pSRB->SGcount =0 ;
@@ -483,11 +483,11 @@ static void dc390_pci_unmap (struct dc390_srb* pSRB)if (pSRB->SRBFlag) {pci_unmap_sg (pdev, &pSRB->Segmentx,1 ,DMA_FROM_DEVICE ); -DEBUG1 (printk ("%s(): Unmapped sense buffer at %x\n" , __FUNCTION__, cmdp->saved_dma_handle)); +DEBUG1 (printk ("%s(): Unmapped sense buffer at %x\n" , __func__, cmdp->saved_dma_handle)); }else {scsi_dma_unmap (pcmd);DEBUG1 (printk ("%s(): Unmapped SG at %p with %d elements\n" , - __FUNCTION__,scsi_sglist (pcmd),scsi_sg_count (pcmd))); + __func__,scsi_sglist (pcmd),scsi_sg_count (pcmd))); } }
drivers/scsi/wd7000.c +4 -4
@@ -148,7 +148,7 @@* * 2002/10/04 - Alan Cox <[email protected]> * -* Use dev_id for interrupts, kill __FUNCTION__ pasting +* Use dev_id for interrupts, kill __func__ pasting * Add a lock for the scb pool, clean up all other cli/sti usage stuff * Use the adapter lock for the other places we had the cli's *
@@ -640,12 +640,12 @@ static int __init wd7000_setup(char *str) (void )get_options (str,ARRAY_SIZE (ints), ints);if (wd7000_card_num >=NUM_CONFIGS ) { -printk (KERN_ERR "%s: Too many \"wd7000=\" configurations in " "command line!\n" , __FUNCTION__); +printk (KERN_ERR "%s: Too many \"wd7000=\" configurations in " "command line!\n" , __func__);return 0 ; }if ((ints[0 ] <3 ) || (ints[0 ] >5 )) { -printk (KERN_ERR "%s: Error in command line! " "Usage: wd7000=<IRQ>,<DMA>,IO>[,<BUS_ON>" "[,<BUS_OFF>]]\n" , __FUNCTION__); +printk (KERN_ERR "%s: Error in command line! " "Usage: wd7000=<IRQ>,<DMA>,IO>[,<BUS_ON>" "[,<BUS_OFF>]]\n" , __func__); }else {for (i =0 ; i <NUM_IRQS ; i++)if (ints[1 ] == wd7000_irq[i])
@@ -1642,7 +1642,7 @@ static int wd7000_biosparam(struct scsi_device *sdev, ip[2 ] = info[2 ];if (info[0 ] ==255 ) -printk (KERN_INFO "%s: current partition table is " "using extended translation.\n" , __FUNCTION__); +printk (KERN_INFO "%s: current partition table is " "using extended translation.\n" , __func__); } }
drivers/scsi/zalon.c +4 -4
@@ -68,11 +68,11 @@ lasi_scsi_clock(void * hpa, int defaultclock)if (status ==PDC_RET_OK ) { clock = (int ) pdc_result[16 ]; }else { -printk (KERN_WARNING "%s: pdc_iodc_read returned %d\n" , __FUNCTION__, status); +printk (KERN_WARNING "%s: pdc_iodc_read returned %d\n" , __func__, status); clock = defaultclock; } -printk (KERN_DEBUG "%s: SCSI clock %d\n" , __FUNCTION__, clock); +printk (KERN_DEBUG "%s: SCSI clock %d\n" , __func__, clock); return clock; }#endif
@@ -108,13 +108,13 @@ zalon_probe(struct parisc_device *dev)*/ dev->irq =gsc_alloc_irq (&gsc_irq); -printk (KERN_INFO "%s: Zalon version %d, IRQ %d\n" , __FUNCTION__, +printk (KERN_INFO "%s: Zalon version %d, IRQ %d\n" , __func__, zalon_vers, dev->irq);__raw_writel (gsc_irq.txn_addr | gsc_irq.txn_data, zalon +IO_MODULE_EIM );if (zalon_vers ==0 ) -printk (KERN_WARNING "%s: Zalon 1.1 or earlier\n" , __FUNCTION__); +printk (KERN_WARNING "%s: Zalon 1.1 or earlier\n" , __func__);memset (&device,0 ,sizeof (struct ncr_device ));
Signature · 1 line
1.5.4.3.500.g83a2c
James Bottomley
maintainerRe: [PATCH 08/14] scsi: replace remaining __FUNCTION__ occurrences
Quoted 1 line · Harvey Harrison
__FUNCTION__is gcc-specific, use__func__
What on earth is the point of this?
We already have compiler specific files in
include/linux/compiler-*
Which can be used to #define __FUNCTION__ to whatever the individual compiler wants. That way we don't get thousands of lines of churn in the kernel for no value.
James
Re: [PATCH 08/14] scsi: replace remaining __FUNCTION__ occurrences
Quoted 5 lines · James Bottomley
Quoted 1 line · Harvey Harrison
__FUNCTION__is gcc-specific, use__func__What on earth is the point of this?
Quoted 8 lines
We already have compiler specific files in
include/linux/compiler-*Which can be used to #define
__FUNCTION__to whatever the individual compiler wants. That way we don't get thousands of lines of churn in the kernel for no value.
1) Currently there is a mix of __FUNCTION__ and __func__ in the kernel, and __func__ is ansi C (C99...)
2) It's shorter
3) When people look around to add new code, they will only see the one way the kernel does it.
None of which are very convincing, but there you go.
Harvey
PATCH 9/14 ide: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/ide/ide-acpi.c | 12 ++++++------ drivers/ide/ide-cd.c | 12 ++++++------ drivers/ide/ide-dma.c | 2 +- drivers/ide/ide-lib.c | 2 +- drivers/ide/ide-probe.c | 2 +- drivers/ide/ide-proc.c | 6 +++--- drivers/ide/ide-scan-pci.c | 2 +- drivers/ide/ide-taskfile.c | 12 ++++++------ drivers/ide/legacy/ht6560b.c | 4 ++-- drivers/ide/mips/au1xxx-ide.c | 8 ++++---- drivers/ide/pci/cmd640.c | 2 +- drivers/ide/pci/hpt366.c | 4 ++-- drivers/ide/pci/pdc202xx_new.c | 2 +- drivers/ide/pci/scc_pata.c | 2 +- drivers/ide/pci/sgiioc4.c | 26 +++++++++++++------------- drivers/ide/pci/siimage.c | 2 +- drivers/ide/pci/sl82c105.c | 4 ++-- drivers/ide/ppc/mpc8xx.c | 2 +- 18 files changed, 53 insertions(+), 53 deletions(-)
drivers/ide/ide-acpi.c +6 -6
@@ -55,7 +55,7 @@ struct ide_acpi_hwif_link {/* note: adds function name and KERN_DEBUG */ #ifdef DEBUGGING #define DEBPRINT(fmt, args...) \ - printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ## args) + printk(KERN_DEBUG "%s: " fmt, __func__, ## args)#else #define DEBPRINT(fmt, args...) do {} while (0)#endif /* DEBUGGING */
@@ -309,7 +309,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,if (ACPI_FAILURE (status)) {printk (KERN_DEBUG "%s: Run _GTF error: status = 0x%x\n" , - __FUNCTION__, status); + __func__, status); goto out; }
@@ -335,7 +335,7 @@ static int do_drive_get_GTF(ide_drive_t *drive, out_obj->buffer.length % REGS_PER_GTF) {printk (KERN_ERR "%s: unexpected GTF length (%d) or addr (0x%p)\n" , - __FUNCTION__, out_obj->buffer.length, + __func__, out_obj->buffer.length, out_obj->buffer.pointer); err = -ENOENT ;kfree (output.pointer);
@@ -384,7 +384,7 @@ static int taskfile_load_raw(ide_drive_t *drive, err =ide_no_data_taskfile (drive, &args);if (err)printk (KERN_ERR "%s: ide_no_data_taskfile failed: %u\n" , - __FUNCTION__, err); + __func__, err);return err; }
@@ -422,7 +422,7 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,if (gtf_length %REGS_PER_GTF ) {printk (KERN_ERR "%s: unexpected GTF length (%d)\n" , - __FUNCTION__, gtf_length); + __func__, gtf_length); goto out; }
@@ -547,7 +547,7 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)printk (KERN_ERR "%s: unexpected _GTM length (0x%x)[should be 0x%zx] or " "addr (0x%p)\n" , - __FUNCTION__, out_obj->buffer.length, + __func__, out_obj->buffer.length,sizeof (struct GTM_buffer ), out_obj->buffer.pointer);return ; }
drivers/ide/ide-cd.c +6 -6
@@ -685,7 +685,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,/* Whoops... */ printk (KERN_ERR "%s: %s: wrong transfer direction!\n" , - drive->name, __FUNCTION__); + drive->name, __func__); xf = rw ? hwif->atapi_output_bytes : hwif->atapi_input_bytes;ide_cd_pad_transfer (drive, xf, len);
@@ -698,7 +698,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq, }else {/* Drive wants a command packet, or invalid ireason... */ printk (KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n" , - drive->name, __FUNCTION__, ireason); + drive->name, __func__, ireason); }if (rq->cmd_type ==REQ_TYPE_ATA_PC )
@@ -720,7 +720,7 @@ static int ide_cd_check_transfer_size(ide_drive_t *drive, int len)return 0 ;printk (KERN_ERR "%s: %s: Bad transfer size %d\n" , - drive->name, __FUNCTION__, len); + drive->name, __func__, len);if (cd->cd_flags &IDE_CD_FLAG_LIMIT_NFRAMES ) printk(KERN_ERR " This drive is not supported by "
@@ -824,7 +824,7 @@ static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive)if (rq->current_nr_sectors !=bio_cur_sectors (rq->bio)) {printk (KERN_ERR "%s: %s: buffer botch (%u)\n" , - drive->name, __FUNCTION__, + drive->name, __func__, rq->current_nr_sectors);cdrom_end_request (drive,0 );return ide_stopped;
@@ -1055,7 +1055,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)if (rq->current_nr_sectors >0 ) {printk (KERN_ERR "%s: %s: data underrun " "(%d blocks)\n" , - drive->name, __FUNCTION__, + drive->name, __func__, rq->current_nr_sectors);if (!write) rq->cmd_flags |=REQ_FAILED ;
@@ -2032,7 +2032,7 @@ static void ide_cd_release(struct kref *kref)kfree (info->toc);if (devinfo->handle == drive &&unregister_cdrom (devinfo))printk (KERN_ERR "%s: %s failed to unregister device from the cdrom " -"driver.\n" , __FUNCTION__, drive->name); +"driver.\n" , __func__, drive->name); drive->dsc_overlap =0 ; drive->driver_data =NULL ;blk_queue_prep_rq (drive->queue,NULL );
drivers/ide/ide-dma.c +1 -1
@@ -542,7 +542,7 @@ static int __ide_dma_test_irq(ide_drive_t *drive)return 1 ;if (!drive->waiting_for_dma)printk (KERN_WARNING "%s: (%s) called while not waiting\n" , - drive->name, __FUNCTION__); + drive->name, __func__); return 0; }#else
drivers/ide/ide-lib.c +1 -1
@@ -85,7 +85,7 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed) mode =XFER_PIO_4 ; } -// printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed); +// printk("%s: mode 0x%02x, speed 0x%02x\n", __func__, mode, speed); return min (speed, mode); }
drivers/ide/ide-probe.c +1 -1
@@ -641,7 +641,7 @@ static void ide_register_port(ide_hwif_t *hwif) ret =device_register (&hwif->gendev);if (ret <0 )printk (KERN_WARNING "IDE: %s: device_register error: %d\n" , - __FUNCTION__, ret); + __func__, ret); }/**
drivers/ide/ide-proc.c +3 -3
@@ -601,14 +601,14 @@ static int ide_replace_subdriver(ide_drive_t *drive, const char *driver) err =device_attach (dev);if (err <0 )printk (KERN_WARNING "IDE: %s: device_attach error: %d\n" , - __FUNCTION__, err); + __func__, err); drive->driver_req[0 ] =0 ;if (dev->driver ==NULL ) { err =device_attach (dev);if (err <0 )printk (KERN_WARNING "IDE: %s: device_attach(2) error: %d\n" , - __FUNCTION__, err); + __func__, err); }if (dev->driver && !strcmp (dev->driver->name, driver)) ret =0 ;
@@ -840,7 +840,7 @@ static int ide_drivers_show(struct seq_file *s, void *p) err =bus_for_each_drv (&ide_bus_type,NULL , s, proc_print_driver);if (err <0 )printk (KERN_WARNING "IDE: %s: bus_for_each_drv error: %d\n" , - __FUNCTION__, err); + __func__, err);return 0 ; }
drivers/ide/ide-scan-pci.c +1 -1
@@ -107,7 +107,7 @@ static int __init ide_scan_pcibus(void)if (__pci_register_driver (d, d->driver.owner, d->driver.mod_name))printk (KERN_ERR "%s: failed to register %s driver\n" , - __FUNCTION__, d->driver.mod_name); + __func__, d->driver.mod_name); }return 0 ;
drivers/ide/ide-taskfile.c +6 -6
@@ -434,7 +434,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)/* new way for dealing with premature shared PCI interrupts */ if (!OK_STAT (stat,DRQ_STAT ,BAD_R_STAT )) {if (stat & (ERR_STAT |DRQ_STAT )) -return task_error (drive, rq, __FUNCTION__, stat); +return task_error (drive, rq, __func__, stat);/* No data yet, so wait for another IRQ. */ ide_set_handler (drive, &task_in_intr,WAIT_WORSTCASE ,NULL );return ide_started;
@@ -446,7 +446,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)if (!hwif->nleft) { stat =wait_drive_not_busy (drive);if (!OK_STAT (stat,0 ,BAD_STAT )) -return task_error (drive, rq, __FUNCTION__, stat); +return task_error (drive, rq, __func__, stat);task_end_request (drive, rq, stat);return ide_stopped; }
@@ -467,11 +467,11 @@ static ide_startstop_t task_out_intr (ide_drive_t *drive)u8 stat =ide_read_status (drive);if (!OK_STAT (stat,DRIVE_READY , drive->bad_wstat)) -return task_error (drive, rq, __FUNCTION__, stat); +return task_error (drive, rq, __func__, stat);/* Deal with unexpected ATA data phase. */ if (((stat &DRQ_STAT ) ==0 ) ^ !hwif->nleft) -return task_error (drive, rq, __FUNCTION__, stat); +return task_error (drive, rq, __func__, stat);if (!hwif->nleft) {task_end_request (drive, rq, stat);
@@ -654,7 +654,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)/* (hs): give up if multcount is not set */ printk (KERN_ERR "%s: %s Multimode Write " \"multcount is not set\n" , - drive->name, __FUNCTION__); + drive->name, __func__); err = -EPERM ; goto abort; }
@@ -671,7 +671,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)/* (hs): give up if multcount is not set */ printk (KERN_ERR "%s: %s Multimode Read failure " \"multcount is not set\n" , - drive->name, __FUNCTION__); + drive->name, __func__); err = -EPERM ; goto abort; }
drivers/ide/legacy/ht6560b.c +2 -2
@@ -348,12 +348,12 @@ static int __init ht6560b_init(void)if (!request_region (HT_CONFIG_PORT ,1 , hwif->name)) {printk (KERN_NOTICE "%s: HT_CONFIG_PORT not found\n" , - __FUNCTION__); + __func__);return -ENODEV ; }if (!try_to_init_ht6560b ()) { -printk (KERN_NOTICE "%s: HBA not found\n" , __FUNCTION__); +printk (KERN_NOTICE "%s: HBA not found\n" , __func__); goto release_region; }
drivers/ide/mips/au1xxx-ide.c +4 -4
@@ -66,7 +66,7 @@ void auide_insw(unsigned long port, void *addr, u32 count)if (!put_dest_flags (ahwif->rx_chan, (void *)addr, count <<1 ,DDMA_FLAGS_NOIE )) { -printk (KERN_ERR "%s failed %d\n" , __FUNCTION__, __LINE__); +printk (KERN_ERR "%s failed %d\n" , __func__, __LINE__);return ; } ctp = *((chan_tab_t **)ahwif->rx_chan);
@@ -84,7 +84,7 @@ void auide_outsw(unsigned long port, void *addr, u32 count)if (!put_source_flags (ahwif->tx_chan, (void *)addr, count <<1 ,DDMA_FLAGS_NOIE )) { -printk (KERN_ERR "%s failed %d\n" , __FUNCTION__, __LINE__); +printk (KERN_ERR "%s failed %d\n" , __func__, __LINE__);return ; } ctp = *((chan_tab_t **)ahwif->tx_chan);
@@ -255,7 +255,7 @@ static int auide_build_dmatable(ide_drive_t *drive) (void*) sg_virt(sg), tc, flags)) {printk (KERN_ERR "%s failed %d\n" , - __FUNCTION__, __LINE__); + __func__, __LINE__); } }else {
@@ -263,7 +263,7 @@ static int auide_build_dmatable(ide_drive_t *drive) (void*) sg_virt(sg), tc, flags)) {printk (KERN_ERR "%s failed %d\n" , - __FUNCTION__, __LINE__); + __func__, __LINE__); } }
drivers/ide/pci/cmd640.c +1 -1
@@ -632,7 +632,7 @@ static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)while (drive != cmd_drives[index]) {if (++index >3 ) {printk (KERN_ERR "%s: bad news in %s\n" , - drive->name, __FUNCTION__); + drive->name, __func__);return ; } }
drivers/ide/pci/hpt366.c +2 -2
@@ -776,7 +776,7 @@ static void hpt366_dma_lost_irq(ide_drive_t *drive)pci_read_config_byte (dev,0x52 , &mcr3);pci_read_config_byte (dev,0x5a , &scr1);printk ("%s: (%s) mcr1=0x%02x, mcr3=0x%02x, scr1=0x%02x\n" , - drive->name, __FUNCTION__, mcr1, mcr3, scr1); + drive->name, __func__, mcr1, mcr3, scr1);if (scr1 &0x10 )pci_write_config_byte (dev,0x5a , scr1 & ~0x10 );ide_dma_lost_irq (drive);
@@ -858,7 +858,7 @@ static int hpt374_ide_dma_test_irq(ide_drive_t *drive)if (!drive->waiting_for_dma)printk (KERN_WARNING "%s: (%s) called while not waiting\n" , - drive->name, __FUNCTION__); + drive->name, __func__);return 0 ; }
drivers/ide/pci/pdc202xx_new.c +1 -1
@@ -34,7 +34,7 @@#undef DEBUG#ifdef DEBUG -#define DBG(fmt, args...) printk("%s: " fmt, __FUNCTION__, ## args) +#define DBG(fmt, args...) printk("%s: " fmt, __func__, ## args)#else #define DBG(fmt, args...)#endif
drivers/ide/pci/scc_pata.c +1 -1
@@ -447,7 +447,7 @@ static int scc_dma_test_irq(ide_drive_t *drive)if (!drive->waiting_for_dma)printk (KERN_WARNING "%s: (%s) called while not waiting\n" , - drive->name, __FUNCTION__); + drive->name, __func__);return 0 ; }
drivers/ide/pci/sgiioc4.c +13 -13
@@ -171,10 +171,10 @@ sgiioc4_clearirq(ide_drive_t * drive)printk (KERN_ERR "%s(%s) : PCI Bus Error when doing DMA:" " status-cmd reg is 0x%x\n" , - __FUNCTION__, drive->name, pci_stat_cmd_reg); + __func__, drive->name, pci_stat_cmd_reg);printk (KERN_ERR "%s(%s) : PCI Error Address is 0x%x%x\n" , - __FUNCTION__, drive->name, + __func__, drive->name, pci_err_addr_high, pci_err_addr_low);/* Clear the PCI Error indicator */ pci_write_config_dword (dev,PCI_COMMAND ,0x00000146 );
@@ -233,7 +233,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive)printk (KERN_ERR "%s(%s): IOC4 DMA STOP bit is still 1 :" "ioc4_dma_reg 0x%x\n" , - __FUNCTION__, drive->name, ioc4_dma); + __func__, drive->name, ioc4_dma); dma_stat =1 ; }
@@ -252,7 +252,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive)udelay (1 ); }if (!valid) { -printk (KERN_ERR "%s(%s) : DMA incomplete\n" , __FUNCTION__, +printk (KERN_ERR "%s(%s) : DMA incomplete\n" , __func__, drive->name); dma_stat =1 ; }
@@ -265,7 +265,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive)printk (KERN_ERR "%s(%s): WARNING!! byte_count_dev %d " "!= byte_count_mem %d\n" , - __FUNCTION__, drive->name, bc_dev, bc_mem); + __func__, drive->name, bc_dev, bc_mem); } }
@@ -344,7 +344,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)printk (KERN_ERR "%s(%s) -- ERROR, Addresses 0x%p to 0x%p " "ALREADY in use\n" , - __FUNCTION__, hwif->name, (void *) dma_base, + __func__, hwif->name, (void *) dma_base, (void *) dma_base + num_ports -1 );return -1 ; }
@@ -353,7 +353,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)if (virt_dma_base ==NULL ) {printk (KERN_ERR "%s(%s) -- ERROR, Unable to map addresses 0x%lx to 0x%lx\n" , - __FUNCTION__, hwif->name, dma_base, dma_base + num_ports -1 ); + __func__, hwif->name, dma_base, dma_base + num_ports -1 ); goto dma_remap_failure; } hwif->dma_base = (unsigned long ) virt_dma_base;
@@ -379,7 +379,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base) hwif->dmatable_cpu, hwif->dmatable_dma);printk (KERN_INFO "%s() -- Error! Unable to allocate DMA Maps for drive %s\n" , - __FUNCTION__, hwif->name); + __func__, hwif->name);printk (KERN_INFO "Changing from DMA to PIO mode for Drive %s\n" , hwif->name);
@@ -407,14 +407,14 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)if (ioc4_dma &IOC4_S_DMA_ACTIVE ) {printk (KERN_WARNING "%s(%s):Warning!! DMA from previous transfer was still active\n" , - __FUNCTION__, drive->name); + __func__, drive->name);writel (IOC4_S_DMA_STOP , (void __iomem *)ioc4_dma_addr); ioc4_dma =sgiioc4_ide_dma_stop (hwif, dma_base);if (ioc4_dma &IOC4_S_DMA_STOP )printk (KERN_ERR "%s(%s) : IOC4 Dma STOP bit is still 1\n" , - __FUNCTION__, drive->name); + __func__, drive->name); } ioc4_dma =readl ((void __iomem *)ioc4_dma_addr);
@@ -422,14 +422,14 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)printk (KERN_WARNING "%s(%s) : Warning!! - DMA Error during Previous" " transfer | status 0x%x\n" , - __FUNCTION__, drive->name, ioc4_dma); + __func__, drive->name, ioc4_dma);writel (IOC4_S_DMA_STOP , (void __iomem *)ioc4_dma_addr); ioc4_dma =sgiioc4_ide_dma_stop (hwif, dma_base);if (ioc4_dma &IOC4_S_DMA_STOP )printk (KERN_ERR "%s(%s) : IOC4 DMA STOP bit is still 1\n" , - __FUNCTION__, drive->name); + __func__, drive->name); }/* Address of the Scatter Gather List */
@@ -630,7 +630,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)printk (KERN_ERR "%s : %s -- ERROR, Addresses " "0x%p to 0x%p ALREADY in use\n" , - __FUNCTION__, hwif->name, (void *) cmd_phys_base, + __func__, hwif->name, (void *) cmd_phys_base, (void *) cmd_phys_base +IOC4_CMD_CTL_BLK_SIZE );return -ENOMEM ; }
drivers/ide/pci/siimage.c +1 -1
@@ -347,7 +347,7 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)printk (KERN_WARNING "%s: sata_error = 0x%08x, " "watchdog = %d, %s\n" , drive->name, sata_error, watchdog, - __FUNCTION__); + __func__); }else { watchdog = (ext_stat &0x8000 ) ?1 :0 ;
drivers/ide/pci/sl82c105.c +2 -2
@@ -179,7 +179,7 @@ static void sl82c105_dma_start(ide_drive_t *drive)struct pci_dev *dev =to_pci_dev (hwif->dev);int reg =0x44 + drive->dn *4 ; -DBG (("%s(drive:%s)\n" , __FUNCTION__, drive->name)); +DBG (("%s(drive:%s)\n" , __func__, drive->name));pci_write_config_word (dev, reg, drive->drive_data >>16 );
@@ -203,7 +203,7 @@ static int sl82c105_dma_end(ide_drive_t *drive)int reg =0x44 + drive->dn *4 ;int ret; -DBG (("%s(drive:%s)\n" , __FUNCTION__, drive->name)); +DBG (("%s(drive:%s)\n" , __func__, drive->name)); ret =__ide_dma_end (drive);
drivers/ide/ppc/mpc8xx.c +1 -1
@@ -468,7 +468,7 @@ static void m8xx_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)#elif defined(CONFIG_IDE_EXT_DIRECT )printk ("%s[%d] %s: not implemented yet!\n" , - __FILE__,__LINE__,__FUNCTION__); + __FILE__,__LINE__,__func__);#endif /* defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_PCMCIA */ }
Signature · 1 line
1.5.4.3.500.g83a2c
Bartlomiej Zolnierkiewicz
AppliedQuoted 3 lines · Harvey Harrison
__FUNCTION__is gcc-specific, use__func__Signed-off-by Harvey Harrison <[email protected]>
applied
[ I fixed checkpatch.pl errors in ide-lib.c and ppc/mpc8xx.c while at it ]
PATCH 10/14 serial: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/serial/68360serial.c | 4 +- drivers/serial/8250_early.c | 2 +- drivers/serial/bfin_5xx.c | 4 +- drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- drivers/serial/crisv10.c | 8 +++--- drivers/serial/ioc3_serial.c | 36 +++++++++++++++--------------- drivers/serial/ioc4_serial.c | 32 +++++++++++++------------- drivers/serial/s3c2410.c | 6 ++-- drivers/serial/sa1100.c | 4 +- drivers/serial/sh-sci.c | 2 +- drivers/serial/sn_console.c | 2 +- drivers/serial/uartlite.c | 2 +- drivers/serial/ucc_uart.c | 4 +- 13 files changed, 54 insertions(+), 54 deletions(-)
drivers/serial/68360serial.c +2 -2
@@ -1245,7 +1245,7 @@ static int rs_360_tiocmget(struct tty_struct *tty, struct file *file)#ifdef modem_controlunsigned char control, status; -if (serial_paranoia_check (info, tty->name, __FUNCTION__)) +if (serial_paranoia_check (info, tty->name, __func__))return -ENODEV ;if (tty->flags & (1 <<TTY_IO_ERROR ))
@@ -1276,7 +1276,7 @@ static int rs_360_tiocmset(struct tty_struct *tty, struct file *file,ser_info_t *info = (ser_info_t *)tty->driver_data;unsigned int arg; -if (serial_paranoia_check (info, tty->name, __FUNCTION__)) +if (serial_paranoia_check (info, tty->name, __func__))return -ENODEV ;if (tty->flags & (1 <<TTY_IO_ERROR ))
drivers/serial/8250_early.c +1 -1
@@ -156,7 +156,7 @@ static int __init parse_options(struct early_serial8250_device *device, port->membase =ioremap (port->mapbase,64 );if (!port->membase) {printk (KERN_ERR "%s: Couldn't ioremap 0x%llx\n" , - __FUNCTION__, + __func__, (unsigned long long )port->mapbase);return -ENOMEM ; }
drivers/serial/bfin_5xx.c +2 -2
@@ -766,7 +766,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,break ;default :printk (KERN_ERR "%s: word lengh not supported\n" , - __FUNCTION__); + __func__); }if (termios->c_cflag &CSTOPB )
@@ -1012,7 +1012,7 @@ bfin_serial_console_get_options(struct bfin_serial_port *uart, int *baud, *baud = get_sclk() / (16*(dll | dlh << 8)); } -pr_debug ("%s:baud = %d, parity = %c, bits= %d\n" , __FUNCTION__, *baud, *parity, *bits); +pr_debug ("%s:baud = %d, parity = %c, bits= %d\n" , __func__, *baud, *parity, *bits); }#endif
drivers/serial/cpm_uart/cpm_uart_core.c +1 -1
@@ -1118,7 +1118,7 @@ int cpm_uart_drv_get_platform_data(struct platform_device *pdev, int is_con) line =cpm_uart_id2nr (idx);if (line <0 ) { -printk (KERN_ERR "%s(): port %d is not registered" , __FUNCTION__, idx); +printk (KERN_ERR "%s(): port %d is not registered" , __func__, idx);return -EINVAL ; }
drivers/serial/crisv10.c +4 -4
@@ -1788,7 +1788,7 @@ static unsigned int handle_descr_data(struct e100_serial *info,if (info->recv_cnt + recvl >65536 ) {printk (KERN_CRIT -"%s: Too much pending incoming serial data! Dropping %u bytes.\n" , __FUNCTION__, recvl); +"%s: Too much pending incoming serial data! Dropping %u bytes.\n" , __func__, recvl);return 0 ; }
@@ -1801,7 +1801,7 @@ static unsigned int handle_descr_data(struct e100_serial *info,append_recv_buffer (info, buffer);if (!(buffer =alloc_recv_buffer (SERIAL_DESCR_BUF_SIZE ))) -panic ("%s: Failed to allocate memory for receive buffer!\n" , __FUNCTION__); +panic ("%s: Failed to allocate memory for receive buffer!\n" , __func__); descr->buf =virt_to_phys (buffer->buffer);
@@ -1925,7 +1925,7 @@ static int start_recv_dma(struct e100_serial *info)/* Set up the receiving descriptors */ for (i =0 ; i <SERIAL_RECV_DESCRIPTORS ; i++) {if (!(buffer =alloc_recv_buffer (SERIAL_DESCR_BUF_SIZE ))) -panic ("%s: Failed to allocate memory for receive buffer!\n" , __FUNCTION__); +panic ("%s: Failed to allocate memory for receive buffer!\n" , __func__); descr[i].ctrl = d_int; descr[i].buf =virt_to_phys (buffer->buffer);
@@ -4513,7 +4513,7 @@ rs_init(void)if (request_irq (SERIAL_IRQ_NBR , ser_interrupt,IRQF_SHARED |IRQF_DISABLED ,"serial " , driver)) -panic ("%s: Failed to request irq8" , __FUNCTION__); +panic ("%s: Failed to request irq8" , __func__);#endif #endif /* CONFIG_SVINTO_SIM */
drivers/serial/ioc3_serial.c +18 -18
@@ -52,7 +52,7 @@ static unsigned int Submodule_slot; #define DPRINT_CONFIG(_x...) ;//#define DPRINT_CONFIG(_x...) printk _x #define NOT_PROGRESS () ; -//#define NOT_PROGRESS() printk("%s : fails %d\n", __FUNCTION__, __LINE__) +//#define NOT_PROGRESS() printk("%s : fails %d\n", __func__, __LINE__) /* number of characters we want to transmit to the lower level at a time */ #define MAX_CHARS 256
@@ -445,7 +445,7 @@ static int inline port_init(struct ioc3_port *port) sbbr_h = &idd->vma->sbbr_h; ring_pci_addr = (unsigned long __iomem )port->ip_dma_ringbuf;DPRINT_CONFIG (("%s: ring_pci_addr 0x%p\n" , - __FUNCTION__, (void *)ring_pci_addr)); + __func__, (void *)ring_pci_addr));writel ((unsigned int )((uint64_t ) ring_pci_addr >>32 ), sbbr_h);writel ((unsigned int )ring_pci_addr |BUF_SIZE_BIT , sbbr_l);
@@ -593,7 +593,7 @@ config_port(struct ioc3_port *port,DPRINT_CONFIG (("%s: line %d baud %d byte_size %d stop %d parenb %d " "parodd %d\n" , - __FUNCTION__, ((struct uart_port *)port->ip_port)->line, + __func__, ((struct uart_port *)port->ip_port)->line, baud, byte_size, stop_bits, parenb, parodd));if (set_baud (port, baud))
@@ -871,14 +871,14 @@ static int ioc3_set_proto(struct ioc3_port *port, int proto)default :case PROTO_RS232 :/* Clear the appropriate GIO pin */ -DPRINT_CONFIG (("%s: rs232\n" , __FUNCTION__)); +DPRINT_CONFIG (("%s: rs232\n" , __func__));writel (0 , (&port->ip_idd->vma->gppr[0 ] + hooks->rs422_select_pin));break ;case PROTO_RS422 :/* Set the appropriate GIO pin */ -DPRINT_CONFIG (("%s: rs422\n" , __FUNCTION__)); +DPRINT_CONFIG (("%s: rs422\n" , __func__));writel (1 , (&port->ip_idd->vma->gppr[0 ] + hooks->rs422_select_pin));break ;
@@ -988,7 +988,7 @@ ioc3_change_speed(struct uart_port *the_port, } baud =uart_get_baud_rate (the_port, new_termios, old_termios,MIN_BAUD_SUPPORTED ,MAX_BAUD_SUPPORTED ); -DPRINT_CONFIG (("%s: returned baud %d for line %d\n" , __FUNCTION__, baud, +DPRINT_CONFIG (("%s: returned baud %d for line %d\n" , __func__, baud, the_port->line));if (!the_port->fifosize)
@@ -1026,7 +1026,7 @@ ioc3_change_speed(struct uart_port *the_port,DPRINT_CONFIG (("%s : port 0x%p line %d cflag 0%o " "config_port(baud %d data %d stop %d penable %d " " parity %d), notification 0x%x\n" , - __FUNCTION__, (void *)port, the_port->line, cflag, baud, + __func__, (void *)port, the_port->line, cflag, baud, new_data, new_stop, new_parity_enable, new_parity, the_port->ignore_status_mask));
@@ -1919,7 +1919,7 @@ static inline int ioc3_serial_core_attach( struct ioc3_submodule *is,struct pci_dev *pdev = idd->pdev;DPRINT_CONFIG (("%s: attach pdev 0x%p - card_ptr 0x%p\n" , - __FUNCTION__, pdev, (void *)card_ptr)); + __func__, pdev, (void *)card_ptr));if (!card_ptr)return -ENODEV ;
@@ -1933,7 +1933,7 @@ static inline int ioc3_serial_core_attach( struct ioc3_submodule *is, port->ip_port = the_port;DPRINT_CONFIG (("%s: attach the_port 0x%p / port 0x%p [%d/%d]\n" , - __FUNCTION__, (void *)the_port, (void *)port, + __func__, (void *)the_port, (void *)port, phys_port, ii));/* membase, iobase and mapbase just need to be non-0 */
@@ -1950,7 +1950,7 @@ static inline int ioc3_serial_core_attach( struct ioc3_submodule *is,if (uart_add_one_port (&ioc3_uart, the_port) <0 ) {printk (KERN_WARNING "%s: unable to add port %d bus %d\n" , - __FUNCTION__, the_port->line, pdev->bus->number); + __func__, the_port->line, pdev->bus->number); }else {DPRINT_CONFIG (("IOC3 serial port %d irq %d bus %d\n" , the_port->line, the_port->irq, pdev->bus->number));
@@ -2017,7 +2017,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd)struct ioc3_port *ports[PORTS_PER_CARD ];int phys_port; -DPRINT_CONFIG (("%s (0x%p, 0x%p)\n" , __FUNCTION__, is, idd)); +DPRINT_CONFIG (("%s (0x%p, 0x%p)\n" , __func__, is, idd)); card_ptr =kzalloc (sizeof (struct ioc3_card ),GFP_KERNEL );if (!card_ptr) {
@@ -2067,7 +2067,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd)DPRINT_CONFIG (("%s : Port A ip_serial_regs 0x%p " "ip_uart_regs 0x%p\n" , - __FUNCTION__, + __func__, (void *)port->ip_serial_regs, (void *)port->ip_uart_regs));
@@ -2082,7 +2082,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) DPRINT_CONFIG(("%s : Port A ip_cpu_ringbuf 0x%p " "ip_dma_ringbuf 0x%p, ip_inring 0x%p " "ip_outring 0x%p\n", - __FUNCTION__, + __func__, (void *)port->ip_cpu_ringbuf, (void *)port->ip_dma_ringbuf, (void *)port->ip_inring,
@@ -2094,7 +2094,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd)DPRINT_CONFIG (("%s : Port B ip_serial_regs 0x%p " "ip_uart_regs 0x%p\n" , - __FUNCTION__, + __func__, (void *)port->ip_serial_regs, (void *)port->ip_uart_regs));
@@ -2108,7 +2108,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) DPRINT_CONFIG(("%s : Port B ip_cpu_ringbuf 0x%p " "ip_dma_ringbuf 0x%p, ip_inring 0x%p " "ip_outring 0x%p\n", - __FUNCTION__, + __func__, (void *)port->ip_cpu_ringbuf, (void *)port->ip_dma_ringbuf, (void *)port->ip_inring,
@@ -2116,7 +2116,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) }DPRINT_CONFIG (("%s : port %d [addr 0x%p] card_ptr 0x%p" , - __FUNCTION__, + __func__, phys_port, (void *)port, (void *)card_ptr)); DPRINT_CONFIG((" ip_serial_regs 0x%p ip_uart_regs 0x%p\n", (void *)port->ip_serial_regs,
@@ -2127,7 +2127,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd)DPRINT_CONFIG (("%s: phys_port %d port 0x%p inring 0x%p " "outring 0x%p\n" , - __FUNCTION__, + __func__, phys_port, (void *)port, (void *)port->ip_inring, (void *)port->ip_outring));
@@ -2170,7 +2170,7 @@ static int __devinit ioc3uart_init(void)if ((ret =uart_register_driver (&ioc3_uart)) <0 ) {printk (KERN_WARNING "%s: Couldn't register IOC3 uart serial driver\n" , - __FUNCTION__); + __func__);return ret; } ret =ioc3_register_submodule (&ioc3uart_submodule);
drivers/serial/ioc4_serial.c +16 -16
@@ -889,7 +889,7 @@ static int inline port_init(struct ioc4_port *port) ring_pci_addr = (unsigned long __iomem )port->ip_dma_ringbuf;DPRINT_CONFIG (("%s: ring_pci_addr 0x%lx\n" , - __FUNCTION__, ring_pci_addr)); + __func__, ring_pci_addr));writel ((unsigned int )((uint64_t )ring_pci_addr >>32 ), sbbr_h);writel ((unsigned int )ring_pci_addr |IOC4_BUF_SIZE_BIT , sbbr_l);
@@ -1028,7 +1028,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)spin_lock_irqsave (&soft->is_ir_lock, flag); printk ("%s : %d : mem 0x%p sio_ir 0x%x sio_ies 0x%x " "other_ir 0x%x other_ies 0x%x mask 0x%x\n", - __FUNCTION__, __LINE__, + __func__, __LINE__, (void *)mem, readl(&mem->sio_ir.raw), readl(&mem->sio_ies.raw), readl(&mem->other_ir.raw),
@@ -1155,14 +1155,14 @@ static int inline ioc4_attach_local(struct ioc4_driver_data *idd) (TOTAL_RING_BUF_SIZE - 1)) == 0));DPRINT_CONFIG (("%s : ip_cpu_ringbuf 0x%p " "ip_dma_ringbuf 0x%p\n" , - __FUNCTION__, + __func__, (void *)port->ip_cpu_ringbuf, (void *)port->ip_dma_ringbuf)); port->ip_inring =RING (port,RX_0_OR_2 ); port->ip_outring =RING (port,TX_0_OR_2 ); }DPRINT_CONFIG (("%s : port %d [addr 0x%p] control 0x%p" , - __FUNCTION__, + __func__, port_number, (void *)port, (void *)control)); DPRINT_CONFIG((" ip_serial_regs 0x%p ip_uart_regs 0x%p\n", (void *)port->ip_serial_regs,
@@ -1173,7 +1173,7 @@ static int inline ioc4_attach_local(struct ioc4_driver_data *idd)DPRINT_CONFIG (("%s: port_number %d port 0x%p inring 0x%p " "outring 0x%p\n" , - __FUNCTION__, + __func__, port_number, (void *)port, (void *)port->ip_inring, (void *)port->ip_outring));
@@ -1317,7 +1317,7 @@ config_port(struct ioc4_port *port,int spiniter =0 ;DPRINT_CONFIG (("%s: baud %d byte_size %d stop %d parenb %d parodd %d\n" , - __FUNCTION__, baud, byte_size, stop_bits, parenb, parodd)); + __func__, baud, byte_size, stop_bits, parenb, parodd));if (set_baud (port, baud))return 1 ;
@@ -1725,7 +1725,7 @@ ioc4_change_speed(struct uart_port *the_port, } baud =uart_get_baud_rate (the_port, new_termios, old_termios,MIN_BAUD_SUPPORTED ,MAX_BAUD_SUPPORTED ); -DPRINT_CONFIG (("%s: returned baud %d\n" , __FUNCTION__, baud)); +DPRINT_CONFIG (("%s: returned baud %d\n" , __func__, baud));/* default is 9600 */ if (!baud)
@@ -1765,7 +1765,7 @@ ioc4_change_speed(struct uart_port *the_port,DPRINT_CONFIG (("%s : port 0x%p cflag 0%o " "config_port(baud %d data %d stop %d p enable %d parity %d)," " notification 0x%x\n" , - __FUNCTION__, (void *)port, cflag, baud, new_data, new_stop, + __func__, (void *)port, cflag, baud, new_data, new_stop, new_parity_enable, new_parity, the_port->ignore_status_mask)); if ((config_port(port, baud, /* baud */
@@ -2715,7 +2715,7 @@ ioc4_serial_core_attach(struct pci_dev *pdev, int port_type)DPRINT_CONFIG (("%s: attach pdev 0x%p - control 0x%p\n" , - __FUNCTION__, pdev, (void *)control)); + __func__, pdev, (void *)control));if (!control)return -ENODEV ;
@@ -2734,7 +2734,7 @@ ioc4_serial_core_attach(struct pci_dev *pdev, int port_type) port->ip_all_ports[port_type_idx] = the_port;DPRINT_CONFIG (("%s: attach the_port 0x%p / port 0x%p : type %s\n" , - __FUNCTION__, (void *)the_port, + __func__, (void *)the_port, (void *)port, port_type ==PROTO_RS232 ?"rs232" :"rs422" ));
@@ -2752,7 +2752,7 @@ ioc4_serial_core_attach(struct pci_dev *pdev, int port_type)if (uart_add_one_port (u_driver, the_port) <0 ) {printk (KERN_WARNING "%s: unable to add port %d bus %d\n" , - __FUNCTION__, the_port->line, pdev->bus->number); + __func__, the_port->line, pdev->bus->number); }else { DPRINT_CONFIG( ("IOC4 serial port %d irq = %d, bus %d\n",
@@ -2777,7 +2777,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)int ret =0 ; -DPRINT_CONFIG (("%s (0x%p, 0x%p)\n" , __FUNCTION__, idd->idd_pdev, +DPRINT_CONFIG (("%s (0x%p, 0x%p)\n" , __func__, idd->idd_pdev, idd->idd_pci_id));/* PCI-RT does not bring out serial connections.
@@ -2806,7 +2806,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd) goto out2; }DPRINT_CONFIG (("%s : mem 0x%p, serial 0x%p\n" , - __FUNCTION__, (void *)idd->idd_misc_regs, + __func__, (void *)idd->idd_misc_regs, (void *)serial));/* Get memory for the new card */
@@ -2858,7 +2858,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd) }else {printk (KERN_WARNING "%s : request_irq fails for IRQ 0x%x\n " , - __FUNCTION__, idd->idd_pdev->irq); + __func__, idd->idd_pdev->irq); } ret =ioc4_attach_local (idd);if (ret)
@@ -2911,13 +2911,13 @@ int ioc4_serial_init(void)if ((ret =uart_register_driver (&ioc4_uart_rs232)) <0 ) {printk (KERN_WARNING "%s: Couldn't register rs232 IOC4 serial driver\n" , - __FUNCTION__); + __func__);return ret; }if ((ret =uart_register_driver (&ioc4_uart_rs422)) <0 ) {printk (KERN_WARNING "%s: Couldn't register rs422 IOC4 serial driver\n" , - __FUNCTION__); + __func__);return ret; }
drivers/serial/s3c2410.c +3 -3
@@ -1093,13 +1093,13 @@ static int s3c24xx_serial_probe(struct platform_device *dev, ourport = &s3c24xx_serial_ports[probe_index]; probe_index++; -dbg ("%s: initialising port %p...\n" , __FUNCTION__, ourport); +dbg ("%s: initialising port %p...\n" , __func__, ourport); ret =s3c24xx_serial_init_port (ourport, info, dev);if (ret <0 ) goto probe_err; -dbg ("%s: adding port\n" , __FUNCTION__); +dbg ("%s: adding port\n" , __func__);uart_add_one_port (&s3c24xx_uart_drv, &ourport->port);platform_set_drvdata (dev, &ourport->port);
@@ -1584,7 +1584,7 @@ static int s3c2412_serial_resetport(struct uart_port *port,unsigned long ucon =rd_regl (port,S3C2410_UCON );dbg ("%s: port=%p (%08lx), cfg=%p\n" , - __FUNCTION__, port, port->mapbase, cfg); + __func__, port, port->mapbase, cfg);/* ensure we don't change the clock settings... */
drivers/serial/sa1100.c +2 -2
@@ -655,7 +655,7 @@ void __init sa1100_register_uart_fns(struct sa1100_port_fns *fns)void __init sa1100_register_uart (int idx,int port) {if (idx >=NR_PORTS ) { -printk (KERN_ERR "%s: bad index number %d\n" , __FUNCTION__, idx); +printk (KERN_ERR "%s: bad index number %d\n" , __func__, idx);return ; }
@@ -682,7 +682,7 @@ void __init sa1100_register_uart(int idx, int port)break ;default : -printk (KERN_ERR "%s: bad port number %d\n" , __FUNCTION__, port); +printk (KERN_ERR "%s: bad port number %d\n" , __func__, port); } }
drivers/serial/sh-sci.c +1 -1
@@ -850,7 +850,7 @@ static int sci_notifier(struct notifier_block *self,printk (KERN_INFO "%s: got a postchange notification " "for cpu %d (old %d, new %d)\n" , - __FUNCTION__, freqs->cpu, freqs->old, freqs->new); + __func__, freqs->cpu, freqs->old, freqs->new); }return NOTIFY_OK ;
drivers/serial/sn_console.c +1 -1
@@ -839,7 +839,7 @@ static int __init sn_sal_module_init(void)if (uart_add_one_port (&sal_console_uart, &sal_console_port.sc_port) <0 ) {/* error - not sure what I'd do - so I'll do nothing */ -printk (KERN_ERR "%s: unable to add port\n" , __FUNCTION__); +printk (KERN_ERR "%s: unable to add port\n" , __func__); }/* when this driver is compiled in, the console initialization
drivers/serial/uartlite.c +1 -1
@@ -581,7 +581,7 @@ ulite_of_probe(struct of_device *op, const struct of_device_id *match)const unsigned int *id;int irq, rc; -dev_dbg (&op->dev,"%s(%p, %p)\n" , __FUNCTION__, op, match); +dev_dbg (&op->dev,"%s(%p, %p)\n" , __func__, op, match); rc =of_address_to_resource (op->node,0 , &res);if (rc) {
drivers/serial/ucc_uart.c +2 -2
@@ -215,7 +215,7 @@ static inline dma_addr_t cpu2qe_addr(void *addr, struct uart_qe_port *qe_port)return qe_port->bd_dma_addr + (addr - qe_port->bd_virt);/* something nasty happened */ -printk (KERN_ERR "%s: addr=%p\n" , __FUNCTION__, addr); +printk (KERN_ERR "%s: addr=%p\n" , __func__, addr);BUG ();return 0 ; }
@@ -234,7 +234,7 @@ static inline void *qe2cpu_addr(dma_addr_t addr, struct uart_qe_port *qe_port)return qe_port->bd_virt + (addr - qe_port->bd_dma_addr);/* something nasty happened */ -printk (KERN_ERR "%s: addr=%x\n" , __FUNCTION__, addr); +printk (KERN_ERR "%s: addr=%x\n" , __func__, addr);BUG ();return NULL ; }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 11/14 drivers/parisc: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/parisc/asp.c | 2 +- drivers/parisc/ccio-dma.c | 36 ++++++++++++++++++------------------ drivers/parisc/dino.c | 14 +++++++------- drivers/parisc/gsc.c | 4 ++-- drivers/parisc/lasi.c | 2 +- drivers/parisc/lba_pci.c | 22 +++++++++++----------- drivers/parisc/led.c | 2 +- drivers/parisc/sba_iommu.c | 42 +++++++++++++++++++++--------------------- drivers/parisc/wax.c | 2 +- 9 files changed, 63 insertions(+), 63 deletions(-)
drivers/parisc/asp.c +1 -1
@@ -88,7 +88,7 @@ asp_init_chip(struct parisc_device *dev) ret = -EBUSY ; dev->irq =gsc_claim_irq (&gsc_irq,ASP_GSC_IRQ );if (dev->irq <0 ) { -printk (KERN_ERR "%s(): cannot get GSC irq\n" , __FUNCTION__); +printk (KERN_ERR "%s(): cannot get GSC irq\n" , __func__); goto out; }
drivers/parisc/ccio-dma.c +18 -18
@@ -353,7 +353,7 @@ ccio_alloc_range(struct ioc *ioc, size_t size)BUG_ON ((pages_needed *IOVP_SIZE ) >DMA_CHUNK_SIZE );DBG_RES ("%s() size: %d pages_needed %d\n" , - __FUNCTION__, size, pages_needed); + __func__, size, pages_needed);/* ** "seek and ye shall find"...praying never hurts either...
@@ -386,16 +386,16 @@ ccio_alloc_range(struct ioc *ioc, size_t size)#endif }else {panic ("%s: %s() Too many pages to map. pages_needed: %u\n" , - __FILE__, __FUNCTION__, pages_needed); + __FILE__, __func__, pages_needed); }panic ("%s: %s() I/O MMU is out of mapping resources.\n" , __FILE__, - __FUNCTION__); + __func__); resource_found:DBG_RES ("%s() res_idx %d res_hint: %d\n" , - __FUNCTION__, res_idx, ioc->res_hint); + __func__, res_idx, ioc->res_hint);#ifdef CCIO_SEARCH_TIME {
@@ -441,7 +441,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)BUG_ON (pages_mapped >BITS_PER_LONG );DBG_RES ("%s(): res_idx: %d pages_mapped %d\n" , - __FUNCTION__, res_idx, pages_mapped); + __func__, res_idx, pages_mapped);#ifdef CCIO_MAP_STATS ioc->used_pages -= pages_mapped;
@@ -465,7 +465,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)#endif }else {panic ("%s:%s() Too many pages to unmap.\n" , __FILE__, - __FUNCTION__); + __func__); } }
@@ -766,7 +766,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size, pdir_start = &(ioc->pdir_base[idx]);DBG_RUN ("%s() 0x%p -> 0x%lx size: %0x%x\n" , - __FUNCTION__, addr, (long )iovp | offset, size); + __func__, addr, (long )iovp | offset, size);/* If not cacheline aligned, force SAFE_DMA on the whole mess */ if ((size %L1_CACHE_BYTES ) || ((unsigned long )addr %L1_CACHE_BYTES ))
@@ -811,7 +811,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size, ioc =GET_IOC (dev);DBG_RUN ("%s() iovp 0x%lx/%x\n" , - __FUNCTION__, (long )iova, size); + __func__, (long )iova, size); iova ^= offset;/* clear offset bits */ size += offset;
@@ -913,7 +913,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,BUG_ON (!dev); ioc =GET_IOC (dev); -DBG_RUN_SG ("%s() START %d entries\n" , __FUNCTION__, nents); +DBG_RUN_SG ("%s() START %d entries\n" , __func__, nents);/* Fast path single entry scatterlists. */ if (nents ==1 ) {
@@ -957,7 +957,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,BUG_ON (coalesced != filled); -DBG_RUN_SG ("%s() DONE %d mappings\n" , __FUNCTION__, filled); +DBG_RUN_SG ("%s() DONE %d mappings\n" , __func__, filled);for (i =0 ; i < filled; i++) current_len +=sg_dma_len (sglist + i);
@@ -986,7 +986,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, ioc =GET_IOC (dev);DBG_RUN_SG ("%s() START %d entries, %08lx,%x\n" , - __FUNCTION__, nents,sg_virt_addr (sglist), sglist->length); + __func__, nents,sg_virt_addr (sglist), sglist->length);#ifdef CCIO_MAP_STATS ioc->usg_calls++;
@@ -1002,7 +1002,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, ++sglist; } -DBG_RUN_SG ("%s() DONE (nents %d)\n" , __FUNCTION__, nents); +DBG_RUN_SG ("%s() DONE (nents %d)\n" , __func__, nents); }static struct hppa_dma_ops ccio_ops = {
@@ -1216,7 +1216,7 @@ static int ccio_get_iotlb_size(struct parisc_device *dev) {if (dev->spa_shift ==0 ) { -panic ("%s() : Can't determine I/O TLB size.\n" , __FUNCTION__); +panic ("%s() : Can't determine I/O TLB size.\n" , __func__); }return (1 << dev->spa_shift); }
@@ -1306,7 +1306,7 @@ ccio_ioc_init(struct ioc *ioc)BUG_ON ((1 <<get_order (ioc->pdir_size)) != (ioc->pdir_size >>PAGE_SHIFT ));DBG_INIT ("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n" , - __FUNCTION__, ioc->ioc_regs, + __func__, ioc->ioc_regs, (unsigned long ) num_physpages >> (20 -PAGE_SHIFT ), iova_space_size>>20 , iov_order +PAGE_SHIFT );
@@ -1314,7 +1314,7 @@ ccio_ioc_init(struct ioc *ioc) ioc->pdir_base = (u64 *)__get_free_pages (GFP_KERNEL ,get_order (ioc->pdir_size));if (NULL == ioc->pdir_base) { -panic ("%s() could not allocate I/O Page Table\n" , __FUNCTION__); +panic ("%s() could not allocate I/O Page Table\n" , __func__); }memset (ioc->pdir_base,0 , ioc->pdir_size);
@@ -1323,12 +1323,12 @@ ccio_ioc_init(struct ioc *ioc)/* resource map size dictated by pdir_size */ ioc->res_size = (ioc->pdir_size /sizeof (u64)) >>3 ; -DBG_INIT ("%s() res_size 0x%x\n" , __FUNCTION__, ioc->res_size); +DBG_INIT ("%s() res_size 0x%x\n" , __func__, ioc->res_size); ioc->res_map = (u8 *)__get_free_pages (GFP_KERNEL ,get_order (ioc->res_size));if (NULL == ioc->res_map) { -panic ("%s() could not allocate resource map\n" , __FUNCTION__); +panic ("%s() could not allocate resource map\n" , __func__); }memset (ioc->res_map,0 , ioc->res_size);
@@ -1400,7 +1400,7 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr) result =insert_resource (&iomem_resource, res);if (result <0 ) {printk (KERN_ERR "%s() failed to claim CCIO bus address space (%08lx,%08lx)\n" , - __FUNCTION__, res->start, res->end); + __func__, res->start, res->end); } }
drivers/parisc/dino.c +7 -7
@@ -180,7 +180,7 @@ static int dino_cfg_read(struct pci_bus *bus, unsigned int devfn, int where,void __iomem *base_addr = d->hba.base_addr;unsigned long flags; -DBG ("%s: %p, %d, %d, %d\n" , __FUNCTION__, base_addr, devfn, where, +DBG ("%s: %p, %d, %d, %d\n" , __func__, base_addr, devfn, where, size);spin_lock_irqsave (&d->dinosaur_pen, flags);
@@ -215,7 +215,7 @@ static int dino_cfg_write(struct pci_bus *bus, unsigned int devfn, int where,void __iomem *base_addr = d->hba.base_addr;unsigned long flags; -DBG ("%s: %p, %d, %d, %d\n" , __FUNCTION__, base_addr, devfn, where, +DBG ("%s: %p, %d, %d, %d\n" , __func__, base_addr, devfn, where, size);spin_lock_irqsave (&d->dinosaur_pen, flags);
@@ -301,7 +301,7 @@ static void dino_disable_irq(unsigned int irq)struct dino_device *dino_dev = irq_desc[irq].chip_data;int local_irq =gsc_find_local_irq (irq, dino_dev->global_irq,DINO_LOCAL_IRQS ); -DBG (KERN_WARNING "%s(0x%p, %d)\n" , __FUNCTION__, dino_dev, irq); +DBG (KERN_WARNING "%s(0x%p, %d)\n" , __func__, dino_dev, irq);/* Clear the matching bit in the IMR register */ dino_dev->imr &= ~(DINO_MASK_IRQ (local_irq));
@@ -314,7 +314,7 @@ static void dino_enable_irq(unsigned int irq)int local_irq =gsc_find_local_irq (irq, dino_dev->global_irq,DINO_LOCAL_IRQS );u32 tmp; -DBG (KERN_WARNING "%s(0x%p, %d)\n" , __FUNCTION__, dino_dev, irq); +DBG (KERN_WARNING "%s(0x%p, %d)\n" , __func__, dino_dev, irq);/* ** clear pending IRQ bits
@@ -340,7 +340,7 @@ static void dino_enable_irq(unsigned int irq) tmp =__raw_readl (dino_dev->hba.base_addr+DINO_ILR );if (tmp &DINO_MASK_IRQ (local_irq)) {DBG (KERN_WARNING "%s(): IRQ asserted! (ILR 0x%x)\n" , - __FUNCTION__, tmp); + __func__, tmp);gsc_writel (dino_dev->txn_data, dino_dev->txn_addr); } }
@@ -388,7 +388,7 @@ ilr_again:int local_irq =__ffs (mask);int irq = dino_dev->global_irq[local_irq];DBG (KERN_DEBUG "%s(%d, %p) mask 0x%x\n" , - __FUNCTION__, irq, intr_dev, mask); + __func__, irq, intr_dev, mask);__do_IRQ (irq); mask &= ~(1 << local_irq); }while (mask);
@@ -567,7 +567,7 @@ dino_fixup_bus(struct pci_bus *bus)int port_base =HBA_PORT_BASE (dino_dev->hba.hba_num);DBG (KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n" , - __FUNCTION__, bus, bus->secondary, + __func__, bus, bus->secondary, bus->bridge->platform_data);/* Firmware doesn't set up card-mode dino, so we have to */
drivers/parisc/gsc.c +2 -2
@@ -112,7 +112,7 @@ static void gsc_asic_disable_irq(unsigned int irq)int local_irq =gsc_find_local_irq (irq, irq_dev->global_irq,32 );u32 imr; -DEBPRINTK (KERN_DEBUG "%s(%d) %s: IMR 0x%x\n" , __FUNCTION__, irq, +DEBPRINTK (KERN_DEBUG "%s(%d) %s: IMR 0x%x\n" , __func__, irq, irq_dev->name, imr);/* Disable the IRQ line by clearing the bit in the IMR */
@@ -127,7 +127,7 @@ static void gsc_asic_enable_irq(unsigned int irq)int local_irq =gsc_find_local_irq (irq, irq_dev->global_irq,32 );u32 imr; -DEBPRINTK (KERN_DEBUG "%s(%d) %s: IMR 0x%x\n" , __FUNCTION__, irq, +DEBPRINTK (KERN_DEBUG "%s(%d) %s: IMR 0x%x\n" , __func__, irq, irq_dev->name, imr);/* Enable the IRQ line by setting the bit in the IMR */
drivers/parisc/lasi.c +1 -1
@@ -193,7 +193,7 @@ lasi_init_chip(struct parisc_device *dev) dev->irq =gsc_alloc_irq (&gsc_irq);if (dev->irq <0 ) {printk (KERN_ERR "%s(): cannot get GSC irq\n" , - __FUNCTION__); + __func__);kfree (lasi);return -EBUSY ; }
drivers/parisc/lba_pci.c +11 -11
@@ -377,12 +377,12 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int/* original - Generate config cycle on broken elroy with risk we will miss PCI bus errors. */ *data =lba_rd_cfg (d, tok, pos, size); -DBG_CFG ("%s(%x+%2x) -> 0x%x (a)\n" , __FUNCTION__, tok, pos, *data); +DBG_CFG ("%s(%x+%2x) -> 0x%x (a)\n" , __func__, tok, pos, *data);return 0 ; }if (LBA_SKIP_PROBE (d) && !lba_device_present (bus->secondary, devfn, d)) { -DBG_CFG ("%s(%x+%2x) -> -1 (b)\n" , __FUNCTION__, tok, pos); +DBG_CFG ("%s(%x+%2x) -> -1 (b)\n" , __func__, tok, pos);/* either don't want to look or know device isn't present. */ *data = ~0U ;return (0 );
@@ -398,7 +398,7 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, intcase 2 : *data =READ_REG16 (data_reg + (pos &2 ));break ;case 4 : *data =READ_REG32 (data_reg);break ; } -DBG_CFG ("%s(%x+%2x) -> 0x%x (c)\n" , __FUNCTION__, tok, pos, *data); +DBG_CFG ("%s(%x+%2x) -> 0x%x (c)\n" , __func__, tok, pos, *data);return 0 ; }
@@ -441,16 +441,16 @@ static int elroy_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, intif (!LBA_SKIP_PROBE (d)) {/* Original Workaround */ lba_wr_cfg (d, tok, pos, (u32 ) data, size); -DBG_CFG ("%s(%x+%2x) = 0x%x (a)\n" , __FUNCTION__, tok, pos,data); +DBG_CFG ("%s(%x+%2x) = 0x%x (a)\n" , __func__, tok, pos,data);return 0 ; }if (LBA_SKIP_PROBE (d) && (!lba_device_present (bus->secondary, devfn, d))) { -DBG_CFG ("%s(%x+%2x) = 0x%x (b)\n" , __FUNCTION__, tok, pos,data); +DBG_CFG ("%s(%x+%2x) = 0x%x (b)\n" , __func__, tok, pos,data);return 1 ;/* New Workaround */ } -DBG_CFG ("%s(%x+%2x) = 0x%x (c)\n" , __FUNCTION__, tok, pos, data); +DBG_CFG ("%s(%x+%2x) = 0x%x (c)\n" , __func__, tok, pos, data);/* Basic Algorithm */ LBA_CFG_ADDR_SETUP (d, tok | pos);
@@ -521,7 +521,7 @@ static int mercury_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, iif ((pos >255 ) || (devfn >255 ))return -EINVAL ; -DBG_CFG ("%s(%x+%2x) <- 0x%x (c)\n" , __FUNCTION__, tok, pos, data); +DBG_CFG ("%s(%x+%2x) <- 0x%x (c)\n" , __func__, tok, pos, data);LBA_CFG_TR4_ADDR_SETUP (d, tok | pos);switch (size) {
@@ -890,7 +890,7 @@ LBA_PORT_IN(32, 0)#define LBA_PORT_OUT (size, mask) \ static void lba_astro_out##size (struct pci_hba_data *d, u16 addr, u##size val) \ { \ - DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, d, addr, val); \ + DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, d, addr, val); \ WRITE_REG##size(val, astro_iop_base + addr); \ if (LBA_DEV(d)->hw_rev < 3) \ lba_t32 = READ_U32(d->base_addr + LBA_FUNC_ID); \
@@ -932,7 +932,7 @@ static struct pci_port_ops lba_astro_port_ops = { static u##size lba_pat_in##size (struct pci_hba_data *l, u16 addr) \ { \ u##size t; \ - DBG_PORT("%s(0x%p, 0x%x) ->", __FUNCTION__, l, addr); \ + DBG_PORT("%s(0x%p, 0x%x) ->", __func__, l, addr); \ t = READ_REG##size(PIOP_TO_GMMIO(LBA_DEV(l), addr)); \ DBG_PORT(" 0x%x\n", t); \ return (t); \
@@ -948,7 +948,7 @@ LBA_PORT_IN(32, 0) static void lba_pat_out##size (struct pci_hba_data *l, u16 addr, u##size val) \ { \ void __iomem *where = PIOP_TO_GMMIO(LBA_DEV(l), addr); \ - DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, l, addr, val); \ + DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, l, addr, val); \ WRITE_REG##size(val, where); \ /* flush the I/O down to the elroy at least */ \ lba_t32 =READ_U32 (l->base_addr +LBA_FUNC_ID ); \
@@ -1584,7 +1584,7 @@ void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)WARN_ON ((ibase &0x001fffff ) !=0 );WARN_ON ((imask &0x001fffff ) !=0 ); -DBG ("%s() ibase 0x%x imask 0x%x\n" , __FUNCTION__, ibase, imask); +DBG ("%s() ibase 0x%x imask 0x%x\n" , __func__, ibase, imask);WRITE_REG32 ( imask, base_addr +LBA_IMASK );WRITE_REG32 ( ibase, base_addr +LBA_IBASE );iounmap (base_addr);
drivers/parisc/led.c +1 -1
@@ -569,7 +569,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long ddefault :printk (KERN_ERR "%s: Wrong LCD/LED model %d !\n" , - __FUNCTION__, lcd_info.model); + __func__, lcd_info.model);return 1 ; }
drivers/parisc/sba_iommu.c +21 -21
168 lines not on this page · raw message
drivers/parisc/wax.c +1 -1
@@ -93,7 +93,7 @@ wax_init_chip(struct parisc_device *dev) dev->irq =gsc_claim_irq (&gsc_irq,WAX_GSC_IRQ );if (dev->irq <0 ) {printk (KERN_ERR "%s(): cannot get GSC irq\n" , - __FUNCTION__); + __func__);kfree (wax);return -EBUSY ; }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 12/14 video: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/video/amifb.c | 2 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/aty/mach64_ct.c | 16 ++++++------ drivers/video/bf54x-lq043fb.c | 6 ++-- drivers/video/cfbimgblt.c | 2 +- drivers/video/cirrusfb.c | 4 +- drivers/video/console/fbcon.c | 2 +- drivers/video/imsttfb.c | 2 +- drivers/video/imxfb.c | 6 ++-- drivers/video/matrox/matroxfb_DAC1064.c | 36 +++++++++++++------------- drivers/video/matrox/matroxfb_Ti3026.c | 16 ++++++------ drivers/video/matrox/matroxfb_accel.c | 14 +++++----- drivers/video/matrox/matroxfb_base.c | 42 +++++++++++++++--------------- drivers/video/matrox/matroxfb_crtc2.c | 2 +- drivers/video/matrox/matroxfb_maven.c | 2 +- drivers/video/matrox/matroxfb_misc.c | 12 ++++---- drivers/video/modedb.c | 2 +- drivers/video/nvidia/nvidia.c | 6 ++-- drivers/video/pm2fb.c | 2 +- drivers/video/pm3fb.c | 2 +- drivers/video/pxafb.c | 2 +- drivers/video/riva/fbdev.c | 6 ++-- drivers/video/s3c2410fb.c | 6 ++-- drivers/video/sa1100fb.h | 2 +- drivers/video/sis/sis.h | 2 +- drivers/video/sstfb.c | 10 +++--- drivers/video/stifb.c | 4 +- drivers/video/sysimgblt.c | 2 +- drivers/video/tdfxfb.c | 2 +- 29 files changed, 107 insertions(+), 107 deletions(-)
drivers/video/amifb.c +1 -1
@@ -96,7 +96,7 @@#endif #ifdef DEBUG -# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) +# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)#else # define DPRINTK(fmt, args...)#endif
drivers/video/aty/aty128fb.c +1 -1
@@ -91,7 +91,7 @@#undef DEBUG#ifdef DEBUG -#define DBG(fmt, args...) printk(KERN_DEBUG "aty128fb: %s " fmt, __FUNCTION__, ##args); +#define DBG(fmt, args...) printk(KERN_DEBUG "aty128fb: %s " fmt, __func__, ##args);#else #define DBG(fmt, args...)#endif
drivers/video/aty/mach64_ct.c +8 -8
@@ -197,7 +197,7 @@ static int aty_dsp_gt(const struct fb_info *info, u32 bpp, struct pll_ct *pll) pll->dsp_config = (dsp_precision <<20 ) | (pll->dsp_loop_latency <<16 ) | dsp_xclks;#ifdef DEBUG printk ("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n" , - __FUNCTION__, pll->dsp_config, pll->dsp_on_off); + __func__, pll->dsp_config, pll->dsp_on_off);#endif return 0 ; }
@@ -225,7 +225,7 @@ static int aty_valid_pll_ct(const struct fb_info *info, u32 vclk_per, struct pll (par->ref_clk_per * pll->pll_ref_div);#ifdef DEBUG printk ("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n" , - __FUNCTION__, pllvclk, pllvclk / pll->vclk_post_div_real); + __func__, pllvclk, pllvclk / pll->vclk_post_div_real);#endif pll->pll_vclk_cntl =0x03 ;/* VCLK = PLL_VCLK/VCLKx_POST */
@@ -269,7 +269,7 @@ static u32 aty_pll_to_var_ct(const struct fb_info *info, const union aty_pll *pl }#endif #ifdef DEBUG -printk ("atyfb(%s): calculated 0x%08X(%i)\n" , __FUNCTION__, ret, ret); +printk ("atyfb(%s): calculated 0x%08X(%i)\n" , __func__, ret, ret);#endif return ret; }
@@ -284,11 +284,11 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll)#ifdef DEBUG printk ("atyfb(%s): about to program:\n" "pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n" , - __FUNCTION__, + __func__, pll->ct.pll_ext_cntl, pll->ct.pll_gen_cntl, pll->ct.pll_vclk_cntl);printk ("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n" , - __FUNCTION__, + __func__, par->clk_wr_offset, pll->ct.vclk_fb_div, pll->ct.pll_ref_div, pll->ct.vclk_post_div, pll->ct.vclk_post_div_real);#endif
@@ -428,7 +428,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,#ifdef DEBUG printk ("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n" , - __FUNCTION__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div); + __func__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div);#endif memcntl =aty_ld_le32 (MEM_CNTL , par);
@@ -540,7 +540,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info, pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) / (par->ref_clk_per * pll->ct.pll_ref_div);printk ("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n" , - __FUNCTION__, pllmclk, pllmclk / pll->ct.xclk_post_div_real); + __func__, pllmclk, pllmclk / pll->ct.xclk_post_div_real);#endif if (M64_HAS (SDRAM_MAGIC_PLL ) && (par->ram_type >=SDRAM ))
@@ -581,7 +581,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info, pllsclk = (1000000 *2 * pll->ct.sclk_fb_div) / (par->ref_clk_per * pll->ct.pll_ref_div);printk ("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n" , - __FUNCTION__, pllsclk, pllsclk / sclk_post_div_real); + __func__, pllsclk, pllsclk / sclk_post_div_real);#endif }
drivers/video/bf54x-lq043fb.c +3 -3
@@ -336,7 +336,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var, {if (var->bits_per_pixel !=LCD_BPP ) { -pr_debug ("%s: depth not supported: %u BPP\n" , __FUNCTION__, +pr_debug ("%s: depth not supported: %u BPP\n" , __func__, var->bits_per_pixel);return -EINVAL ; }
@@ -345,7 +345,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var, info->var.xres_virtual != var->xres_virtual || info->var.yres_virtual != var->yres_virtual) {pr_debug ("%s: Resolution not supported: X%u x Y%u \n" , - __FUNCTION__, var->xres, var->yres); + __func__, var->xres, var->yres);return -EINVAL ; }
@@ -355,7 +355,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {pr_debug ("%s: Memory Limit requested yres_virtual = %u\n" , - __FUNCTION__, var->yres_virtual); + __func__, var->yres_virtual);return -ENOMEM ; }
drivers/video/cfbimgblt.c +1 -1
@@ -38,7 +38,7 @@#define DEBUG #ifdef DEBUG -#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args) +#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__func__,## args)#else #define DPRINTK(fmt, args...)#endif
drivers/video/cirrusfb.c +2 -2
@@ -81,7 +81,7 @@/* debug output */ #ifdef CIRRUSFB_DEBUG #define DPRINTK(fmt, args...) \ - printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) + printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)#else #define DPRINTK(fmt, args...)#endif
@@ -91,7 +91,7 @@#define assert (expr) \ if (!(expr)) { \ printk("Assertion failed! %s,%s,%s,line=%d\n", \ - #expr, __FILE__, __FUNCTION__, __LINE__); \ + #expr, __FILE__, __func__, __LINE__); \ }#else #define assert (expr)
drivers/video/console/fbcon.c +1 -1
@@ -92,7 +92,7 @@#include "fbcon.h" #ifdef FBCONDEBUG -# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) +# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)#else # define DPRINTK(fmt, args...)#endif
drivers/video/imsttfb.c +1 -1
@@ -1476,7 +1476,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dp =pci_device_to_OF_node (pdev);if (dp) -printk (KERN_INFO "%s: OF name %s\n" ,__FUNCTION__, dp->name); +printk (KERN_INFO "%s: OF name %s\n" ,__func__, dp->name);else printk (KERN_ERR "imsttfb: no OF node for pci device\n" );#endif /* CONFIG_PPC_OF */
drivers/video/imxfb.c +3 -3
@@ -415,7 +415,7 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)static int imxfb_suspend (struct platform_device *dev,pm_message_t state) {struct imxfb_info *fbi =platform_get_drvdata (dev); -pr_debug ("%s\n" ,__FUNCTION__); +pr_debug ("%s\n" ,__func__);imxfb_disable_controller (fbi);return 0 ;
@@ -424,7 +424,7 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state)static int imxfb_resume (struct platform_device *dev) {struct imxfb_info *fbi =platform_get_drvdata (dev); -pr_debug ("%s\n" ,__FUNCTION__); +pr_debug ("%s\n" ,__func__);imxfb_enable_controller (fbi);return 0 ;
@@ -440,7 +440,7 @@ static int __init imxfb_init_fbinfo(struct device *dev)struct fb_info *info =dev_get_drvdata (dev);struct imxfb_info *fbi = info->par; -pr_debug ("%s\n" ,__FUNCTION__); +pr_debug ("%s\n" ,__func__); info->pseudo_palette =kmalloc (sizeof (u32) *16 ,GFP_KERNEL );if (!info->pseudo_palette)
drivers/video/matrox/matroxfb_DAC1064.c +18 -18
@@ -37,7 +37,7 @@ static void DAC1064_calcclock(CPMINFO unsigned int freq, unsigned int fmax, unsiunsigned int fvco;unsigned int p; -DBG (__FUNCTION__) +DBG (__func__)/* only for devices older than G450 */
@@ -83,7 +83,7 @@ static const unsigned char MGA1064_DAC[] = {static void DAC1064_setpclk (WPMINFO unsigned long fout) {unsigned int m, n, p; -DBG (__FUNCTION__) +DBG (__func__) DAC1064_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);ACCESS_FBINFO (hw).DACclk[0 ] = m;
@@ -95,7 +95,7 @@ static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) {u_int32_t mx;struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__) if (ACCESS_FBINFO(devflags.noinit)) {/* read MCLK and give up... */
@@ -338,7 +338,7 @@ void DAC1064_global_restore(WPMINFO2) { static int DAC1064_init_1(WPMINFO struct my_timming* m) {struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__) memcpy(hw->DACreg, MGA1064_DAC, sizeof(MGA1064_DAC_regs));switch (ACCESS_FBINFO (fbcon).var.bits_per_pixel) {
@@ -374,7 +374,7 @@ static int DAC1064_init_1(WPMINFO struct my_timming* m) { static int DAC1064_init_2(WPMINFO struct my_timming* m) {struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__) if (ACCESS_FBINFO(fbcon).var.bits_per_pixel > 16) { /* 256 entries */int i;
@@ -418,7 +418,7 @@ static void DAC1064_restore_1(WPMINFO2) { CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) CRITBEGIN
@@ -448,7 +448,7 @@ static void DAC1064_restore_2(WPMINFO2) {unsigned int i;#endif - DBG(__FUNCTION__) + DBG(__func__)#ifdef DEBUG dprintk (KERN_DEBUG "DAC1064regs " );
@@ -521,7 +521,7 @@ static struct matrox_altout g450out = { static int MGA1064_init(WPMINFO struct my_timming* m) {struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); - DBG(__FUNCTION__) + DBG(__func__) if (DAC1064_init_1(PMINFO m)) return 1; if (matroxfb_vgaHWinit(PMINFO m)) return 1;
@@ -543,7 +543,7 @@ static int MGA1064_init(WPMINFO struct my_timming* m) { static int MGAG100_init(WPMINFO struct my_timming* m) {struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); - DBG(__FUNCTION__) + DBG(__func__) if (DAC1064_init_1(PMINFO m)) return 1; hw->MXoptionReg &= ~0x2000 ;
@@ -565,7 +565,7 @@ static int MGAG100_init(WPMINFO struct my_timming* m) {#ifdef CONFIG_FB_MATROX_MYSTIQUE static void MGA1064_ramdac_init (WPMINFO2 ) { -DBG (__FUNCTION__) +DBG (__func__)/* ACCESS_FBINFO(features.DAC1064.vco_freq_min) = 120000; */ ACCESS_FBINFO(features.pll.vco_freq_min) = 62000;
@@ -594,7 +594,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) {int selClk;int clk; -DBG (__FUNCTION__) +DBG (__func__) outDAC1064(PMINFO M1064_XPIXCLKCTRL, inDAC1064(PMINFO M1064_XPIXCLKCTRL) | M1064_XPIXCLKCTRL_DIS |M1064_XPIXCLKCTRL_PLL_UP );
@@ -636,7 +636,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) { static void MGAG100_setPixClock(CPMINFO int flags, int freq) {unsigned int m, n, p; -DBG (__FUNCTION__) +DBG (__func__) DAC1064_calcclock(PMINFO freq, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p); MGAG100_progPixClock(PMINFO flags, m, n, p);
@@ -650,7 +650,7 @@ static int MGA1064_preinit(WPMINFO2) { 2048, 0};struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__)/* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */ ACCESS_FBINFO(capable.text) = 1;
@@ -683,7 +683,7 @@ static int MGA1064_preinit(WPMINFO2) {static void MGA1064_reset (WPMINFO2 ) { -DBG (__FUNCTION__); +DBG (__func__);MGA1064_ramdac_init (PMINFO2 ); }
@@ -819,7 +819,7 @@ static int MGAG100_preinit(WPMINFO2) {u_int32_t q;#endif -DBG (__FUNCTION__) +DBG (__func__)/* there are some instabilities if in_div > 19 && vco < 61000 */ if (ACCESS_FBINFO(devflags.g450dac)) {
@@ -956,7 +956,7 @@ static void MGAG100_reset(WPMINFO2) {u_int8_t b;struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__) {#ifdef G100_BROKEN_IBM_82351
@@ -1015,7 +1015,7 @@ static void MGA1064_restore(WPMINFO2) { CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) CRITBEGIN
@@ -1041,7 +1041,7 @@ static void MGAG100_restore(WPMINFO2) { CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) CRITBEGIN
drivers/video/matrox/matroxfb_Ti3026.c +8 -8
@@ -283,7 +283,7 @@ static int Ti3026_calcclock(CPMINFO unsigned int freq, unsigned int fmax, int* iunsigned int fvco;unsigned int lin, lfeed, lpost; -DBG (__FUNCTION__) +DBG (__func__) fvco = PLL_calcclock(PMINFO freq, fmax, &lin, &lfeed, &lpost); fvco >>= (*post = lpost);
@@ -297,7 +297,7 @@ static int Ti3026_setpclk(WPMINFO int clk) {unsigned int pixfeed, pixin, pixpost;struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__) f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost);
@@ -365,7 +365,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) {u_int8_t muxctrl =isInterleave (MINFO ) ?TVP3026_XMUXCTRL_MEMORY_64BIT :TVP3026_XMUXCTRL_MEMORY_32BIT ;struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__) memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg));switch (ACCESS_FBINFO (fbcon).var.bits_per_pixel) {
@@ -440,7 +440,7 @@ static void ti3026_setMCLK(WPMINFO int fout){unsigned int rfhcnt, mclk_ctl;int tmout; -DBG (__FUNCTION__) +DBG (__func__) f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p);
@@ -534,7 +534,7 @@ static void ti3026_setMCLK(WPMINFO int fout){static void ti3026_ramdac_init (WPMINFO2 ) { -DBG (__FUNCTION__) +DBG (__func__) ACCESS_FBINFO(features.pll.vco_freq_min) = 110000;ACCESS_FBINFO (features.pll.ref_freq) =114545 ;
@@ -554,7 +554,7 @@ static void Ti3026_restore(WPMINFO2) {struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__)#ifdef DEBUG dprintk (KERN_INFO "EXTVGA regs: " );
@@ -662,7 +662,7 @@ static void Ti3026_restore(WPMINFO2) {static void Ti3026_reset (WPMINFO2 ) { -DBG (__FUNCTION__) +DBG (__func__)ti3026_ramdac_init (PMINFO2); }
@@ -680,7 +680,7 @@ static int Ti3026_preinit(WPMINFO2) { 2048, 0};struct matrox_hw_state * hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__)ACCESS_FBINFO (millenium ) =1 ;ACCESS_FBINFO (milleniumII) = (ACCESS_FBINFO (pcidev)->device !=PCI_DEVICE_ID_MATROX_MIL );
drivers/video/matrox/matroxfb_accel.c +7 -7
@@ -113,7 +113,7 @@ void matrox_cfbX_init(WPMINFO2) {u_int32_t mopmode;int accel; -DBG (__FUNCTION__) +DBG (__func__) mpitch =ACCESS_FBINFO (fbcon).var.xres_virtual;
@@ -199,7 +199,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dxint start, end; CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) CRITBEGIN
@@ -235,7 +235,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, inint start, end; CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) CRITBEGIN
@@ -287,7 +287,7 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he int width) { CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) CRITBEGIN
@@ -315,7 +315,7 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heighint whattodo; CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) CRITBEGIN
@@ -388,7 +388,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,int easy;CRITFLAGS -DBG_HEAVY (__FUNCTION__ ); +DBG_HEAVY (__func__ ); step = (width +7 ) >>3 ; charcell = height * step;
@@ -469,7 +469,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,static void matroxfb_imageblit (struct fb_info * info,const struct fb_image * image) {MINFO_FROM_INFO (info); -DBG_HEAVY (__FUNCTION__); +DBG_HEAVY (__func__);if (image->depth ==1 ) {u_int32_t fgx, bgx;
drivers/video/matrox/matroxfb_base.c +21 -21
168 lines not on this page · raw message
drivers/video/matrox/matroxfb_crtc2.c +1 -1
@@ -420,7 +420,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,#define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))MINFO_FROM (m2info->primary_dev); -DBG (__FUNCTION__) +DBG (__func__) switch (cmd) {case FBIOGET_VBLANK :
drivers/video/matrox/matroxfb_maven.c +1 -1
@@ -220,7 +220,7 @@ static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll,unsigned int scrlen;unsigned int fmax; -DBG (__FUNCTION__) +DBG (__func__) scrlen = htotal * (vtotal -1 ); fwant = htotal * vtotal;
drivers/video/matrox/matroxfb_misc.c +6 -6
@@ -90,13 +90,13 @@#include <linux/matroxfb.h> void matroxfb_DAC_out(CPMINFO int reg, int val) { -DBG_REG (__FUNCTION__) +DBG_REG (__func__) mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);mga_outb (M_RAMDAC_BASE +M_X_DATAREG , val); } int matroxfb_DAC_in(CPMINFO int reg) { -DBG_REG (__FUNCTION__) +DBG_REG (__func__) mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);return mga_inb (M_RAMDAC_BASE +M_X_DATAREG ); }
@@ -104,7 +104,7 @@ int matroxfb_DAC_in(CPMINFO int reg) {void matroxfb_var2my (struct fb_var_screeninfo * var,struct my_timming * mt) {unsigned int pixclock = var->pixclock; -DBG (__FUNCTION__) +DBG (__func__) if (!pixclock) pixclock = 10000; /* 10ns = 100MHz */ mt->pixclock =1000000000 / pixclock;
@@ -131,7 +131,7 @@ int matroxfb_PLL_calcclock(const struct matrox_pll_features* pll, unsigned int funsigned int fwant;unsigned int p; -DBG (__FUNCTION__) +DBG (__func__) fwant = freq;
@@ -192,7 +192,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {int i;struct matrox_hw_state *const hw = &ACCESS_FBINFO (hw); -DBG (__FUNCTION__) +DBG (__func__) hw->SEQ[0] = 0x00; hw->SEQ[1 ] =0x01 ;/* or 0x09 */
@@ -336,7 +336,7 @@ void matroxfb_vgaHWrestore(WPMINFO2) {struct matrox_hw_state *const hw = &ACCESS_FBINFO (hw); CRITFLAGS - DBG(__FUNCTION__) + DBG(__func__) dprintk(KERN_INFO "MiscOutReg: %02X\n", hw->MiscOutReg);dprintk (KERN_INFO "SEQ regs: " );
drivers/video/modedb.c +1 -1
@@ -22,7 +22,7 @@ ((v).xres == (x) && (v).yres == (y))#ifdef DEBUG -#define DPRINTK(fmt, args...) printk("modedb %s: " fmt, __FUNCTION__ , ## args) +#define DPRINTK(fmt, args...) printk("modedb %s: " fmt, __func__ , ## args)#else #define DPRINTK(fmt, args...)#endif
drivers/video/nvidia/nvidia.c +3 -3
@@ -43,14 +43,14 @@#define NVTRACE if (0) printk#endif -#define NVTRACE_ENTER (...) NVTRACE("%s START\n", __FUNCTION__) -#define NVTRACE_LEAVE (...) NVTRACE("%s END\n", __FUNCTION__) +#define NVTRACE_ENTER (...) NVTRACE("%s START\n", __func__) +#define NVTRACE_LEAVE (...) NVTRACE("%s END\n", __func__)#ifdef CONFIG_FB_NVIDIA_DEBUG #define assert (expr) \ if (!(expr)) { \ printk( "Assertion failed! %s,%s,%s,line=%d\n",\ - #expr,__FILE__,__FUNCTION__,__LINE__); \ + #expr,__FILE__,__func__,__LINE__); \ BUG(); \ }#else
drivers/video/pm2fb.c +1 -1
@@ -56,7 +56,7 @@#undef PM2FB_MASTER_DEBUG#ifdef PM2FB_MASTER_DEBUG #define DPRINTK(a, b...) \ - printk(KERN_DEBUG "pm2fb: %s: " a, __FUNCTION__ , ## b) + printk(KERN_DEBUG "pm2fb: %s: " a, __func__ , ## b)#else #define DPRINTK(a, b...)#endif
drivers/video/pm3fb.c +1 -1
@@ -45,7 +45,7 @@#undef PM3FB_MASTER_DEBUG#ifdef PM3FB_MASTER_DEBUG #define DPRINTK(a, b...) \ - printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b) + printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)#else #define DPRINTK(a, b...)#endif
drivers/video/pxafb.c +1 -1
@@ -1053,7 +1053,7 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)break ;#if 0 case CPUFREQ_NOTIFY : -printk (KERN_ERR "%s: got CPUFREQ_NOTIFY\n" , __FUNCTION__); +printk (KERN_ERR "%s: got CPUFREQ_NOTIFY\n" , __func__);do {}while (0 );/* todo: panic if min/max values aren't fulfilled * [can't really happen unless there's a bug in the
drivers/video/riva/fbdev.c +3 -3
@@ -74,14 +74,14 @@#define NVTRACE if(0) printk#endif -#define NVTRACE_ENTER (...) NVTRACE("%s START\n", __FUNCTION__) -#define NVTRACE_LEAVE (...) NVTRACE("%s END\n", __FUNCTION__) +#define NVTRACE_ENTER (...) NVTRACE("%s START\n", __func__) +#define NVTRACE_LEAVE (...) NVTRACE("%s END\n", __func__)#ifdef CONFIG_FB_RIVA_DEBUG #define assert (expr) \ if(!(expr)) { \ printk( "Assertion failed! %s,%s,%s,line=%d\n",\ - #expr,__FILE__,__FUNCTION__,__LINE__); \ + #expr,__FILE__,__func__,__LINE__); \ BUG(); \ }#else
drivers/video/s3c2410fb.c +3 -3
@@ -430,9 +430,9 @@ static void s3c2410fb_activate_var(struct fb_info *info)struct fb_var_screeninfo *var = &info->var;int clkdiv =s3c2410fb_calc_pixclk (fbi, var->pixclock) /2 ; -dprintk ("%s: var->xres = %d\n" , __FUNCTION__, var->xres); -dprintk ("%s: var->yres = %d\n" , __FUNCTION__, var->yres); -dprintk ("%s: var->bpp = %d\n" , __FUNCTION__, var->bits_per_pixel); +dprintk ("%s: var->xres = %d\n" , __func__, var->xres); +dprintk ("%s: var->yres = %d\n" , __func__, var->yres); +dprintk ("%s: var->bpp = %d\n" , __func__, var->bits_per_pixel);if (type ==S3C2410_LCDCON1_TFT ) {s3c2410fb_calculate_tft_lcd_regs (info, &fbi->regs);
drivers/video/sa1100fb.h +1 -1
@@ -132,7 +132,7 @@ struct sa1100fb_info {* Debug macros */ #if DEBUG -# define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) +# define DPRINTK(fmt, args...) printk("%s: " fmt, __func__ , ## args)#else # define DPRINTK(fmt, args...)#endif
drivers/video/sis/sis.h +1 -1
@@ -55,7 +55,7 @@#undef SISFBDEBUG#ifdef SISFBDEBUG -#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) +#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)#define TWDEBUG (x) printk(KERN_INFO x "\n");#else #define DPRINTK(fmt, args...)
drivers/video/sstfb.c +5 -5
@@ -1006,7 +1006,7 @@ static int sst_set_pll_att_ti(struct fb_info *info,break ;default :dprintk ("%s: wrong clock code '%d'\n" , - __FUNCTION__, clock); + __func__, clock);return 0 ; }udelay (300 );
@@ -1048,7 +1048,7 @@ static int sst_set_pll_ics(struct fb_info *info,break ;default :dprintk ("%s: wrong clock code '%d'\n" , - __FUNCTION__, clock); + __func__, clock);return 0 ; }udelay (300 );
@@ -1079,7 +1079,7 @@ static void sst_set_vidmod_att_ti(struct fb_info *info, const int bpp)sst_dac_write (DACREG_RMR , (cr0 &0x0f ) |DACREG_CR0_16BPP );break ;default : -dprintk ("%s: bad depth '%u'\n" , __FUNCTION__, bpp); +dprintk ("%s: bad depth '%u'\n" , __func__, bpp);break ; } }
@@ -1093,7 +1093,7 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp)sst_dac_write (DACREG_ICS_CMD ,DACREG_ICS_CMD_16BPP );break ;default : -dprintk ("%s: bad depth '%u'\n" , __FUNCTION__, bpp); +dprintk ("%s: bad depth '%u'\n" , __func__, bpp);break ; } }
@@ -1133,7 +1133,7 @@ static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par * }if (!ret)return 0 ; -f_dprintk ("%s found %s\n" , __FUNCTION__, dacs[i].name); +f_dprintk ("%s found %s\n" , __func__, dacs[i].name); par->dac_sw = dacs[i];return 1 ; }
drivers/video/stifb.c +2 -2
@@ -164,11 +164,11 @@ static int __initdata stifb_bpp_pref[MAX_STI_ROMS];# define DEBUG_ON () debug_on=1# define WRITE_BYTE (value,fb,reg) do { if (debug_on) \ printk(KERN_DEBUG "%30s: WRITE_BYTE(0x%06x) = 0x%02x (old=0x%02x)\n", \ - __FUNCTION__, reg, value, READ_BYTE(fb,reg)); \ + __func__, reg, value, READ_BYTE(fb,reg)); \ gsc_writeb((value),(fb)->info.fix.mmio_start + (reg)); } while (0)# define WRITE_WORD (value,fb,reg) do { if (debug_on) \ printk(KERN_DEBUG "%30s: WRITE_WORD(0x%06x) = 0x%08x (old=0x%08x)\n", \ - __FUNCTION__, reg, value, READ_WORD(fb,reg)); \ + __func__, reg, value, READ_WORD(fb,reg)); \ gsc_writel((value),(fb)->info.fix.mmio_start + (reg)); } while (0)#endif /* DEBUG_STIFB_REGS */
drivers/video/sysimgblt.c +1 -1
@@ -18,7 +18,7 @@#define DEBUG #ifdef DEBUG -#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args) +#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__func__,## args)#else #define DPRINTK(fmt, args...)#endif
drivers/video/tdfxfb.c +1 -1
@@ -70,7 +70,7 @@#include <video/tdfx.h> -#define DPRINTK(a, b...) pr_debug("fb: %s: " a, __FUNCTION__ , ## b) +#define DPRINTK(a, b...) pr_debug("fb: %s: " a, __func__ , ## b)#ifdef CONFIG_MTRR #include <asm/mtrr.h>
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 13/14 rtc: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/rtc/rtc-at91rm9200.c | 12 ++++++------ drivers/rtc/rtc-at91sam9.c | 2 +- drivers/rtc/rtc-ds1302.c | 2 +- drivers/rtc/rtc-ds1672.c | 14 +++++++------- drivers/rtc/rtc-max6900.c | 6 +++--- drivers/rtc/rtc-max6902.c | 4 ++-- drivers/rtc/rtc-pcf8563.c | 16 ++++++++-------- drivers/rtc/rtc-rs5c313.c | 4 ++-- drivers/rtc/rtc-rs5c372.c | 10 +++++----- drivers/rtc/rtc-s3c.c | 6 +++--- drivers/rtc/rtc-sh.c | 2 +- drivers/rtc/rtc-v3020.c | 4 ++-- drivers/rtc/rtc-x1205.c | 42 +++++++++++++++++++++--------------------- 13 files changed, 62 insertions(+), 62 deletions(-)
drivers/rtc/rtc-at91rm9200.c +6 -6
@@ -83,7 +83,7 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm) tm->tm_yday =rtc_year_days (tm->tm_mday, tm->tm_mon, tm->tm_year); tm->tm_year = tm->tm_year -1900 ; -pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __FUNCTION__, +pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __func__,1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -97,7 +97,7 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm) {unsigned long cr; -pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __FUNCTION__, +pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __func__,1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -142,7 +142,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) alrm->enabled = (at91_sys_read (AT91_RTC_IMR ) &AT91_RTC_ALARM ) ?1 :0 ; -pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __FUNCTION__, +pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __func__,1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -178,7 +178,7 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)if (alrm->enabled)at91_sys_write (AT91_RTC_IER ,AT91_RTC_ALARM ); -pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __FUNCTION__, +pr_debug ("%s(): %4d-%02d-%02d %02d:%02d:%02d\n" , __func__, at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
@@ -193,7 +193,7 @@ static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, {int ret =0 ; -pr_debug ("%s(): cmd=%08x, arg=%08lx.\n" , __FUNCTION__, cmd, arg); +pr_debug ("%s(): cmd=%08x, arg=%08lx.\n" , __func__, cmd, arg);switch (cmd) {case RTC_AIE_OFF :/* alarm off */
@@ -265,7 +265,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)rtc_update_irq (rtc,1 , events); -pr_debug ("%s(): num=%ld, events=0x%02lx\n" , __FUNCTION__, +pr_debug ("%s(): num=%ld, events=0x%02lx\n" , __func__, events >>8 , events &0x000000FF );return IRQ_HANDLED ;
drivers/rtc/rtc-at91sam9.c +1 -1
@@ -288,7 +288,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc)rtc_update_irq (rtc->rtcdev,1 , events); -pr_debug ("%s: num=%ld, events=0x%02lx\n" , __FUNCTION__, +pr_debug ("%s: num=%ld, events=0x%02lx\n" , __func__, events >>8 , events &0x000000FF );return IRQ_HANDLED ;
drivers/rtc/rtc-ds1302.c +1 -1
@@ -122,7 +122,7 @@ static int ds1302_rtc_read_time(struct device *dev, struct rtc_time *tm)dev_dbg (dev,"%s: tm is secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon +1 , tm->tm_year, tm->tm_wday);
drivers/rtc/rtc-ds1672.c +7 -7
@@ -50,13 +50,13 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)/* read date registers */ if ((i2c_transfer (client->adapter, &msgs[0 ],2 )) !=2 ) { -dev_err (&client->dev,"%s: read error\n" , __FUNCTION__); +dev_err (&client->dev,"%s: read error\n" , __func__);return -EIO ; }dev_dbg (&client->dev,"%s: raw read data - counters=%02x,%02x,%02x,%02x\n" , - __FUNCTION__, buf[0 ], buf[1 ], buf[2 ], buf[3 ]); + __func__, buf[0 ], buf[1 ], buf[2 ], buf[3 ]); time = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ];
@@ -64,7 +64,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)dev_dbg (&client->dev,"%s: tm is secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);return 0 ;
@@ -84,7 +84,7 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs) xfer =i2c_master_send (client, buf,6 );if (xfer !=6 ) { -dev_err (&client->dev,"%s: send: %d\n" , __FUNCTION__, xfer); +dev_err (&client->dev,"%s: send: %d\n" , __func__, xfer);return -EIO ; }
@@ -98,7 +98,7 @@ static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm)dev_dbg (&client->dev,"%s: secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -133,7 +133,7 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)/* read control register */ if ((i2c_transfer (client->adapter, &msgs[0 ],2 )) !=2 ) { -dev_err (&client->dev,"%s: read error\n" , __FUNCTION__); +dev_err (&client->dev,"%s: read error\n" , __func__);return -EIO ; }
@@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)struct i2c_client *client;struct rtc_device *rtc; -dev_dbg (&adapter->dev,"%s\n" , __FUNCTION__); +dev_dbg (&adapter->dev,"%s\n" , __func__);if (!i2c_check_functionality (adapter,I2C_FUNC_I2C )) { err = -ENODEV ;
drivers/rtc/rtc-max6900.c +3 -3
@@ -98,7 +98,7 @@ static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf) rc =i2c_transfer (client->adapter, msgs,ARRAY_SIZE (msgs));if (rc !=ARRAY_SIZE (msgs)) {dev_err (&client->dev,"%s: register read failed\n" , - __FUNCTION__); + __func__);return -EIO ; }return 0 ;
@@ -150,7 +150,7 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf) write_failed:dev_err (&client->dev,"%s: register write failed\n" , - __FUNCTION__); + __func__);return -EIO ; }
@@ -214,7 +214,7 @@ static int max6900_i2c_clear_write_protect(struct i2c_client *client) rc =i2c_smbus_write_byte_data (client,MAX6900_REG_CONTROL_WRITE ,0 );if (rc <0 ) {dev_err (&client->dev,"%s: control register write failed\n" , - __FUNCTION__); + __func__);return -EIO ; }return 0 ;
drivers/rtc/rtc-max6902.c +2 -2
@@ -140,7 +140,7 @@ static int max6902_get_datetime(struct device *dev, struct rtc_time *dt) dt->tm_year -=1900 ;#ifdef MAX6902_DEBUG -printk ("\n%s : Read RTC values\n" ,__FUNCTION__); +printk ("\n%s : Read RTC values\n" ,__func__);printk ("tm_hour: %i\n" ,dt->tm_hour);printk ("tm_min : %i\n" ,dt->tm_min);printk ("tm_sec : %i\n" ,dt->tm_sec);
@@ -158,7 +158,7 @@ static int max6902_set_datetime(struct device *dev, struct rtc_time *dt) dt->tm_year = dt->tm_year+1900 ;#ifdef MAX6902_DEBUG -printk ("\n%s : Setting RTC values\n" ,__FUNCTION__); +printk ("\n%s : Setting RTC values\n" ,__func__);printk ("tm_sec : %i\n" ,dt->tm_sec);printk ("tm_min : %i\n" ,dt->tm_min);printk ("tm_hour: %i\n" ,dt->tm_hour);
drivers/rtc/rtc-pcf8563.c +8 -8
@@ -91,7 +91,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)/* read registers */ if ((i2c_transfer (client->adapter, msgs,2 )) !=2 ) { -dev_err (&client->dev,"%s: read error\n" , __FUNCTION__); +dev_err (&client->dev,"%s: read error\n" , __func__);return -EIO ; }
@@ -102,7 +102,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)dev_dbg (&client->dev,"%s: raw data is st1=%02x, st2=%02x, sec=%02x, min=%02x, hr=%02x, " "mday=%02x, wday=%02x, mon=%02x, year=%02x\n" , - __FUNCTION__, + __func__, buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ], buf[7 ], buf[8 ]);
@@ -123,7 +123,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)dev_dbg (&client->dev,"%s: tm is secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -144,7 +144,7 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)dev_dbg (&client->dev,"%s: secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -174,7 +174,7 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)if (err !=sizeof (data)) {dev_err (&client->dev,"%s: err=%d addr=%02x, data=%02x\n" , - __FUNCTION__, err, data[0 ], data[1 ]); + __func__, err, data[0 ], data[1 ]);return -EIO ; } };
@@ -219,7 +219,7 @@ static int pcf8563_validate_client(struct i2c_client *client)if (xfer !=ARRAY_SIZE (msgs)) {dev_err (&client->dev,"%s: could not read register 0x%02X\n" , - __FUNCTION__, pattern[i].reg); + __func__, pattern[i].reg);return -EIO ; }
@@ -231,7 +231,7 @@ static int pcf8563_validate_client(struct i2c_client *client)dev_dbg (&client->dev,"%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, " "max=%d, value=%d, raw=0x%02X\n" , - __FUNCTION__, i, pattern[i].reg, pattern[i].mask, + __func__, i, pattern[i].reg, pattern[i].mask, pattern[i].min, pattern[i].max, value, buf);
@@ -279,7 +279,7 @@ static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)int err =0 ; -dev_dbg (&adapter->dev,"%s\n" , __FUNCTION__); +dev_dbg (&adapter->dev,"%s\n" , __func__);if (!i2c_check_functionality (adapter,I2C_FUNC_I2C )) { err = -ENODEV ;
drivers/rtc/rtc-rs5c313.c +2 -2
@@ -228,7 +228,7 @@ static int rs5c313_rtc_read_time(struct device *dev, struct rtc_time *tm)ndelay (700 );/* CE:L */ if (cnt++ >100 ) { -dev_err (dev,"%s: timeout error\n" , __FUNCTION__); +dev_err (dev,"%s: timeout error\n" , __func__);return -EIO ; } }
@@ -289,7 +289,7 @@ static int rs5c313_rtc_set_time(struct device *dev, struct rtc_time *tm)ndelay (700 );/* CE:L */ if (cnt++ >100 ) { -dev_err (dev,"%s: timeout error\n" , __FUNCTION__); +dev_err (dev,"%s: timeout error\n" , __func__);return -EIO ; } }
drivers/rtc/rtc-rs5c372.c +5 -5
@@ -166,7 +166,7 @@ static int rs5c372_get_datetime(struct i2c_client *client, struct rtc_time *tm)dev_dbg (&client->dev,"%s: tm is secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -181,7 +181,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)dev_dbg (&client->dev,"%s: tm is secs=%d, mins=%d, hours=%d " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -195,7 +195,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm) buf[7 ] =BIN2BCD (tm->tm_year -100 );if ((i2c_master_send (client, buf,8 )) !=8 ) { -dev_err (&client->dev,"%s: write error\n" , __FUNCTION__); +dev_err (&client->dev,"%s: write error\n" , __func__);return -EIO ; }
@@ -220,7 +220,7 @@ static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim) *osc = (tmp &RS5C372_TRIM_XSL ) ?32000 :32768 ;if (trim) { -dev_dbg (&client->dev,"%s: raw trim=%x\n" , __FUNCTION__, tmp); +dev_dbg (&client->dev,"%s: raw trim=%x\n" , __func__, tmp); tmp &=RS5C372_TRIM_MASK ;if (tmp &0x3e ) {int t = tmp &0x3f ;
@@ -500,7 +500,7 @@ static int rs5c372_probe(struct i2c_client *client)struct rs5c372 *rs5c372;struct rtc_time tm; -dev_dbg (&client->dev,"%s\n" , __FUNCTION__); +dev_dbg (&client->dev,"%s\n" , __func__);if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C )) { err = -ENODEV ;
drivers/rtc/rtc-s3c.c +3 -3
@@ -68,7 +68,7 @@ static void s3c_rtc_setaie(int to) {unsigned int tmp; -pr_debug ("%s: aie=%d\n" , __FUNCTION__, to); +pr_debug ("%s: aie=%d\n" , __func__, to); tmp =readb (s3c_rtc_base +S3C2410_RTCALM ) & ~S3C2410_RTCALM_ALMEN ;
@@ -82,7 +82,7 @@ static void s3c_rtc_setpie(int to) {unsigned int tmp; -pr_debug ("%s: pie=%d\n" , __FUNCTION__, to); +pr_debug ("%s: pie=%d\n" , __func__, to);spin_lock_irq (&s3c_rtc_pie_lock); tmp =readb (s3c_rtc_base +S3C2410_TICNT ) & ~S3C2410_TICNT_ENABLE ;
@@ -457,7 +457,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)struct resource *res;int ret; -pr_debug ("%s: probe=%p\n" , __FUNCTION__, pdev); +pr_debug ("%s: probe=%p\n" , __func__, pdev);/* find the IRQs */
drivers/rtc/rtc-sh.c +1 -1
@@ -349,7 +349,7 @@ static int sh_rtc_read_time(struct device *dev, struct rtc_time *tm)dev_dbg (dev,"%s: tm is secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n" , - __FUNCTION__, + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon +1 , tm->tm_year, tm->tm_wday);
drivers/rtc/rtc-v3020.c +2 -2
@@ -107,7 +107,7 @@ static int v3020_read_time(struct device *dev, struct rtc_time *dt) dt->tm_year =BCD2BIN (tmp)+100 ;#ifdef DEBUG -printk ("\n%s : Read RTC values\n" ,__FUNCTION__); +printk ("\n%s : Read RTC values\n" ,__func__);printk ("tm_hour: %i\n" ,dt->tm_hour);printk ("tm_min : %i\n" ,dt->tm_min);printk ("tm_sec : %i\n" ,dt->tm_sec);
@@ -126,7 +126,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)struct v3020 *chip =dev_get_drvdata (dev);#ifdef DEBUG -printk ("\n%s : Setting RTC values\n" ,__FUNCTION__); +printk ("\n%s : Setting RTC values\n" ,__func__);printk ("tm_sec : %i\n" ,dt->tm_sec);printk ("tm_min : %i\n" ,dt->tm_min);printk ("tm_hour: %i\n" ,dt->tm_hour);
drivers/rtc/rtc-x1205.c +21 -21
157 lines not on this page · raw message
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 14/14 fusion: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/message/fusion/mptbase.c | 18 ++++++------ drivers/message/fusion/mptctl.c | 4 +- drivers/message/fusion/mptfc.c | 8 +++--- drivers/message/fusion/mptlan.c | 26 +++++++++--------- drivers/message/fusion/mptsas.c | 54 ++++++++++++++++++------------------ drivers/message/fusion/mptscsih.c | 4 +- 6 files changed, 57 insertions(+), 57 deletions(-)
drivers/message/fusion/mptbase.c +9 -9
@@ -307,7 +307,7 @@ mpt_turbo_reply(MPT_ADAPTER *ioc, u32 pa)if (!cb_idx || cb_idx >=MPT_MAX_PROTOCOL_DRIVERS || MptCallbacks[cb_idx] ==NULL ) {printk (MYIOC_s_WARN_FMT"%s: Invalid cb_idx (%d)!\n" , - __FUNCTION__, ioc->name, cb_idx); + __func__, ioc->name, cb_idx); goto out; }
@@ -371,7 +371,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa)if (!cb_idx || cb_idx >=MPT_MAX_PROTOCOL_DRIVERS || MptCallbacks[cb_idx] ==NULL ) {printk (MYIOC_s_WARN_FMT"%s: Invalid cb_idx (%d)!\n" , - __FUNCTION__, ioc->name, cb_idx); + __func__, ioc->name, cb_idx); freeme =0 ; goto out; }
@@ -2299,7 +2299,7 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)if (ioc->cached_fw !=NULL ) {ddlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"%s: Pushing FW onto " -"adapter\n" , __FUNCTION__, ioc->name)); +"adapter\n" , __func__, ioc->name));if ((ret =mpt_downloadboot (ioc, (MpiFwHeader_t *) ioc->cached_fw,CAN_SLEEP )) <0 ) { printk(MYIOC_s_WARN_FMT
@@ -3558,7 +3558,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)if (ioc->pcidev->device ==MPI_MANUFACTPAGE_DEVID_SAS1078 ) {drsprintk (ioc,printk (MYIOC_s_WARN_FMT"%s: Doorbell=%p; 1078 reset " -"address=%p\n" , ioc->name, __FUNCTION__, +"address=%p\n" , ioc->name, __func__, &ioc->chip->Doorbell, &ioc->chip->Reset_1078));CHIPREG_WRITE32 (&ioc->chip->Reset_1078,0x07 );if (sleepFlag ==CAN_SLEEP )
@@ -4607,12 +4607,12 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)break ; } -printk ("%s: persist_opcode=%x\n" ,__FUNCTION__, persist_opcode); +printk ("%s: persist_opcode=%x\n" ,__func__, persist_opcode);/* Get a MF for this command. */ if ((mf =mpt_get_msg_frame (mpt_base_index, ioc)) ==NULL ) { -printk ("%s: no msg frames!\n" ,__FUNCTION__); +printk ("%s: no msg frames!\n" ,__func__);return -1 ; }
@@ -4636,13 +4636,13 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode) (SasIoUnitControlReply_t *)ioc->persist_reply_frame;if (le16_to_cpu (sasIoUnitCntrReply->IOCStatus) !=MPI_IOCSTATUS_SUCCESS ) {printk ("%s: IOCStatus=0x%X IOCLogInfo=0x%X\n" , - __FUNCTION__, + __func__, sasIoUnitCntrReply->IOCStatus, sasIoUnitCntrReply->IOCLogInfo);return -1 ; } -printk ("%s: success\n" ,__FUNCTION__); +printk ("%s: success\n" ,__func__);return 0 ; }
@@ -5649,7 +5649,7 @@ SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t *evnp)if ((pAck = (EventAck_t *)mpt_get_msg_frame (mpt_base_index, ioc)) ==NULL ) {dfailprintk (ioc,printk (MYIOC_s_WARN_FMT"%s, no msg frames!!\n" , - ioc->name,__FUNCTION__)); + ioc->name,__func__));return -1 ; }
drivers/message/fusion/mptctl.c +2 -2
@@ -505,7 +505,7 @@ mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) event =le32_to_cpu (pEvReply->Event) &0xFF ;dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"%s() called\n" , - ioc->name, __FUNCTION__)); + ioc->name, __func__));if (async_queue ==NULL )return 1 ;
@@ -2478,7 +2478,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)*/ if ((mf =mpt_get_msg_frame (mptctl_id, ioc)) ==NULL ) {dfailprintk (ioc,printk (MYIOC_s_WARN_FMT"%s, no msg frames!!\n" , - ioc->name,__FUNCTION__)); + ioc->name,__func__)); goto out; }
drivers/message/fusion/mptfc.c +4 -4
@@ -231,28 +231,28 @@ static int mptfc_abort(struct scsi_cmnd *SCpnt) {return -mptfc_block_error_handler (SCpnt, mptscsih_abort, __FUNCTION__); +mptfc_block_error_handler (SCpnt, mptscsih_abort, __func__); }static int mptfc_dev_reset (struct scsi_cmnd *SCpnt) {return -mptfc_block_error_handler (SCpnt, mptscsih_dev_reset, __FUNCTION__); +mptfc_block_error_handler (SCpnt, mptscsih_dev_reset, __func__); }static int mptfc_bus_reset (struct scsi_cmnd *SCpnt) {return -mptfc_block_error_handler (SCpnt, mptscsih_bus_reset, __FUNCTION__); +mptfc_block_error_handler (SCpnt, mptscsih_bus_reset, __func__); }static int mptfc_host_reset (struct scsi_cmnd *SCpnt) {return -mptfc_block_error_handler (SCpnt, mptscsih_host_reset, __FUNCTION__); +mptfc_block_error_handler (SCpnt, mptscsih_host_reset, __func__); } static void
drivers/message/fusion/mptlan.c +13 -13
@@ -610,7 +610,7 @@ mpt_lan_send_turbo(struct net_device *dev, u32 tmsg) dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",IOC_AND_NETDEV_NAMES_s_s (dev), - __FUNCTION__, sent)); + __func__, sent)); priv->SendCtl[ctx].skb =NULL ; pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
@@ -676,7 +676,7 @@ mpt_lan_send_reply(struct net_device *dev, LANSendReply_t *pSendRep) dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",IOC_AND_NETDEV_NAMES_s_s (dev), - __FUNCTION__, sent)); + __func__, sent)); priv->SendCtl[ctx].skb =NULL ; pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
@@ -715,7 +715,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)u16 cur_naa =0x1000 ; dioprintk((KERN_INFO MYNAM ": %s called, skb_addr = %p\n", - __FUNCTION__, skb)); + __func__, skb));spin_lock_irqsave (&priv->txfidx_lock, flags);if (priv->mpt_txfidx_tail <0 ) {
@@ -723,7 +723,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&priv->txfidx_lock, flags);printk (KERN_ERR "%s: no tx context available: %u\n" , - __FUNCTION__, priv->mpt_txfidx_tail); + __func__, priv->mpt_txfidx_tail);return 1 ; }
@@ -733,7 +733,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&priv->txfidx_lock, flags);printk (KERN_ERR "%s: Unable to alloc request frame\n" , - __FUNCTION__); + __func__);return 1 ; }
@@ -1208,7 +1208,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv) dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, Start_buckets = %u, buckets_out = %u\n",IOC_AND_NETDEV_NAMES_s_s (dev), - __FUNCTION__, buckets, curr)); + __func__, buckets, curr)); max = (mpt_dev->req_sz -MPT_LAN_RECEIVE_POST_REQUEST_SIZE ) / (MPT_LAN_TRANSACTION32_SIZE +sizeof (SGESimple64_t));
@@ -1217,9 +1217,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv) mf =mpt_get_msg_frame (LanCtx, mpt_dev);if (mf ==NULL ) {printk (KERN_ERR "%s: Unable to alloc request frame\n" , - __FUNCTION__); + __func__);dioprintk ((KERN_ERR "%s: %u buckets remaining\n" , - __FUNCTION__, buckets)); + __func__, buckets)); goto out; } pRecvReq = (LANReceivePostRequest_t *) mf;
@@ -1244,7 +1244,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)spin_lock_irqsave (&priv->rxfidx_lock, flags);if (priv->mpt_rxfidx_tail <0 ) {printk (KERN_ERR "%s: Can't alloc context\n" , - __FUNCTION__); + __func__);spin_unlock_irqrestore (&priv->rxfidx_lock, flags);break ;
@@ -1267,7 +1267,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)if (skb ==NULL ) { printk (KERN_WARNING MYNAM "/%s: Can't alloc skb\n", - __FUNCTION__); + __func__); priv->mpt_rxfidx[++priv->mpt_rxfidx_tail] = ctx;spin_unlock_irqrestore (&priv->rxfidx_lock, flags);break ;
@@ -1305,7 +1305,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)if (pSimple ==NULL ) { /**/ printk (KERN_WARNING MYNAM "/%s: No buckets posted\n", -/**/ __FUNCTION__); +/**/ __func__);mpt_free_msg_frame (mpt_dev, mf); goto out; }
@@ -1329,9 +1329,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv) out: dioprintk((KERN_INFO MYNAM "/%s: End_buckets = %u, priv->buckets_out = %u\n", - __FUNCTION__, buckets, atomic_read(&priv->buckets_out))); + __func__, buckets, atomic_read(&priv->buckets_out))); dioprintk((KERN_INFO MYNAM "/%s: Posted %u buckets and received %u back\n", - __FUNCTION__, priv->total_posted, priv->total_received)); + __func__, priv->total_posted, priv->total_received));clear_bit (0 , &priv->post_buckets_active); }
drivers/message/fusion/mptsas.c +27 -27
215 lines not on this page · raw message
drivers/message/fusion/mptscsih.c +2 -2
@@ -461,7 +461,7 @@ mptscsih_issue_sep_command(MPT_ADAPTER *ioc, VirtTarget *vtarget,if ((mf =mpt_get_msg_frame (ioc->InternalCtx, ioc)) ==NULL ) {dfailprintk (ioc,printk (MYIOC_s_WARN_FMT"%s: no msg frames!!\n" , - ioc->name,__FUNCTION__)); + ioc->name,__func__));return ; }
@@ -2178,7 +2178,7 @@ mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *m (ioc->debug_level & MPT_DEBUG_TM )) printk("%s: ha=%d [%d:%d:0] task_type=0x%02X " "iocstatus=0x%04X\n\tloginfo=0x%08X response_code=0x%02X " - "term_cmnds=%d\n", __FUNCTION__, ioc->id, pScsiTmReply->Bus, + "term_cmnds=%d\n", __func__, ioc->id, pScsiTmReply->Bus, pScsiTmReply->TargetID, pScsiTmReq->TaskType, le16_to_cpu(pScsiTmReply->IOCStatus), le32_to_cpu(pScsiTmReply->IOCLogInfo),pScsiTmReply->ResponseCode,
Signature · 1 line
1.5.4.3.500.g83a2c