Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2d5a710 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

media/bt8xx: Remove old powerpc cruft 



The powerpc arch code enables PCI_COMMAND_MEMORY (and has done so for
more than 10 years at least !) on pci_enable_device() and the hackery
on the MMIO accessor is useless as well, our writel does everything
this driver should need.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent f5718726

drivers/media/pci/bt8xx/bt878.c

+0 −12
Original line number Diff line number Diff line
@@ -416,9 +416,6 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) 
	int result = 0;

	unsigned char lat;

	struct bt878 *bt;

#if defined(__powerpc__)

	unsigned int cmd;

#endif

	unsigned int cardid;



	printk(KERN_INFO "bt878: Bt878 AUDIO function found (%d).\n",
@@ -461,15 +458,6 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) 
	printk("irq: %d, latency: %d, memory: 0x%lx\n",

	       bt->irq, lat, bt->bt878_adr);





#if defined(__powerpc__)

	/* on OpenFirmware machines (PowerMac at least), PCI memory cycle */

	/* response on cards with no firmware is not enabled by OF */

	pci_read_config_dword(dev, PCI_COMMAND, &cmd);

	cmd = (cmd | PCI_COMMAND_MEMORY);

	pci_write_config_dword(dev, PCI_COMMAND, cmd);

#endif



#ifdef __sparc__

	bt->bt878_mem = (unsigned char *) bt->bt878_adr;

#else

drivers/media/pci/bt8xx/bt878.h

+0 −11
Original line number Diff line number Diff line
@@ -142,18 +142,7 @@ void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin, 
		u32 irq_err_ignore);

void bt878_stop(struct bt878 *bt);



#if defined(__powerpc__)	/* big-endian */

static inline void io_st_le32(volatile unsigned __iomem *addr, unsigned val)

{

	st_le32(addr, val);

	eieio();

}



#define bmtwrite(dat,adr)  io_st_le32((adr),(dat))

#define bmtread(adr)       ld_le32((adr))

#else

#define bmtwrite(dat,adr)  writel((dat), (adr))

#define bmtread(adr)       readl(adr)

#endif



#endif