Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata/sata_fsl: Remove unused variable in sata_fsl_probe pata_sil680: Fix build on arch/ppc
This commit is contained in:
commit
c5b9004baa
|
@ -270,7 +270,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
|
|||
tmpbyte & 1, tmpbyte & 0x30);
|
||||
|
||||
*try_mmio = 0;
|
||||
#ifdef CONFIG_PPC
|
||||
#ifdef CONFIG_PPC_MERGE
|
||||
if (machine_is(cell))
|
||||
*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
|
||||
#endif
|
||||
|
|
|
@ -1256,7 +1256,6 @@ static int sata_fsl_probe(struct of_device *ofdev,
|
|||
void __iomem *ssr_base = NULL;
|
||||
void __iomem *csr_base = NULL;
|
||||
struct sata_fsl_host_priv *host_priv = NULL;
|
||||
struct resource *r;
|
||||
int irq;
|
||||
struct ata_host *host;
|
||||
|
||||
|
@ -1266,8 +1265,6 @@ static int sata_fsl_probe(struct of_device *ofdev,
|
|||
dev_printk(KERN_INFO, &ofdev->dev,
|
||||
"Sata FSL Platform/CSB Driver init\n");
|
||||
|
||||
r = kmalloc(sizeof(struct resource), GFP_KERNEL);
|
||||
|
||||
hcr_base = of_iomap(ofdev->node, 0);
|
||||
if (!hcr_base)
|
||||
goto error_exit_with_cleanup;
|
||||
|
|
Loading…
Reference in a new issue