On Mon, Oct 29, 2007 at 05:43:15PM -0500, Emil Medve wrote:
> Removed duplicates defined elsewhere
>
> Signed-off-by: Emil Medve <[email protected]>
> ---
>
> Reseding the patch to a larger audience
>
> The macros are defined in the relative order KERN_* are defined in kernel.h
>
> linux-2.6> scripts/checkpatch.pl 0001-Make-the-dev_-family-of-macros-in-device.h-comple.patch
> Your patch has no obvious style problems and is ready for submission.
>
> drivers/i2c/chips/isp1301_omap.c | 6 ------
> drivers/isdn/gigaset/gigaset.h | 6 ------
> include/linux/device.h | 26 ++++++++++++++++----------
> 3 files changed, 16 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
> index fe04e46..35b9909 100644
> --- a/drivers/i2c/chips/isp1301_omap.c
> +++ b/drivers/i2c/chips/isp1301_omap.c
> @@ -259,12 +259,6 @@ static inline const char *state_name(struct isp1301 *isp)
> return state_string(isp->otg.state);
> }
>
> -#ifdef VERBOSE
> -#define dev_vdbg dev_dbg
> -#else
> -#define dev_vdbg(dev, fmt, arg...) do{}while(0)
> -#endif
> -
> /*-------------------------------------------------------------------------*/
>
> /* NOTE: some of this ISP1301 setup is specific to H2 boards;
> diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
> index a0317ab..02bdaf2 100644
> --- a/drivers/isdn/gigaset/gigaset.h
> +++ b/drivers/isdn/gigaset/gigaset.h
> @@ -106,12 +106,6 @@ enum debuglevel {
> activated */
> };
>
> -/* missing from linux/device.h ... */
> -#ifndef dev_notice
> -#define dev_notice(dev, format, arg...) \
> - dev_printk(KERN_NOTICE , dev , format , ## arg)
> -#endif
> -
> /* Kernel message macros for situations where dev_printk and friends cannot be
> * used for lack of reliable access to a device structure.
> * linux/usb.h already contains these but in an obsolete form which clutters
> diff --git a/include/linux/device.h b/include/linux/device.h
> index 2e15822..e4f8a1c 100644
> --- a/include/linux/device.h
> +++ b/include/linux/device.h
> @@ -557,9 +557,24 @@ extern const char *dev_driver_string(struct device *dev);
> #define dev_printk(level, dev, format, arg...) \
> printk(level "%s %s: " format , dev_driver_string(dev) , (dev)->bus_id , ## arg)
>
> +#define dev_emerg(dev, format, arg...) \
> + dev_printk(KERN_EMERG, dev, format, ## arg)
> +#define dev_alert(dev, format, arg...) \
> + dev_printk(KERN_ALERT, dev, format, ## arg)
> +#define dev_crit(dev, format, arg...) \
> + dev_printk(KERN_CRIT, dev, format, ## arg)
> +#define dev_err(dev, format, arg...) \
> + dev_printk(KERN_ERR, dev, format, ## arg)
> +#define dev_warn(dev, format, arg...) \
> + dev_printk(KERN_WARNING, dev, format, ## arg)
> +#define dev_notice(dev, format, arg...) \
> + dev_printk(KERN_NOTICE, dev, format, ## arg)
> +#define dev_info(dev, format, arg...) \
> + dev_printk(KERN_INFO, dev, format, ## arg)
> +
> #ifdef DEBUG
> #define dev_dbg(dev, format, arg...) \
> - dev_printk(KERN_DEBUG , dev , format , ## arg)
> + dev_printk(KERN_DEBUG, dev, format, ## arg)
Those extra spaces are there for a good reason, older versions of gcc
are broken without it. So please, put them all back...
thanks,
greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
