libata: pata_pdc2027x minor fix
PATCH 1/1 libata: pata_pdc2027x minor fix
Jeff,
Minor fix for pata_pdc2027x to compile with recent changes, etc.
Changes:
- eliminate use of drivers/scsi/scsi.h compatibility header
- use dev_printk() where appropriate
- add MODULE_VERSION(DRV_VERSION);
Patch against the libata-dev pata-drivers branch
(4879116e78e14200b1fda18ebb948a415bf2b124).
For your review, thanks.
Albert
Signed-off-by Albert Lee <[email protected]>
=======
drivers/scsi/pata_pdc2027x.c +8 -5
@@ -28,13 +28,15 @@#include <linux/init.h> #include <linux/blkdev.h> #include <linux/delay.h> -#include "scsi.h" +#include <linux/device.h> +#include <scsi/scsi.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_cmnd.h> #include <linux/libata.h> #include <asm/io.h> #define DRV_NAME "pata_pdc2027x" -#define DRV_VERSION "0.72" +#define DRV_VERSION "0.73"#undef PDC_DEBUG#ifdef PDC_DEBUG
@@ -125,7 +127,7 @@ static struct pci_driver pdc2027x_pci_dr .remove = __devexit_p(pdc2027x_remove_one), }; -static Scsi_Host_Template pdc2027x_sht = { +static struct scsi_host_template pdc2027x_sht = { .module =THIS_MODULE , .name =DRV_NAME , .ioctl = ata_scsi_ioctl,
@@ -229,6 +231,7 @@ static struct ata_port_info pdc2027x_porMODULE_AUTHOR ("Andre Hedrick, Frank Tiernan, Albert Lee" );MODULE_DESCRIPTION ("libata driver module for Promise PDC20268 to PDC20277" );MODULE_LICENSE ("GPL" ); +MODULE_VERSION (DRV_VERSION );MODULE_DEVICE_TABLE (pci, pdc2027x_pci_tbl);/**
@@ -690,7 +693,7 @@ static int pdc_hardware_init(struct pci_if (pll_clock <0 )/* counter overflow? Try again. */ pll_clock =pdc_detect_pll_input_clock (pe); - printk(KERN_INFO DRV_NAME ": PLL input clock %ld kHz\n", pll_clock/1000); +dev_printk (KERN_INFO , &pdev->dev,"PLL input clock %ld kHz\n" , pll_clock/1000 );/* Adjust PLL control register */ pdc_adjust_pll (pe, pll_clock, board_idx);
@@ -742,7 +745,7 @@ static int __devinit pdc2027x_init_one(sint rc;if (!printed_version++) - printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); +dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); rc =pci_enable_device (pdev);if (rc)