Commit 3ca356b6 authored by Yijing Wang's avatar Yijing Wang Committed by Tomi Valkeinen
Browse files

video: Replace local macro with PCI standard macro 



Replace local macro TGA_BUS_PCI with PCI standard
marco dev_is_pci().

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent f5d2b7c2

drivers/video/tgafb.c

+5 −11
Original line number Original line Diff line number Diff line
@@ -32,12 +32,6 @@ 




#include <video/tgafb.h>

#include <video/tgafb.h>





#ifdef CONFIG_PCI

#define TGA_BUS_PCI(dev) (dev->bus == &pci_bus_type)

#else

#define TGA_BUS_PCI(dev) 0

#endif



#ifdef CONFIG_TC

#ifdef CONFIG_TC

#define TGA_BUS_TC(dev) (dev->bus == &tc_bus_type)

#define TGA_BUS_TC(dev) (dev->bus == &tc_bus_type)

#else

#else
@@ -236,7 +230,7 @@ tgafb_set_par(struct fb_info *info) 
	};

	};





	struct tga_par *par = (struct tga_par *) info->par;

	struct tga_par *par = (struct tga_par *) info->par;

	int tga_bus_pci = TGA_BUS_PCI(par->dev);

	int tga_bus_pci = dev_is_pci(par->dev);

	int tga_bus_tc = TGA_BUS_TC(par->dev);

	int tga_bus_tc = TGA_BUS_TC(par->dev);

	u32 htimings, vtimings, pll_freq;

	u32 htimings, vtimings, pll_freq;

	u8 tga_type;

	u8 tga_type;
@@ -519,7 +513,7 @@ tgafb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, 
		unsigned transp, struct fb_info *info)

		unsigned transp, struct fb_info *info)

{

{

	struct tga_par *par = (struct tga_par *) info->par;

	struct tga_par *par = (struct tga_par *) info->par;

	int tga_bus_pci = TGA_BUS_PCI(par->dev);

	int tga_bus_pci = dev_is_pci(par->dev);

	int tga_bus_tc = TGA_BUS_TC(par->dev);

	int tga_bus_tc = TGA_BUS_TC(par->dev);





	if (regno > 255)

	if (regno > 255)
@@ -1472,7 +1466,7 @@ static void 
tgafb_init_fix(struct fb_info *info)

tgafb_init_fix(struct fb_info *info)

{

{

	struct tga_par *par = (struct tga_par *)info->par;

	struct tga_par *par = (struct tga_par *)info->par;

	int tga_bus_pci = TGA_BUS_PCI(par->dev);

	int tga_bus_pci = dev_is_pci(par->dev);

	int tga_bus_tc = TGA_BUS_TC(par->dev);

	int tga_bus_tc = TGA_BUS_TC(par->dev);

	u8 tga_type = par->tga_type;

	u8 tga_type = par->tga_type;

	const char *tga_type_name = NULL;

	const char *tga_type_name = NULL;
@@ -1560,7 +1554,7 @@ static int tgafb_register(struct device *dev) 
	const struct fb_videomode *modedb_tga = NULL;

	const struct fb_videomode *modedb_tga = NULL;

	resource_size_t bar0_start = 0, bar0_len = 0;

	resource_size_t bar0_start = 0, bar0_len = 0;

	const char *mode_option_tga = NULL;

	const char *mode_option_tga = NULL;

	int tga_bus_pci = TGA_BUS_PCI(dev);

	int tga_bus_pci = dev_is_pci(dev);

	int tga_bus_tc = TGA_BUS_TC(dev);

	int tga_bus_tc = TGA_BUS_TC(dev);

	unsigned int modedbsize_tga = 0;

	unsigned int modedbsize_tga = 0;

	void __iomem *mem_base;

	void __iomem *mem_base;
@@ -1690,7 +1684,7 @@ static int tgafb_register(struct device *dev) 
static void tgafb_unregister(struct device *dev)

static void tgafb_unregister(struct device *dev)

{

{

	resource_size_t bar0_start = 0, bar0_len = 0;

	resource_size_t bar0_start = 0, bar0_len = 0;

	int tga_bus_pci = TGA_BUS_PCI(dev);

	int tga_bus_pci = dev_is_pci(dev);

	int tga_bus_tc = TGA_BUS_TC(dev);

	int tga_bus_tc = TGA_BUS_TC(dev);

	struct fb_info *info = NULL;

	struct fb_info *info = NULL;

	struct tga_par *par;

	struct tga_par *par;