mtd: maps: use dev_get_platdata()
Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
0278fd3fa3
commit
d20d5a5780
9 changed files with 16 additions and 16 deletions
|
@ -128,7 +128,7 @@ static const char * const part_probe_types[] = {
|
||||||
static int bfin_flash_probe(struct platform_device *pdev)
|
static int bfin_flash_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct physmap_flash_data *pdata = pdev->dev.platform_data;
|
struct physmap_flash_data *pdata = dev_get_platdata(&pdev->dev);
|
||||||
struct resource *memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
struct resource *memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
struct resource *flash_ambctl = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
struct resource *flash_ambctl = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
||||||
struct async_state *state;
|
struct async_state *state;
|
||||||
|
|
|
@ -196,7 +196,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
|
||||||
struct resource *gpios;
|
struct resource *gpios;
|
||||||
struct async_state *state;
|
struct async_state *state;
|
||||||
|
|
||||||
pdata = pdev->dev.platform_data;
|
pdata = dev_get_platdata(&pdev->dev);
|
||||||
memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
gpios = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
gpios = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL };
|
||||||
|
|
||||||
static int ixp4xx_flash_remove(struct platform_device *dev)
|
static int ixp4xx_flash_remove(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
struct flash_platform_data *plat = dev->dev.platform_data;
|
struct flash_platform_data *plat = dev_get_platdata(&dev->dev);
|
||||||
struct ixp4xx_flash_info *info = platform_get_drvdata(dev);
|
struct ixp4xx_flash_info *info = platform_get_drvdata(dev);
|
||||||
|
|
||||||
if(!info)
|
if(!info)
|
||||||
|
@ -178,7 +178,7 @@ static int ixp4xx_flash_remove(struct platform_device *dev)
|
||||||
|
|
||||||
static int ixp4xx_flash_probe(struct platform_device *dev)
|
static int ixp4xx_flash_probe(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
struct flash_platform_data *plat = dev->dev.platform_data;
|
struct flash_platform_data *plat = dev_get_platdata(&dev->dev);
|
||||||
struct ixp4xx_flash_info *info;
|
struct ixp4xx_flash_info *info;
|
||||||
struct mtd_part_parser_data ppdata = {
|
struct mtd_part_parser_data ppdata = {
|
||||||
.origin = dev->resource->start,
|
.origin = dev->resource->start,
|
||||||
|
|
|
@ -103,7 +103,7 @@ static int latch_addr_flash_remove(struct platform_device *dev)
|
||||||
if (info == NULL)
|
if (info == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
latch_addr_data = dev->dev.platform_data;
|
latch_addr_data = dev_get_platdata(&dev->dev);
|
||||||
|
|
||||||
if (info->mtd != NULL) {
|
if (info->mtd != NULL) {
|
||||||
mtd_device_unregister(info->mtd);
|
mtd_device_unregister(info->mtd);
|
||||||
|
@ -134,7 +134,7 @@ static int latch_addr_flash_probe(struct platform_device *dev)
|
||||||
int chipsel;
|
int chipsel;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
latch_addr_data = dev->dev.platform_data;
|
latch_addr_data = dev_get_platdata(&dev->dev);
|
||||||
if (latch_addr_data == NULL)
|
if (latch_addr_data == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ static int physmap_flash_remove(struct platform_device *dev)
|
||||||
if (info == NULL)
|
if (info == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
physmap_data = dev->dev.platform_data;
|
physmap_data = dev_get_platdata(&dev->dev);
|
||||||
|
|
||||||
if (info->cmtd) {
|
if (info->cmtd) {
|
||||||
mtd_device_unregister(info->cmtd);
|
mtd_device_unregister(info->cmtd);
|
||||||
|
@ -68,7 +68,7 @@ static void physmap_set_vpp(struct map_info *map, int state)
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
pdev = (struct platform_device *)map->map_priv_1;
|
pdev = (struct platform_device *)map->map_priv_1;
|
||||||
physmap_data = pdev->dev.platform_data;
|
physmap_data = dev_get_platdata(&pdev->dev);
|
||||||
|
|
||||||
if (!physmap_data->set_vpp)
|
if (!physmap_data->set_vpp)
|
||||||
return;
|
return;
|
||||||
|
@ -102,7 +102,7 @@ static int physmap_flash_probe(struct platform_device *dev)
|
||||||
int i;
|
int i;
|
||||||
int devices_found = 0;
|
int devices_found = 0;
|
||||||
|
|
||||||
physmap_data = dev->dev.platform_data;
|
physmap_data = dev_get_platdata(&dev->dev);
|
||||||
if (physmap_data == NULL)
|
if (physmap_data == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
|
|
@ -128,13 +128,13 @@ static int platram_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
dev_dbg(&pdev->dev, "probe entered\n");
|
dev_dbg(&pdev->dev, "probe entered\n");
|
||||||
|
|
||||||
if (pdev->dev.platform_data == NULL) {
|
if (dev_get_platdata(&pdev->dev) == NULL) {
|
||||||
dev_err(&pdev->dev, "no platform data supplied\n");
|
dev_err(&pdev->dev, "no platform data supplied\n");
|
||||||
err = -ENOENT;
|
err = -ENOENT;
|
||||||
goto exit_error;
|
goto exit_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
pdata = pdev->dev.platform_data;
|
pdata = dev_get_platdata(&pdev->dev);
|
||||||
|
|
||||||
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
||||||
if (info == NULL) {
|
if (info == NULL) {
|
||||||
|
|
|
@ -49,7 +49,7 @@ static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL };
|
||||||
|
|
||||||
static int pxa2xx_flash_probe(struct platform_device *pdev)
|
static int pxa2xx_flash_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct flash_platform_data *flash = pdev->dev.platform_data;
|
struct flash_platform_data *flash = dev_get_platdata(&pdev->dev);
|
||||||
struct pxa2xx_flash_info *info;
|
struct pxa2xx_flash_info *info;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ static int rbtx4939_flash_remove(struct platform_device *dev)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (info->mtd) {
|
if (info->mtd) {
|
||||||
struct rbtx4939_flash_data *pdata = dev->dev.platform_data;
|
struct rbtx4939_flash_data *pdata = dev_get_platdata(&dev->dev);
|
||||||
|
|
||||||
mtd_device_unregister(info->mtd);
|
mtd_device_unregister(info->mtd);
|
||||||
map_destroy(info->mtd);
|
map_destroy(info->mtd);
|
||||||
|
@ -56,7 +56,7 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
|
||||||
int err = 0;
|
int err = 0;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
|
|
||||||
pdata = dev->dev.platform_data;
|
pdata = dev_get_platdata(&dev->dev);
|
||||||
if (!pdata)
|
if (!pdata)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
|
|
@ -248,7 +248,7 @@ static const char * const part_probes[] = { "cmdlinepart", "RedBoot", NULL };
|
||||||
|
|
||||||
static int sa1100_mtd_probe(struct platform_device *pdev)
|
static int sa1100_mtd_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct flash_platform_data *plat = pdev->dev.platform_data;
|
struct flash_platform_data *plat = dev_get_platdata(&pdev->dev);
|
||||||
struct sa_info *info;
|
struct sa_info *info;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
@ -277,7 +277,7 @@ static int sa1100_mtd_probe(struct platform_device *pdev)
|
||||||
static int __exit sa1100_mtd_remove(struct platform_device *pdev)
|
static int __exit sa1100_mtd_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct sa_info *info = platform_get_drvdata(pdev);
|
struct sa_info *info = platform_get_drvdata(pdev);
|
||||||
struct flash_platform_data *plat = pdev->dev.platform_data;
|
struct flash_platform_data *plat = dev_get_platdata(&pdev->dev);
|
||||||
|
|
||||||
sa1100_destroy(info, plat);
|
sa1100_destroy(info, plat);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue