Re: [PATCH 4/4] radeonfb: use PCI device Id in hex for name string

From: Benjamin Herrenschmidt
Date: Thu Sep 06 2007 - 08:06:59 EST


On Tue, 2007-09-04 at 13:00 +0200, aherrman@xxxxxxxx wrote:
> .. instead of potentially using nonprintable characters.
>
> I guess the former (odd) concatenation was used to construct name strings
> that match the "*_ATI_RADEON_??" macros in include/linux/pci_ids.h
>
> The PCI Id in hex is much more convenient to use. E.g. it can easily be
> verified against "lspci -nn" output.
>
> Signed-off-by: Andreas Herrmann <aherrman@xxxxxxxx>

Well... ATI used to have printable characters and those were commonly
used to identify the cards. I'm not sure we want to unilateraly switch
to hex here...

Ben.

> ---
> drivers/video/aty/radeon_base.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
> index 71b0c17..e6229b4 100644
> --- a/drivers/video/aty/radeon_base.c
> +++ b/drivers/video/aty/radeon_base.c
> @@ -2184,9 +2184,8 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
> rinfo->lvds_timer.function = radeon_lvds_timer_func;
> rinfo->lvds_timer.data = (unsigned long)rinfo;
>
> - strcpy(rinfo->name, "ATI Radeon XX ");
> - rinfo->name[11] = ent->device >> 8;
> - rinfo->name[12] = ent->device & 0xFF;
> + snprintf(rinfo->name, sizeof(rinfo->name),
> + "ATI Radeon %x", ent->device & 0xffff);
> rinfo->family = ent->driver_data & CHIP_FAMILY_MASK;
> rinfo->chipset = pdev->device;
> rinfo->has_CRTC2 = (ent->driver_data & CHIP_HAS_CRTC2) != 0;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/